wave-code 1.0.10 → 1.1.1

package/src/utils/worktree.ts

@@ -6,7 +6,12 @@ import {
   getDefaultRemoteBranch,
   getGitMainRepoRoot,
   performPostCreationSetup,
+  loadMergedWaveConfig,
+  hasWorktreeCreateHook,
+  executeWorktreeCreateHook,
+  executeWorktreeRemoveHook,
 } from "wave-agent-sdk";
+import { logger } from "./logger.js";
 
 // Never use execFileSync here: the shared `wave --stdio` process handles all
 // desktop sessions, so a synchronous git call (especially a multi-second
@@ -21,6 +26,12 @@ export interface WorktreeSession {
   hasUncommittedChanges: boolean;
   hasNewCommits: boolean;
   isNew: boolean;
+  /**
+   * True when this worktree was created by a WorktreeCreate hook (not by git).
+   * Removal delegates to the WorktreeRemove hook; wave never runs
+   * `git worktree remove` for hook-based worktrees (aligned with Claude Code).
+   */
+  hookBased?: boolean;
 }
 
 // --- Worktree name validation ------------------------------------------------
@@ -55,6 +66,49 @@ export function validateWorktreeSlug(name: string): void {
   }
 }
 
+/**
+ * List all worktree paths of the git repository containing `cwd`.
+ *
+ * Uses `git worktree list --porcelain` (same discovery Claude Code uses for
+ * its resume picker). The current worktree is returned first (when `cwd` is
+ * inside one), followed by the remaining worktrees alphabetically.
+ *
+ * @param cwd Directory to run the git command from
+ * @returns Array of absolute worktree paths; empty when git is unavailable,
+ *   `cwd` is not inside a git repository, or the repo has a single worktree.
+ */
+export async function listWorktrees(cwd: string): Promise<string[]> {
+  try {
+    const { stdout } = await execFileAsync(
+      "git",
+      ["worktree", "list", "--porcelain"],
+      { cwd },
+    );
+
+    const worktreePaths = stdout
+      .split("\n")
+      .filter((line) => line.startsWith("worktree "))
+      .map((line) => line.slice("worktree ".length).normalize("NFC"));
+
+    if (worktreePaths.length <= 1) return worktreePaths;
+
+    // Current worktree first, then alphabetical
+    const currentWorktree = worktreePaths.find(
+      (wt) => cwd === wt || cwd.startsWith(wt + path.sep),
+    );
+    const otherWorktrees = worktreePaths
+      .filter((wt) => wt !== currentWorktree)
+      .sort((a, b) => a.localeCompare(b));
+
+    return currentWorktree
+      ? [currentWorktree, ...otherWorktrees]
+      : otherWorktrees;
+  } catch {
+    // Not a git repository, git unavailable, or command failed
+    return [];
+  }
+}
+
 /**
  * Create a new git worktree
  * @param name Worktree name
@@ -70,6 +124,33 @@ export async function createWorktree(
   options?: { baseRef?: "fresh" | "head"; baseBranch?: string },
 ): Promise<WorktreeSession> {
   validateWorktreeSlug(name);
+
+  // Hook-based creation first (allows user-configured VCS, including non-git).
+  // The hook prints the created worktree's absolute path to stdout; wave never
+  // runs `git worktree add` when a WorktreeCreate hook is configured.
+  const config = loadMergedWaveConfig(cwd);
+  if (hasWorktreeCreateHook(config?.hooks)) {
+    const { worktreePath } = await executeWorktreeCreateHook(
+      name,
+      config?.hooks,
+      {
+        projectDir: cwd,
+        sessionId: "",
+        env: config?.env,
+      },
+    );
+    return {
+      name,
+      path: worktreePath,
+      branch: "",
+      repoRoot: getGitMainRepoRoot(cwd) ?? cwd,
+      hasUncommittedChanges: false,
+      hasNewCommits: false,
+      isNew: true,
+      hookBased: true,
+    };
+  }
+
   const session = await createWorktreeInternal(name, cwd, options);
   if (session.isNew) {
     await performPostCreationSetup(session.path, session.repoRoot);
@@ -222,31 +303,80 @@ async function createWorktreeInternal(
   }
 }
 
+/**
+ * On Windows, prefix an absolute path with the extended-length marker (`\\?\`)
+ * so recursive removal bypasses the 260-char MAX_PATH limit. POSIX paths are
+ * returned unchanged.
+ */
+function toExtendedLengthPath(worktreePath: string): string {
+  if (process.platform !== "win32") {
+    return worktreePath;
+  }
+  const absolute = path.win32.resolve(worktreePath);
+  if (absolute.startsWith("\\\\?\\")) {
+    return absolute;
+  }
+  if (absolute.startsWith("\\\\")) {
+    // UNC path: \\server\share -> \\?\UNC\server\share
+    return `\\\\?\\UNC\\${absolute.slice(2)}`;
+  }
+  return `\\\\?\\${absolute}`;
+}
+
 /**
  * Remove a git worktree and its associated branch
  * @param session Worktree session details
+ *
+ * Removal is best-effort: `git worktree remove --force` deletes the worktree
+ * metadata before the working directory, and on Windows its recursive deletion
+ * is MAX_PATH-limited — deep paths (e.g. node_modules) can fail with "Filename
+ * too long", leaving an orphan directory. When git fails we fall back to
+ * fs.rmSync with an extended-length path (bypasses MAX_PATH) and prune stale
+ * metadata. Failures are logged but never block branch deletion.
  */
 export async function removeWorktree(session: WorktreeSession): Promise<void> {
+  // Hook-based worktrees are removed by the WorktreeRemove hook; wave never
+  // runs `git worktree remove` for them. If no WorktreeRemove hook is
+  // configured, the worktree is left in place with a warning (CC semantics).
+  if (session.hookBased) {
+    const config = loadMergedWaveConfig(session.repoRoot);
+    const hookRan = await executeWorktreeRemoveHook(
+      session.path,
+      config?.hooks,
+      {
+        projectDir: session.repoRoot,
+        sessionId: "",
+        env: config?.env,
+      },
+    );
+    if (!hookRan) {
+      logger.warn(
+        `No WorktreeRemove hook configured, hook-based worktree left at: ${session.path}`,
+      );
+    }
+    return;
+  }
+
   const repoRoot = session.repoRoot;
 
+  // Get current branch in worktree before removing it
+  let currentBranch: string | undefined;
   try {
-    // Get current branch in worktree before removing it
-    let currentBranch: string | undefined;
-    try {
-      const { stdout } = await execFileAsync(
-        "git",
-        ["rev-parse", "--abbrev-ref", "HEAD"],
-        {
-          cwd: session.path,
-          encoding: "utf8",
-        },
-      );
-      currentBranch = stdout.trim();
-    } catch {
-      // Ignore errors getting current branch
-    }
+    const { stdout } = await execFileAsync(
+      "git",
+      ["rev-parse", "--abbrev-ref", "HEAD"],
+      {
+        cwd: session.path,
+        encoding: "utf8",
+      },
+    );
+    currentBranch = stdout.trim();
+  } catch {
+    // Ignore errors getting current branch
+  }
 
-    // Remove worktree
+  // Remove worktree
+  try {
     await execFileAsync(
       "git",
       ["worktree", "remove", "--force", session.path],
@@ -254,42 +384,60 @@ export async function removeWorktree(session: WorktreeSession): Promise<void> {
         cwd: repoRoot,
       },
     );
-
-    // Delete original branch
+  } catch (error: unknown) {
+    logger.warn(
+      "git worktree remove failed, falling back to fs.rmSync:",
+      error,
+    );
+    try {
+      fs.rmSync(toExtendedLengthPath(session.path), {
+        recursive: true,
+        force: true,
+      });
+    } catch (rmError: unknown) {
+      logger.error("Failed to remove worktree or branch:", rmError);
+    }
+    // git removes worktree metadata before the working directory; prune any
+    // leftovers in case git failed before deleting them.
     try {
-      await execFileAsync("git", ["branch", "-D", session.branch], {
+      await execFileAsync("git", ["worktree", "prune"], {
         cwd: repoRoot,
       });
     } catch {
-      // Ignore errors deleting original branch
+      // Ignore errors pruning stale metadata
     }
+  }
+
+  // Delete original branch
+  try {
+    await execFileAsync("git", ["branch", "-D", session.branch], {
+      cwd: repoRoot,
+    });
+  } catch {
+    // Ignore errors deleting original branch
+  }
+
+  // Delete current branch if it's different and not a protected branch
+  if (
+    currentBranch &&
+    currentBranch !== session.branch &&
+    currentBranch !== "HEAD"
+  ) {
+    const defaultRemoteBranch = getDefaultRemoteBranch(repoRoot);
+    const defaultBranchName = defaultRemoteBranch.split("/").pop();
 
-    // Delete current branch if it's different and not a protected branch
     if (
-      currentBranch &&
-      currentBranch !== session.branch &&
-      currentBranch !== "HEAD"
+      currentBranch !== defaultBranchName &&
+      currentBranch !== "main" &&
+      currentBranch !== "master"
     ) {
-      const defaultRemoteBranch = getDefaultRemoteBranch(repoRoot);
-      const defaultBranchName = defaultRemoteBranch.split("/").pop();
-
-      if (
-        currentBranch !== defaultBranchName &&
-        currentBranch !== "main" &&
-        currentBranch !== "master"
-      ) {
-        try {
-          await execFileAsync("git", ["branch", "-D", currentBranch], {
-            cwd: repoRoot,
-          });
-        } catch {
-          // Ignore errors deleting current branch
-        }
+      try {
+        await execFileAsync("git", ["branch", "-D", currentBranch], {
+          cwd: repoRoot,
+        });
+      } catch {
+        // Ignore errors deleting current branch
       }
     }
-  } catch (error: unknown) {
-    console.error(
-      `Failed to remove worktree or branch: ${(error as Error).message}`,
-    );
   }
 }

package/dist/cli.d.ts

@@ -1,6 +0,0 @@
-import { BaseAppProps } from "./types.js";
-export interface CliOptions extends BaseAppProps {
-    restoreSessionId?: string;
-    continueLastSession?: boolean;
-}
-export declare function startCli(options: CliOptions): Promise<void>;

package/dist/cli.js

@@ -1,53 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { render } from "ink";
-import { App } from "./components/App.js";
-import { cleanupLogs } from "./utils/logger.js";
-import { removeWorktree } from "./utils/worktree.js";
-export async function startCli(options) {
-    const { restoreSessionId, continueLastSession, bypassPermissions, permissionMode, pluginDirs, additionalDirectories, tools, allowedTools, disallowedTools, worktreeSession, workdir, originalCwd, version, model, mcpServers, } = options;
-    // Continue with ink-based UI for normal mode
-    let shouldRemoveWorktree = false;
-    // Enable bracketed paste (DECSET 2004) so terminals wrap pasted text in
-    // \x1b[200~ ... \x1b[201~ markers. The input pipeline uses these to insert
-    // pasted text without submitting (a pasted trailing \r is not an Enter).
-    // Terminals without bracketed-paste support ignore the sequence and paste
-    // without markers, falling back to legacy behavior. No-op when stdout is
-    // not a TTY (piped input, stdio mode).
-    const stdoutIsTTY = process.stdout.isTTY === true;
-    if (stdoutIsTTY) {
-        process.stdout.write("\x1b[?2004h");
-    }
-    const handleExit = (shouldRemove) => {
-        shouldRemoveWorktree = shouldRemove;
-        unmount();
-    };
-    // Render the application
-    const { unmount, waitUntilExit } = render(_jsx(App, { restoreSessionId: restoreSessionId, continueLastSession: continueLastSession, bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, additionalDirectories: additionalDirectories, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, worktreeSession: worktreeSession, workdir: workdir, originalCwd: originalCwd, version: version, model: model, mcpServers: mcpServers, onExit: handleExit }), { exitOnCtrlC: false });
-    // Wait for the app to finish unmounting
-    try {
-        await waitUntilExit();
-    }
-    finally {
-        // Disable bracketed paste (DECSET 2004) so the terminal returns to its
-        // previous paste handling.
-        if (stdoutIsTTY) {
-            process.stdout.write("\x1b[?2004l");
-        }
-    }
-    try {
-        // Clean up old log files
-        await cleanupLogs().catch((error) => {
-            console.warn("Failed to cleanup old logs:", error);
-        });
-        // Cleanup worktree if requested
-        if (shouldRemoveWorktree && worktreeSession) {
-            process.chdir(worktreeSession.repoRoot);
-            await removeWorktree(worktreeSession);
-        }
-        process.exit(0);
-    }
-    catch (error) {
-        console.error("Error during cleanup:", error);
-        process.exit(1);
-    }
-}

package/dist/commands/plugin/disable.d.ts

@@ -1,5 +0,0 @@
-import { Scope } from "wave-agent-sdk";
-export declare function disablePluginCommand(argv: {
-    plugin: string;
-    scope?: Scope;
-}): Promise<void>;

package/dist/commands/plugin/disable.js

@@ -1,15 +0,0 @@
-import { PluginCore } from "wave-agent-sdk";
-export async function disablePluginCommand(argv) {
-    const workdir = process.cwd();
-    const pluginCore = new PluginCore(workdir);
-    try {
-        const scope = await pluginCore.disablePlugin(argv.plugin, argv.scope);
-        console.log(`Successfully disabled plugin: ${argv.plugin} in ${scope} scope`);
-        process.exit(0);
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.error(`Failed to disable plugin: ${message}`);
-        process.exit(1);
-    }
-}

package/dist/commands/plugin/enable.d.ts

@@ -1,5 +0,0 @@
-import { Scope } from "wave-agent-sdk";
-export declare function enablePluginCommand(argv: {
-    plugin: string;
-    scope?: Scope;
-}): Promise<void>;

package/dist/commands/plugin/enable.js

@@ -1,15 +0,0 @@
-import { PluginCore } from "wave-agent-sdk";
-export async function enablePluginCommand(argv) {
-    const workdir = process.cwd();
-    const pluginCore = new PluginCore(workdir);
-    try {
-        const scope = await pluginCore.enablePlugin(argv.plugin, argv.scope);
-        console.log(`Successfully enabled plugin: ${argv.plugin} in ${scope} scope`);
-        process.exit(0);
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.error(`Failed to enable plugin: ${message}`);
-        process.exit(1);
-    }
-}

package/dist/commands/plugin/install.d.ts

@@ -1,5 +0,0 @@
-import { Scope } from "wave-agent-sdk";
-export declare function installPluginCommand(argv: {
-    plugin: string;
-    scope?: Scope;
-}): Promise<void>;

package/dist/commands/plugin/install.js

@@ -1,21 +0,0 @@
-import { PluginCore } from "wave-agent-sdk";
-export async function installPluginCommand(argv) {
-    const workdir = process.cwd();
-    const pluginCore = new PluginCore(workdir);
-    try {
-        const installed = await pluginCore.installPlugin(argv.plugin);
-        console.log(`Successfully installed plugin: ${installed.name} v${installed.version} from ${installed.marketplace}`);
-        console.log(`Cache path: ${installed.cachePath}`);
-        if (argv.scope) {
-            const pluginId = `${installed.name}@${installed.marketplace}`;
-            await pluginCore.enablePlugin(pluginId, argv.scope);
-            console.log(`Plugin ${pluginId} enabled in ${argv.scope} scope`);
-        }
-        process.exit(0);
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.error(`Failed to install plugin: ${message}`);
-        process.exit(1);
-    }
-}

package/dist/commands/plugin/list.d.ts

@@ -1 +0,0 @@
-export declare function listPluginsCommand(): Promise<void>;

package/dist/commands/plugin/list.js

@@ -1,31 +0,0 @@
-import { PluginCore } from "wave-agent-sdk";
-export async function listPluginsCommand() {
-    const pluginCore = new PluginCore(process.cwd());
-    try {
-        const { plugins, mergedEnabled } = await pluginCore.listPlugins();
-        if (plugins.length === 0) {
-            console.log("No plugins found in registered marketplaces.");
-        }
-        else {
-            console.log("Plugins:");
-            plugins.forEach((p) => {
-                const pluginId = `${p.name}@${p.marketplace}`;
-                const isEnabled = mergedEnabled[pluginId] !== false;
-                const status = p.installed
-                    ? isEnabled
-                        ? "enabled"
-                        : "disabled"
-                    : "not installed";
-                const versionStr = p.version ? ` v${p.version}` : "";
-                const scopeStr = p.scope ? ` (${p.scope})` : "";
-                console.log(`- ${pluginId}${versionStr}${scopeStr} [${status}]`);
-            });
-        }
-        process.exit(0);
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.error(`Failed to list plugins: ${message}`);
-        process.exit(1);
-    }
-}

package/dist/commands/plugin/marketplace.d.ts

@@ -1,10 +0,0 @@
-export declare function addMarketplaceCommand(argv: {
-    input: string;
-}): Promise<void>;
-export declare function listMarketplacesCommand(): Promise<void>;
-export declare function removeMarketplaceCommand(argv: {
-    name: string;
-}): Promise<void>;
-export declare function updateMarketplaceCommand(argv: {
-    name?: string;
-}): Promise<void>;

package/dist/commands/plugin/marketplace.js

@@ -1,90 +0,0 @@
-import { PluginCore } from "wave-agent-sdk";
-export async function addMarketplaceCommand(argv) {
-    const pluginCore = new PluginCore(process.cwd());
-    try {
-        const marketplace = await pluginCore.addMarketplace(argv.input);
-        const source = marketplace.source;
-        let sourceInfo = "";
-        if (source.source === "directory") {
-            sourceInfo = source.path;
-        }
-        else if (source.source === "github") {
-            sourceInfo = source.repo + (source.ref ? `#${source.ref}` : "");
-        }
-        else {
-            sourceInfo = source.url + (source.ref ? `#${source.ref}` : "");
-        }
-        console.log(`Successfully added marketplace: ${marketplace.name} (${sourceInfo})`);
-        process.exit(0);
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.error(`Failed to add marketplace: ${message}`);
-        process.exit(1);
-    }
-}
-export async function listMarketplacesCommand() {
-    const pluginCore = new PluginCore(process.cwd());
-    try {
-        const marketplaces = await pluginCore.listMarketplaces();
-        if (marketplaces.length === 0) {
-            console.log("No marketplaces registered.");
-        }
-        else {
-            console.log("Registered Marketplaces:");
-            marketplaces.forEach((m) => {
-                const source = m.source;
-                let sourceInfo = "";
-                if (source.source === "directory") {
-                    sourceInfo = source.path;
-                }
-                else if (source.source === "github") {
-                    sourceInfo = source.repo + (source.ref ? `#${source.ref}` : "");
-                }
-                else {
-                    sourceInfo = source.url + (source.ref ? `#${source.ref}` : "");
-                }
-                const builtinLabel = m.isBuiltin ? " [builtin]" : "";
-                const lastUpdatedLabel = m.lastUpdated
-                    ? ` (Last updated: ${new Date(m.lastUpdated).toLocaleString()})`
-                    : "";
-                console.log(`- ${m.name}${builtinLabel}: ${sourceInfo} (${m.source.source})${lastUpdatedLabel}`);
-            });
-        }
-        process.exit(0);
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.error(`Failed to list marketplaces: ${message}`);
-        process.exit(1);
-    }
-}
-export async function removeMarketplaceCommand(argv) {
-    const pluginCore = new PluginCore(process.cwd());
-    try {
-        await pluginCore.removeMarketplace(argv.name);
-        console.log(`Successfully removed marketplace: ${argv.name}`);
-        process.exit(0);
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.error(`Failed to remove marketplace: ${message}`);
-        process.exit(1);
-    }
-}
-export async function updateMarketplaceCommand(argv) {
-    const pluginCore = new PluginCore(process.cwd());
-    try {
-        console.log(argv.name
-            ? `Updating marketplace: ${argv.name}...`
-            : "Updating all marketplaces...");
-        await pluginCore.updateMarketplace(argv.name);
-        console.log("Successfully updated.");
-        process.exit(0);
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.error(`Failed to update marketplace: ${message}`);
-        process.exit(1);
-    }
-}

package/dist/commands/plugin/uninstall.d.ts

@@ -1,3 +0,0 @@
-export declare function uninstallPluginCommand(argv: {
-    plugin: string;
-}): Promise<void>;

package/dist/commands/plugin/uninstall.js

@@ -1,16 +0,0 @@
-import { PluginCore } from "wave-agent-sdk";
-export async function uninstallPluginCommand(argv) {
-    const workdir = process.cwd();
-    const pluginCore = new PluginCore(workdir);
-    try {
-        await pluginCore.uninstallPlugin(argv.plugin);
-        console.log(`Successfully uninstalled plugin: ${argv.plugin}`);
-        console.log(`Cleaned up plugin configuration from all scopes`);
-        process.exit(0);
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.error(`Failed to uninstall plugin: ${message}`);
-        process.exit(1);
-    }
-}

package/dist/commands/plugin/update.d.ts

@@ -1,3 +0,0 @@
-export declare function updatePluginCommand(argv: {
-    plugin: string;
-}): Promise<void>;

package/dist/commands/plugin/update.js

@@ -1,15 +0,0 @@
-import { PluginCore } from "wave-agent-sdk";
-export async function updatePluginCommand(argv) {
-    const pluginCore = new PluginCore(process.cwd());
-    try {
-        const updated = await pluginCore.updatePlugin(argv.plugin);
-        console.log(`Successfully updated plugin: ${updated.name} v${updated.version} from ${updated.marketplace}`);
-        console.log(`Cache path: ${updated.cachePath}`);
-        process.exit(0);
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.error(`Failed to update plugin: ${message}`);
-        process.exit(1);
-    }
-}

package/dist/commands/update.d.ts

@@ -1 +0,0 @@
-export declare function updateCommand(): Promise<void>;