wave-code 1.1.5 → 1.3.0

package/src/index.ts

@@ -188,7 +188,7 @@ export async function main() {
                 })
                 .option("scope", {
                   alias: "s",
-                  describe: "Scope to enable the plugin in",
+                  describe: "Scope to enable the plugin in (default: user)",
                   choices: ["user", "project", "local"],
                   type: "string",
                 });
@@ -218,18 +218,30 @@ export async function main() {
           )
           .command(
             "uninstall <plugin>",
-            "Uninstall a plugin",
+            "Uninstall a plugin from one scope (default: the scope it is enabled in for the current directory)",
             (yargs) => {
-              return yargs.positional("plugin", {
-                describe: "Plugin to uninstall (format: name@marketplace)",
-                type: "string",
-              });
+              return yargs
+                .positional("plugin", {
+                  describe: "Plugin to uninstall (format: name@marketplace)",
+                  type: "string",
+                })
+                .option("scope", {
+                  alias: "s",
+                  describe: "Scope to uninstall from",
+                  choices: ["user", "project", "local"],
+                  type: "string",
+                });
             },
             async (argv) => {
               const { uninstallPluginCommand } = await import(
                 "./commands/plugin/uninstall.js"
               );
-              await uninstallPluginCommand(argv as { plugin: string });
+              await uninstallPluginCommand(
+                argv as {
+                  plugin: string;
+                  scope?: Scope;
+                },
+              );
             },
           )
           .command(
@@ -251,10 +263,47 @@ export async function main() {
       })
       .command(
         "daemon",
-        "Manage the wave daemon (client subcommands — to START a daemon use `wave --daemon <socket>` instead)",
+        "Manage the wave daemon (client subcommands — daemons start on demand, or directly via `wave --daemon <socket>`)",
         (yargs) => {
           return yargs
             .help()
+            .command(
+              "create",
+              "Create a new session hosted by the daemon and print its sessionId",
+              (yargs) => {
+                return yargs
+                  .option("workdir", {
+                    describe:
+                      "Working directory for the new session (default: current directory)",
+                    type: "string",
+                  })
+                  .option("permission-mode", {
+                    describe:
+                      "Permission mode for the new session (default: bypassPermissions; options: default, bypassPermissions, acceptEdits, plan, dontAsk)",
+                    type: "string",
+                  })
+                  .option("model", {
+                    describe:
+                      "Model override for the new session (default: configured model)",
+                    type: "string",
+                  })
+                  .option("worktree", {
+                    describe:
+                      "Create the session in a new git worktree (name optional — auto-generated when omitted)",
+                    type: "string",
+                  });
+              },
+              async (argv) => {
+                const { daemonCreateCommand, DEFAULT_DAEMON_SOCKET } =
+                  await import("./daemon/commands.js");
+                await daemonCreateCommand(DEFAULT_DAEMON_SOCKET, {
+                  workdir: argv.workdir as string | undefined,
+                  permissionMode: argv.permissionMode as string | undefined,
+                  model: argv.model as string | undefined,
+                  worktree: argv.worktree as string | undefined,
+                });
+              },
+            )
             .command(
               "list",
               "List sessions hosted by the daemon (in-memory registry)",
@@ -275,8 +324,9 @@ export async function main() {
                     type: "string",
                   })
                   .option("lines", {
-                    describe: "Number of recent messages to show",
-                    default: 20,
+                    describe:
+                      "Number of recent messages to show (0 = status line only)",
+                    default: 1,
                     type: "number",
                   });
               },
@@ -290,9 +340,50 @@ export async function main() {
                 );
               },
             )
+            .command(
+              "wait <sessionId>",
+              "Block until a session goes idle (or waits for approval), then print its final snapshot (exit 0 = idle, 3 = waiting for approval, 1 = error/timeout). Idle = no turn running, no background task/subagent running, nothing queued (same as `wave -p`); a session holding a long-running background task never goes idle, so give it --timeout",
+              (yargs) => {
+                return yargs
+                  .positional("sessionId", {
+                    describe: "Session ID hosted by the daemon",
+                    type: "string",
+                  })
+                  .option("lines", {
+                    describe:
+                      "Number of recent messages to print on exit (0 = status line only)",
+                    default: 1,
+                    type: "number",
+                  })
+                  .option("from-busy", {
+                    describe:
+                      "Wait until the session has been observed busy at least once before accepting idle (removes the stale-snapshot race right after an async `send`; a running background task also counts as busy)",
+                    default: false,
+                    type: "boolean",
+                  })
+                  .option("timeout", {
+                    describe:
+                      "Seconds to wait before giving up (default: wait forever) — required for sessions with a long-running background task, which never go idle",
+                    type: "number",
+                  });
+              },
+              async (argv) => {
+                const { daemonWaitCommand, DEFAULT_DAEMON_SOCKET } =
+                  await import("./daemon/commands.js");
+                await daemonWaitCommand(
+                  DEFAULT_DAEMON_SOCKET,
+                  argv.sessionId as string,
+                  {
+                    lines: argv.lines as number,
+                    fromBusy: argv.fromBusy as boolean,
+                    timeout: argv.timeout as number | undefined,
+                  },
+                );
+              },
+            )
             .command(
               "send <sessionId> <message>",
-              "Inject a message into a session and wait for the reply",
+              "Inject a message into a session (async by default; --wait N to get the reply)",
               (yargs) => {
                 return yargs
                   .positional("sessionId", {
@@ -303,9 +394,10 @@ export async function main() {
                     describe: "Message to send",
                     type: "string",
                   })
-                  .option("timeout", {
-                    describe: "Seconds to wait for the reply (0 = no limit)",
-                    default: 600,
+                  .option("wait", {
+                    describe:
+                      "Seconds to wait for the reply and print it (0 = fire-and-forget, the default)",
+                    default: 0,
                     type: "number",
                   });
               },
@@ -316,7 +408,7 @@ export async function main() {
                   DEFAULT_DAEMON_SOCKET,
                   argv.sessionId as string,
                   argv.message as string,
-                  { timeout: argv.timeout as number },
+                  { wait: argv.wait as number },
                 );
               },
             )
@@ -346,7 +438,8 @@ export async function main() {
                     type: "string",
                   })
                   .option("answer", {
-                    describe: "Answers JSON for AskUserQuestion requests",
+                    describe:
+                      'AskUserQuestion answers: JSON object of {question: answer} or option numbers per question (e.g. "0" or "1,0")',
                     type: "string",
                   })
                   .option("rule", {
@@ -394,6 +487,53 @@ export async function main() {
                 );
               },
             )
+            .command(
+              "destroy <sessionId>",
+              "Destroy a daemon session (idempotent)",
+              (yargs) => {
+                return yargs
+                  .positional("sessionId", {
+                    describe: "Session ID of the session to destroy",
+                    type: "string",
+                  })
+                  .option("remove-worktree", {
+                    describe:
+                      "Also remove the session's git worktree (resolved via git, removed via protocol removeWorktree) before destroying",
+                    type: "boolean",
+                  });
+              },
+              async (argv) => {
+                const { daemonDestroyCommand, DEFAULT_DAEMON_SOCKET } =
+                  await import("./daemon/commands.js");
+                await daemonDestroyCommand(
+                  DEFAULT_DAEMON_SOCKET,
+                  argv.sessionId as string,
+                  {
+                    removeWorktree: argv.removeWorktree as boolean | undefined,
+                  },
+                );
+              },
+            )
+            .command(
+              "stop",
+              "Gracefully stop the daemon (idempotent — no-op when it is not running)",
+              {},
+              async () => {
+                const { daemonStopCommand, DEFAULT_DAEMON_SOCKET } =
+                  await import("./daemon/commands.js");
+                await daemonStopCommand(DEFAULT_DAEMON_SOCKET);
+              },
+            )
+            .command(
+              "restart",
+              "Restart the daemon (graceful stop + relaunch; starts one when not running)",
+              {},
+              async () => {
+                const { daemonRestartCommand, DEFAULT_DAEMON_SOCKET } =
+                  await import("./daemon/commands.js");
+                await daemonRestartCommand(DEFAULT_DAEMON_SOCKET);
+              },
+            )
             .demandCommand(1, "Please specify a daemon subcommand");
         },
       )

package/src/managers/inputHandlers.ts

@@ -6,6 +6,7 @@ import {
   InputAction,
   InputManagerCallbacks,
   isPasteImageKey,
+  permissionModeCycle,
 } from "./inputReducer.js";
 
 export const expandLongTextPlaceholders = (
@@ -136,15 +137,10 @@ export const cyclePermissionMode = (
   dispatch: React.Dispatch<InputAction>,
   callbacks: Partial<InputManagerCallbacks>,
 ) => {
-  const modes: PermissionMode[] = [
-    "default",
-    "acceptEdits",
-    "bypassPermissions",
-    "plan",
-  ];
-  const currentIndex = modes.indexOf(currentMode);
-  const nextIndex = currentIndex === -1 ? 0 : (currentIndex + 1) % modes.length;
-  const nextMode = modes[nextIndex];
+  const currentIndex = permissionModeCycle.indexOf(currentMode);
+  const nextIndex =
+    currentIndex === -1 ? 0 : (currentIndex + 1) % permissionModeCycle.length;
+  const nextMode = permissionModeCycle[nextIndex];
 
   callbacks.logger?.debug("Cycling permission mode", {
     from: currentMode,
@@ -372,8 +368,12 @@ export const handleCommandSelect = (
           dispatch({ type: "SET_SHOW_AGENTS_MANAGER", payload: true });
         } else if (command === "skills") {
           dispatch({ type: "SET_SHOW_SKILLS_MANAGER", payload: true });
+        } else if (command === "hooks") {
+          dispatch({ type: "SET_SHOW_HOOKS_MANAGER", payload: true });
         } else if (command === "rewind") {
           dispatch({ type: "SET_SHOW_REWIND_MANAGER", payload: true });
+        } else if (command === "resume") {
+          dispatch({ type: "SET_SHOW_RESUME_SELECTOR", payload: true });
         } else if (command === "help") {
           dispatch({ type: "SET_SHOW_HELP", payload: true });
         } else if (command === "status") {
@@ -399,8 +399,12 @@ export const handleCommandSelect = (
           await callbacks.onClearMessages?.();
         } else if (command === "compact") {
           await callbacks.onCompact?.();
+        } else if (command === "reload-plugins") {
+          await callbacks.onReloadPlugins?.();
         } else if (command === "add-dir") {
           await callbacks.onAddDir?.();
+        } else if (command === "rename") {
+          await callbacks.onRenameSession?.();
         }
       }
     })();
@@ -754,6 +758,7 @@ export const handleInput = async (
         state.showBackgroundTaskManager ||
         state.showMcpManager ||
         state.showRewindManager ||
+        state.showResumeSelector ||
         state.showHelp ||
         state.showStatusCommand ||
         state.showPluginManager ||
@@ -778,6 +783,7 @@ export const handleInput = async (
     state.showBackgroundTaskManager ||
     state.showMcpManager ||
     state.showRewindManager ||
+    state.showResumeSelector ||
     state.showHelp ||
     state.showStatusCommand ||
     state.showPluginManager ||
@@ -788,6 +794,7 @@ export const handleInput = async (
       state.showBackgroundTaskManager ||
       state.showMcpManager ||
       state.showRewindManager ||
+      state.showResumeSelector ||
       state.showHelp ||
       state.showStatusCommand ||
       state.showPluginManager ||

package/src/managers/inputReducer.ts

@@ -37,6 +37,18 @@ export const btwOverlayActiveRef: { current: boolean } = { current: false };
 
 export const ESC_DOUBLE_PRESS_TIMEOUT_MS = 1000;
 
+/**
+ * Shift+Tab 循环的权限模式顺序（对齐 Claude Code：plan 之后才进入
+ * bypassPermissions）。单独导出，避免 handler 与 reducer 两条路径各写一份
+ * 而漂移。
+ */
+export const permissionModeCycle: PermissionMode[] = [
+  "default",
+  "acceptEdits",
+  "plan",
+  "bypassPermissions",
+];
+
 /**
  * Paste-image shortcut: Ctrl+V everywhere, plus Alt+V on Windows — Windows
  * terminals reserve Ctrl+V for their own system paste, so the key never
@@ -108,7 +120,10 @@ export interface InputManagerCallbacks {
   ) => Promise<string>;
   onClearMessages?: () => Promise<void>;
   onCompact?: (instructions?: string) => Promise<void>;
+  onReloadPlugins?: () => Promise<void>;
   onAddDir?: (args?: string) => Promise<void>;
+  onRenameSession?: (args?: string) => Promise<void>;
+  onPlanCommand?: (args?: string) => Promise<void> | void;
   sessionId?: string;
   workdir?: string;
   getFullMessageThread?: () => Promise<{
@@ -141,6 +156,7 @@ export interface InputState {
   showMcpManager: boolean;
   showAgentsManager: boolean;
   showRewindManager: boolean;
+  showResumeSelector: boolean;
   showHelp: boolean;
   showStatusCommand: boolean;
   showLoginCommand: boolean;
@@ -148,6 +164,7 @@ export interface InputState {
   showModelSelector: boolean;
   showWorkflowManager: boolean;
   showSkillsManager: boolean;
+  showHooksManager: boolean;
   permissionMode: PermissionMode;
   selectorJustUsed: boolean;
   history: PromptEntry[];
@@ -180,6 +197,7 @@ export const initialState: InputState = {
   showMcpManager: false,
   showAgentsManager: false,
   showRewindManager: false,
+  showResumeSelector: false,
   showHelp: false,
   showStatusCommand: false,
   showLoginCommand: false,
@@ -187,6 +205,7 @@ export const initialState: InputState = {
   showModelSelector: false,
   showWorkflowManager: false,
   showSkillsManager: false,
+  showHooksManager: false,
   permissionMode: "default",
   selectorJustUsed: false,
   history: [],
@@ -462,6 +481,7 @@ export type InputAction =
   | { type: "SET_SHOW_MCP_MANAGER"; payload: boolean }
   | { type: "SET_SHOW_AGENTS_MANAGER"; payload: boolean }
   | { type: "SET_SHOW_REWIND_MANAGER"; payload: boolean }
+  | { type: "SET_SHOW_RESUME_SELECTOR"; payload: boolean }
   | { type: "SET_SHOW_HELP"; payload: boolean }
   | { type: "SET_SHOW_STATUS_COMMAND"; payload: boolean }
   | { type: "SET_SHOW_LOGIN_COMMAND"; payload: boolean }
@@ -469,6 +489,7 @@ export type InputAction =
   | { type: "SET_SHOW_MODEL_SELECTOR"; payload: boolean }
   | { type: "SET_SHOW_WORKFLOW_MANAGER"; payload: boolean }
   | { type: "SET_SHOW_SKILLS_MANAGER"; payload: boolean }
+  | { type: "SET_SHOW_HOOKS_MANAGER"; payload: boolean }
   | { type: "SET_PERMISSION_MODE"; payload: PermissionMode }
   | { type: "SET_SELECTOR_JUST_USED"; payload: boolean }
   | { type: "INSERT_TEXT_WITH_PLACEHOLDER"; payload: string }
@@ -663,6 +684,12 @@ export function inputReducer(
         showRewindManager: action.payload,
         selectorJustUsed: !action.payload ? true : state.selectorJustUsed,
       };
+    case "SET_SHOW_RESUME_SELECTOR":
+      return {
+        ...state,
+        showResumeSelector: action.payload,
+        selectorJustUsed: !action.payload ? true : state.selectorJustUsed,
+      };
     case "SET_SHOW_HELP":
       return {
         ...state,
@@ -705,6 +732,12 @@ export function inputReducer(
         showSkillsManager: action.payload,
         selectorJustUsed: !action.payload ? true : state.selectorJustUsed,
       };
+    case "SET_SHOW_HOOKS_MANAGER":
+      return {
+        ...state,
+        showHooksManager: action.payload,
+        selectorJustUsed: !action.payload ? true : state.selectorJustUsed,
+      };
     case "SET_PERMISSION_MODE":
       return { ...state, permissionMode: action.payload };
     case "SET_SELECTOR_JUST_USED":
@@ -1066,6 +1099,7 @@ export function inputReducer(
             state.showMcpManager ||
             state.showAgentsManager ||
             state.showRewindManager ||
+            state.showResumeSelector ||
             state.showHelp ||
             state.showStatusCommand ||
             state.showLoginCommand ||
@@ -1113,16 +1147,12 @@ export function inputReducer(
 
       // 3. Special Shortcuts
       if (key.tab && key.shift) {
-        const modes: PermissionMode[] = [
-          "default",
-          "acceptEdits",
-          "bypassPermissions",
-          "plan",
-        ];
-        const currentIndex = modes.indexOf(state.permissionMode);
+        const currentIndex = permissionModeCycle.indexOf(state.permissionMode);
         const nextIndex =
-          currentIndex === -1 ? 0 : (currentIndex + 1) % modes.length;
-        const nextMode = modes[nextIndex];
+          currentIndex === -1
+            ? 0
+            : (currentIndex + 1) % permissionModeCycle.length;
+        const nextMode = permissionModeCycle[nextIndex];
         return {
           ...state,
           permissionMode: nextMode,

package/src/reducers/confirmationReducer.ts

@@ -2,12 +2,14 @@ import { Key } from "ink";
 import type { PermissionDecision, PermissionMode } from "wave-agent-sdk";
 import {
   BASH_TOOL_NAME,
+  EDIT_TOOL_NAME,
   EXIT_PLAN_MODE_TOOL_NAME,
   ENTER_PLAN_MODE_TOOL_NAME,
+  WRITE_TOOL_NAME,
 } from "wave-agent-sdk";
 
 export interface ConfirmationState {
-  selectedOption: "auto" | "bypass" | "allow" | "alternative";
+  selectedOption: "auto" | "bypass" | "allow" | "addDirectory" | "alternative";
   alternativeText: string;
   alternativeCursorPosition: number;
   hasUserInput: boolean;
@@ -30,6 +32,7 @@ export type ConfirmationAction =
       toolInput?: Record<string, unknown>;
       suggestedPrefix?: string;
       hidePersistentOption?: boolean;
+      outsideSafeZoneDirectory?: string;
       permissionMode?: PermissionMode;
     };
 
@@ -96,6 +99,7 @@ export function confirmationReducer(
         toolInput,
         suggestedPrefix,
         hidePersistentOption,
+        outsideSafeZoneDirectory,
         permissionMode,
       } = action;
 
@@ -135,6 +139,16 @@ export function confirmationReducer(
             behavior: "allow",
             newPermissionMode: "bypassPermissions",
           };
+        } else if (
+          state.selectedOption === "addDirectory" &&
+          outsideSafeZoneDirectory
+        ) {
+          // Approve this operation AND add the out-of-Safe-Zone target
+          // directory to this session's Safe Zone (in-memory only).
+          decision = {
+            behavior: "allow",
+            newAdditionalDirectory: outsideSafeZoneDirectory,
+          };
         } else if (state.alternativeText.trim()) {
           decision = {
             behavior: "deny",
@@ -176,6 +190,11 @@ export function confirmationReducer(
 
       const availableOptions: ConfirmationState["selectedOption"][] = [];
       availableOptions.push("allow");
+      if (
+        (toolName === EDIT_TOOL_NAME || toolName === WRITE_TOOL_NAME) &&
+        outsideSafeZoneDirectory
+      )
+        availableOptions.push("addDirectory");
       if (!hidePersistentOption) availableOptions.push("auto");
       if (
         toolName === EXIT_PLAN_MODE_TOOL_NAME ||

package/src/reducers/hooksManagerReducer.ts

@@ -0,0 +1,92 @@
+import { Key } from "ink";
+
+export type PendingEffect = { type: "CANCEL" };
+
+export interface HooksManagerState {
+  selectedIndex: number;
+  viewMode: "list" | "detail";
+  pendingEffect: PendingEffect | null;
+}
+
+export type HooksManagerAction =
+  | { type: "MOVE_UP" }
+  | { type: "MOVE_DOWN"; itemCount: number }
+  | { type: "SET_VIEW_MODE"; viewMode: "list" | "detail" }
+  | {
+      type: "HANDLE_KEY";
+      input: string;
+      key: Key;
+      itemCount: number;
+    }
+  | { type: "CLEAR_PENDING_EFFECT" };
+
+export function hooksManagerReducer(
+  state: HooksManagerState,
+  action: HooksManagerAction,
+): HooksManagerState {
+  switch (action.type) {
+    case "MOVE_UP":
+      return {
+        ...state,
+        selectedIndex: Math.max(0, state.selectedIndex - 1),
+      };
+    case "MOVE_DOWN":
+      return {
+        ...state,
+        selectedIndex: Math.min(
+          Math.max(0, action.itemCount - 1),
+          state.selectedIndex + 1,
+        ),
+      };
+    case "SET_VIEW_MODE":
+      return { ...state, viewMode: action.viewMode };
+    case "HANDLE_KEY": {
+      const { key, itemCount } = action;
+
+      if (key.return) {
+        if (state.viewMode === "list") {
+          return { ...state, viewMode: "detail" };
+        }
+        // Aligned with AgentsManager/SkillsManager detail view: Enter
+        // returns to the list.
+        return { ...state, viewMode: "list" };
+      }
+
+      if (key.escape) {
+        if (state.viewMode === "detail") {
+          return { ...state, viewMode: "list" };
+        }
+        return { ...state, pendingEffect: { type: "CANCEL" } };
+      }
+
+      // Detail view does not respond to arrow keys (aligned with
+      // AgentsManager/SkillsManager).
+      if (state.viewMode === "detail") {
+        return state;
+      }
+
+      if (key.upArrow) {
+        return {
+          ...state,
+          selectedIndex: Math.max(0, state.selectedIndex - 1),
+        };
+      }
+
+      if (key.downArrow) {
+        return {
+          ...state,
+          selectedIndex: Math.min(
+            Math.max(0, itemCount - 1),
+            state.selectedIndex + 1,
+          ),
+        };
+      }
+
+      return state;
+    }
+    case "CLEAR_PENDING_EFFECT":
+      return { ...state, pendingEffect: null };
+    default:
+      return state;
+  }
+}

package/src/reducers/selectorReducer.ts

@@ -15,6 +15,7 @@ export type SelectorAction<T = unknown> =
   | { type: "MOVE_DOWN" }
   | { type: "RESET_INDEX" }
   | { type: "SET_ITEMS"; items: T[] }
+  | { type: "SET_INDEX"; index: number }
   | { type: "HANDLE_KEY"; key: Key; hasInsert: boolean }
   | { type: "TOGGLE_ALL_PROJECTS" }
   | { type: "TOGGLE_ALL_WORKTREES" }
@@ -39,6 +40,8 @@ export function selectorReducer<T = unknown>(
       return { ...state, selectedIndex: 0 };
     case "SET_ITEMS":
       return { ...state, items: action.items, selectedIndex: 0 };
+    case "SET_INDEX":
+      return { ...state, selectedIndex: action.index };
     case "TOGGLE_ALL_PROJECTS":
       return { ...state, showAllProjects: !state.showAllProjects };
     case "TOGGLE_ALL_WORKTREES":