wave-code 0.15.0 → 0.15.2

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,MAAM,WAAW,YAAY;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjE,MAAM,WAAW,YAAY;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4DAA4D;IAC5D,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC9C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-code",
-  "version": "0.15.0",
+  "version": "0.15.2",
   "description": "CLI-based code assistant powered by AI, built with React and Ink",
   "repository": {
     "type": "git",
@@ -42,7 +42,7 @@
     "semver": "^7.7.4",
     "yargs": "^17.7.2",
     "zod": "^3.23.8",
-    "wave-agent-sdk": "0.15.0"
+    "wave-agent-sdk": "0.15.2"
   },
   "devDependencies": {
     "@types/react": "^19.1.8",

package/src/acp/agent.ts

@@ -49,8 +49,10 @@ import {
   type ResourceLink,
   type EmbeddedResource,
   type ImageContent,
+  type McpServer,
   AGENT_METHODS,
 } from "@agentclientprotocol/sdk";
+import type { McpServerConfig, McpServerStatus } from "wave-agent-sdk";
 
 export class WaveAcpAgent implements AcpAgent {
   private agents: Map<string, WaveAgent> = new Map();
@@ -150,6 +152,7 @@ export class WaveAcpAgent implements AcpAgent {
       },
       agentCapabilities: {
         loadSession: true,
+        mcpCapabilities: { http: true, sse: true },
         sessionCapabilities: {
           list: {},
           close: {},
@@ -169,14 +172,20 @@ export class WaveAcpAgent implements AcpAgent {
   private async createAgent(
     sessionId: string | undefined,
     cwd: string,
+    mcpServers?: McpServer[],
   ): Promise<WaveAgent> {
     const callbacks: AgentOptions["callbacks"] = {};
     const agentRef: { instance?: WaveAgent } = {};
 
+    const sdkMcpServers = mcpServers
+      ? convertAcpMcpServers(mcpServers)
+      : undefined;
+
     const agent = await WaveAgent.create({
       workdir: cwd,
       restoreSessionId: sessionId,
       stream: true,
+      mcpServers: sdkMcpServers,
       canUseTool: (context) => {
         if (!agentRef.instance) {
           throw new Error("Agent instance not yet initialized");
@@ -202,6 +211,7 @@ export class WaveAcpAgent implements AcpAgent {
           callbacks.onPermissionModeChange?.(mode),
         onModelChange: (model) => callbacks.onModelChange?.(model),
         onUserMessageAdded: (params) => callbacks.onUserMessageAdded?.(params),
+        onMcpServersChange: (servers) => callbacks.onMcpServersChange?.(servers),
       },
     });
 
@@ -234,9 +244,9 @@ export class WaveAcpAgent implements AcpAgent {
   }
 
   async newSession(params: NewSessionRequest): Promise<NewSessionResponse> {
-    const { cwd } = params;
+    const { cwd, mcpServers } = params;
     logger.info(`Creating new session in ${cwd}`);
-    const agent = await this.createAgent(undefined, cwd);
+    const agent = await this.createAgent(undefined, cwd, mcpServers);
     logger.info(`New session created with ID: ${agent.sessionId}`);
 
     return {
@@ -247,9 +257,9 @@ export class WaveAcpAgent implements AcpAgent {
   }
 
   async loadSession(params: LoadSessionRequest): Promise<LoadSessionResponse> {
-    const { sessionId, cwd } = params;
+    const { sessionId, cwd, mcpServers } = params;
     logger.info(`Loading session: ${sessionId} in ${cwd}`);
-    const agent = await this.createAgent(sessionId, cwd);
+    const agent = await this.createAgent(sessionId, cwd, mcpServers);
 
     return {
       modes: this.getSessionModeState(agent),
@@ -1002,6 +1012,75 @@ export class WaveAcpAgent implements AcpAgent {
           },
         });
       },
+      onMcpServersChange: (servers: McpServerStatus[]) => {
+        for (const server of servers) {
+          this.connection.sessionUpdate({
+            sessionId: sessionId as AcpSessionId,
+            update: {
+              sessionUpdate: "ext_notification" as const,
+              method: "mcp_server_status",
+              params: {
+                name: server.name,
+                status: server.status,
+                toolCount: server.toolCount,
+                error: server.error,
+              },
+            },
+          });
+        }
+      },
     };
   }
 }
+
+/**
+ * Convert ACP McpServer[] to SDK Record<string, McpServerConfig>.
+ */
+function convertAcpMcpServers(
+  servers: McpServer[],
+): Record<string, McpServerConfig> {
+  const result: Record<string, McpServerConfig> = {};
+  for (const server of servers) {
+    const config: McpServerConfig = {};
+    if ("type" in server && server.type === "http") {
+      config.url = server.url;
+      config.headers = convertHttpHeaders(server.headers);
+    } else if ("type" in server && server.type === "sse") {
+      config.url = server.url;
+      config.headers = convertHttpHeaders(server.headers);
+    } else {
+      // stdio (no type discriminator)
+      config.command = server.command;
+      config.args = server.args;
+      config.env = convertEnvVariables(server.env);
+    }
+    result[server.name] = config;
+  }
+  return result;
+}
+
+/**
+ * Convert ACP EnvVariable[] to SDK Record<string, string>.
+ */
+function convertEnvVariables(
+  env: Array<{ name: string; value: string }>,
+): Record<string, string> {
+  const result: Record<string, string> = {};
+  for (const entry of env) {
+    result[entry.name] = entry.value;
+  }
+  return result;
+}
+
+/**
+ * Convert ACP HttpHeader[] to SDK Record<string, string>.
+ */
+function convertHttpHeaders(
+  headers: Array<{ name: string; value: string }>,
+): Record<string, string> {
+  const result: Record<string, string> = {};
+  for (const entry of headers) {
+    result[entry.name] = entry.value;
+  }
+  return result;
+}

package/src/cli.tsx

@@ -24,6 +24,7 @@ export async function startCli(options: CliOptions): Promise<void> {
     workdir,
     version,
     model,
+    mcpServers,
   } = options;
 
   // Continue with ink-based UI for normal mode
@@ -49,6 +50,7 @@ export async function startCli(options: CliOptions): Promise<void> {
       workdir={workdir}
       version={version}
       model={model}
+      mcpServers={mcpServers}
       onExit={handleExit}
     />,
     { exitOnCtrlC: false },

package/src/components/App.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useCallback } from "react";
 import { useInput } from "ink";
 import { ChatInterface } from "./ChatInterface.js";
-import { ChatProvider } from "../contexts/useChat.js";
+import { ChatProvider, useChat } from "../contexts/useChat.js";
 import { AppProvider } from "../contexts/useAppConfig.js";
 import { WorktreeExitPrompt } from "./WorktreeExitPrompt.js";
 import {
@@ -21,19 +21,12 @@ interface AppWithProvidersProps extends BaseAppProps {
   onExit: (shouldRemove: boolean) => void;
 }
 
-const AppWithProviders: React.FC<AppWithProvidersProps> = ({
-  bypassPermissions,
-  permissionMode,
-  pluginDirs,
-  tools,
-  allowedTools,
-  disallowedTools,
-  worktreeSession,
-  workdir,
-  version,
-  model,
-  onExit,
-}) => {
+/** Wraps ChatInterface with worktree exit handling, using useChat() for hook access. */
+const ChatWithExitPrompt: React.FC<{
+  worktreeSession: NonNullable<BaseAppProps["worktreeSession"]>;
+  onExit: (shouldRemove: boolean) => void;
+}> = ({ worktreeSession, onExit }) => {
+  const { triggerWorktreeRemoveHook } = useChat();
   const [isExiting, setIsExiting] = useState(false);
   const [worktreeStatus, setWorktreeStatus] = useState<{
     hasUncommittedChanges: boolean;
@@ -41,25 +34,21 @@ const AppWithProviders: React.FC<AppWithProvidersProps> = ({
   } | null>(null);
 
   const handleSignal = useCallback(async () => {
-    if (worktreeSession) {
-      const cwd = workdir || worktreeSession.path;
-      const baseBranch = getDefaultRemoteBranch(cwd);
-      const hasChanges = hasUncommittedChanges(cwd);
-      const hasCommits = hasNewCommits(cwd, baseBranch);
+    const cwd = worktreeSession.path;
+    const baseBranch = getDefaultRemoteBranch(cwd);
+    const hasChanges = hasUncommittedChanges(cwd);
+    const hasCommits = hasNewCommits(cwd, baseBranch);
 
-      if (hasChanges || hasCommits) {
-        setWorktreeStatus({
-          hasUncommittedChanges: hasChanges,
-          hasNewCommits: hasCommits,
-        });
-        setIsExiting(true);
-      } else {
-        onExit(true);
-      }
+    if (hasChanges || hasCommits) {
+      setWorktreeStatus({
+        hasUncommittedChanges: hasChanges,
+        hasNewCommits: hasCommits,
+      });
+      setIsExiting(true);
     } else {
-      onExit(false);
+      onExit(true);
     }
-  }, [worktreeSession, workdir, onExit]);
+  }, [worktreeSession, onExit]);
 
   useInput((input, key) => {
     if (input === "c" && key.ctrl) {
@@ -80,7 +69,7 @@ const AppWithProviders: React.FC<AppWithProvidersProps> = ({
     };
   }, [handleSignal]);
 
-  if (isExiting && worktreeSession && worktreeStatus) {
+  if (isExiting && worktreeStatus) {
     return (
       <WorktreeExitPrompt
         name={worktreeSession.name}
@@ -88,12 +77,61 @@ const AppWithProviders: React.FC<AppWithProvidersProps> = ({
         hasUncommittedChanges={worktreeStatus.hasUncommittedChanges}
         hasNewCommits={worktreeStatus.hasNewCommits}
         onKeep={() => onExit(false)}
-        onRemove={() => onExit(true)}
+        onRemove={async () => {
+          await triggerWorktreeRemoveHook(worktreeSession.path);
+          onExit(true);
+        }}
         onCancel={() => setIsExiting(false)}
       />
     );
   }
 
+  return <ChatInterface />;
+};
+
+const AppWithProviders: React.FC<AppWithProvidersProps> = ({
+  bypassPermissions,
+  permissionMode,
+  pluginDirs,
+  tools,
+  allowedTools,
+  disallowedTools,
+  worktreeSession,
+  workdir,
+  version,
+  model,
+  mcpServers,
+  onExit,
+}) => {
+  // Handle Ctrl-C for non-worktree sessions (immediate exit)
+  // Ink runs terminal in raw mode, so Ctrl+C arrives as useInput event, not SIGINT
+  useInput((input, key) => {
+    if (!worktreeSession && input === "c" && key.ctrl) {
+      onExit(false);
+      return true;
+    }
+  });
+
+  if (worktreeSession) {
+    return (
+      <ChatProvider
+        bypassPermissions={bypassPermissions}
+        permissionMode={permissionMode}
+        pluginDirs={pluginDirs}
+        tools={tools}
+        allowedTools={allowedTools}
+        disallowedTools={disallowedTools}
+        workdir={workdir}
+        worktreeSession={worktreeSession}
+        version={version}
+        model={model}
+        mcpServers={mcpServers}
+      >
+        <ChatWithExitPrompt worktreeSession={worktreeSession} onExit={onExit} />
+      </ChatProvider>
+    );
+  }
+
   return (
     <ChatProvider
       bypassPermissions={bypassPermissions}
@@ -106,6 +144,7 @@ const AppWithProviders: React.FC<AppWithProvidersProps> = ({
       worktreeSession={worktreeSession}
       version={version}
       model={model}
+      mcpServers={mcpServers}
     >
       <ChatInterface />
     </ChatProvider>
@@ -125,6 +164,7 @@ export const App: React.FC<AppProps> = ({
   workdir,
   version,
   model,
+  mcpServers,
   onExit,
 }) => {
   return (
@@ -143,6 +183,7 @@ export const App: React.FC<AppProps> = ({
         workdir={workdir}
         version={version}
         model={model}
+        mcpServers={mcpServers}
         onExit={onExit}
       />
     </AppProvider>

package/src/contexts/useChat.tsx

@@ -119,6 +119,8 @@ export interface ChatContextType {
   workdir?: string;
   // Agent recreation (e.g. after plugin install)
   recreateAgent: () => void;
+  // Trigger WorktreeRemove hook BEFORE agent destruction
+  triggerWorktreeRemoveHook: (worktreePath: string) => Promise<void>;
 }
 
 const ChatContext = createContext<ChatContextType | null>(null);
@@ -147,6 +149,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
   worktreeSession,
   version,
   model,
+  mcpServers,
 }) => {
   const { restoreSessionId, continueLastSession } = useAppConfig();
   const { stdout } = useStdout();
@@ -198,7 +201,9 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
   const [queuedMessages, setQueuedMessages] = useState<QueuedMessage[]>([]);
 
   // MCP State
-  const [mcpServers, setMcpServers] = useState<McpServerStatus[]>([]);
+  const [mcpServerStatuses, setMcpServerStatuses] = useState<McpServerStatus[]>(
+    [],
+  );
 
   // Background tasks state
   const [backgroundTasks, setBackgroundTasks] = useState<BackgroundTask[]>([]);
@@ -328,8 +333,8 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
         onMessagesChange: () => {
           throttledSetMessages();
         },
-        onServersChange: (servers) => {
-          setMcpServers([...servers]);
+        onMcpServersChange: (servers) => {
+          setMcpServerStatuses([...servers]);
         },
         onSessionIdChange: (sessionId) => {
           setSessionId(sessionId);
@@ -403,6 +408,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
           worktreeName: worktreeSession?.name,
           isNewWorktree: worktreeSession?.isNew,
           model,
+          mcpServers,
         });
 
         agentRef.current = agent;
@@ -420,8 +426,8 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
         setConfiguredModels(agent.getConfiguredModels());
 
         // Get initial MCP servers state
-        const mcpServers = agent.getMcpServers?.() || [];
-        setMcpServers(mcpServers);
+        const initialMcpServers = agent.getMcpServers?.() || [];
+        setMcpServerStatuses(initialMcpServers);
 
         // Get initial commands
         const agentSlashCommands = agent.getSlashCommands?.() || [];
@@ -444,6 +450,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
       model,
       initialPermissionMode,
       throttledSetMessages,
+      mcpServers,
     ],
   );
 
@@ -459,7 +466,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     }
     agentRef.current = null;
     setMessages([]);
-    setMcpServers([]);
+    setMcpServerStatuses([]);
     setSlashCommands([]);
     setSessionId("");
     setIsLoading(false);
@@ -494,6 +501,14 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     };
   }, []);
 
+  // Trigger WorktreeRemove hook BEFORE agent destruction
+  const triggerWorktreeRemoveHook = useCallback(
+    async (worktreePath: string) => {
+      await agentRef.current?.triggerWorktreeRemoveHook(worktreePath);
+    },
+    [],
+  );
+
   // Send message function (including judgment logic)
   const sendMessage = useCallback(
     async (
@@ -737,7 +752,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     getConfiguredModels,
     setModel,
     isCompacting,
-    mcpServers,
+    mcpServers: mcpServerStatuses,
     connectMcpServer,
     disconnectMcpServer,
     backgroundTasks,
@@ -767,6 +782,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     version,
     workdir,
     recreateAgent,
+    triggerWorktreeRemoveHook,
   };
 
   return (

package/src/hooks/useInputManager.ts

@@ -119,6 +119,14 @@ export const useInputManager = (
               effect.images,
               effect.longTextMap,
             );
+            PromptHistoryManager.addEntry(
+              effect.content,
+              sessionId,
+              effect.longTextMap,
+              workdir,
+            ).catch((err: unknown) => {
+              logger?.error("Failed to save prompt history", err);
+            });
             break;
           case "ABORT_MESSAGE":
             onAbortMessage?.();
@@ -148,16 +156,6 @@ export const useInputManager = (
           case "PERMISSION_MODE_CHANGE":
             onPermissionModeChange?.(effect.mode);
             break;
-          case "SAVE_HISTORY":
-            PromptHistoryManager.addEntry(
-              effect.content,
-              sessionId,
-              effect.longTextMap,
-              workdir,
-            ).catch((err: unknown) => {
-              logger?.error("Failed to save prompt history", err);
-            });
-            break;
           case "FETCH_HISTORY": {
             let sessionIds: string[] | undefined = sessionId
               ? [sessionId]

package/src/index.ts

@@ -1,7 +1,12 @@
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { startCli } from "./cli.js";
-import { Scope, generateRandomName, type PermissionMode } from "wave-agent-sdk";
+import {
+  Scope,
+  generateRandomName,
+  type PermissionMode,
+  setCurrentWorktreeSession,
+} from "wave-agent-sdk";
 import { createWorktree, type WorktreeSession } from "./utils/worktree.js";
 import path from "path";
 import { readFileSync } from "fs";
@@ -94,6 +99,12 @@ export async function main() {
         type: "string",
         global: false,
       })
+      .option("mcp-config", {
+        description:
+          "MCP server configuration as JSON string (same format as .mcp.json)",
+        type: "string",
+        global: false,
+      })
       .option("acp", {
         description: "Run as an ACP bridge",
         type: "boolean",
@@ -284,6 +295,20 @@ export async function main() {
       argv.disallowedTools as string | undefined,
     );
 
+    // Parse MCP server configuration from --mcp-config JSON string
+    let mcpServers:
+      | Record<string, import("wave-agent-sdk").McpServerConfig>
+      | undefined;
+    if (argv.mcpConfig) {
+      try {
+        const parsed = JSON.parse(argv.mcpConfig as string);
+        mcpServers = parsed.mcpServers || parsed;
+      } catch {
+        console.error("Failed to parse --mcp-config as JSON");
+        process.exit(1);
+      }
+    }
+
     // Resolve plugin directories to absolute paths before any worktree logic
     const pluginDirs = (argv.pluginDir as string[] | undefined)?.map((dir) =>
       path.resolve(originalCwd, dir),
@@ -300,6 +325,16 @@ export async function main() {
         name = generateRandomName();
       }
       worktreeSession = createWorktree(name, originalCwd);
+
+      // Register worktree session so system prompt includes worktree warnings
+      setCurrentWorktreeSession({
+        originalCwd,
+        worktreePath: worktreeSession.path,
+        worktreeBranch: worktreeSession.branch,
+        worktreeName: worktreeSession.name,
+        isNew: worktreeSession.isNew,
+        repoRoot: worktreeSession.repoRoot,
+      });
     }
 
     const workdir = worktreeSession?.path || originalCwd;
@@ -341,6 +376,7 @@ export async function main() {
         workdir,
         version,
         model: argv.model as string | undefined,
+        mcpServers,
       });
     }
 
@@ -364,6 +400,7 @@ export async function main() {
         workdir,
         version,
         model: argv.model as string | undefined,
+        mcpServers,
       });
     }
 
@@ -380,6 +417,7 @@ export async function main() {
       workdir,
       version,
       model: argv.model as string | undefined,
+      mcpServers,
     });
   } catch (error) {
     console.error("Failed to start WAVE Code:", error);

package/src/managers/inputHandlers.ts

@@ -125,7 +125,12 @@ export const cyclePermissionMode = (
   dispatch: React.Dispatch<InputAction>,
   callbacks: Partial<InputManagerCallbacks>,
 ) => {
-  const modes: PermissionMode[] = ["default", "acceptEdits", "plan", "bypassPermissions"];
+  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];
@@ -760,11 +765,7 @@ export const handleInput = async (
   }
 
   if (key.tab && key.shift) {
-    cyclePermissionMode(
-      state.permissionMode,
-      dispatch,
-      callbacks,
-    );
+    cyclePermissionMode(state.permissionMode, dispatch, callbacks);
     return true;
   }
 

package/src/managers/inputReducer.ts

@@ -38,11 +38,6 @@ export type PendingEffect =
   | { type: "BACKGROUND_CURRENT_TASK" }
   | { type: "ASK_BTW"; question: string }
   | { type: "PERMISSION_MODE_CHANGE"; mode: PermissionMode }
-  | {
-      type: "SAVE_HISTORY";
-      content: string;
-      longTextMap: Record<string, string>;
-    }
   | { type: "FETCH_HISTORY" }
   | { type: "PASTE_IMAGE" }
   | { type: "EXECUTE_COMMAND"; command: string };
@@ -768,8 +763,8 @@ export function inputReducer(
         const modes: PermissionMode[] = [
           "default",
           "acceptEdits",
-          "plan",
           "bypassPermissions",
+          "plan",
         ];
         const currentIndex = modes.indexOf(state.permissionMode);
         const nextIndex =

package/src/print-cli.ts

@@ -14,6 +14,8 @@ export interface PrintCliOptions extends BaseAppProps {
   continueLastSession?: boolean;
   message?: string;
   showStats?: boolean;
+  /** MCP server config parsed from --mcp-config CLI argument */
+  mcpServers?: Record<string, import("wave-agent-sdk").McpServerConfig>;
 }
 
 function displayTimingInfo(startTime: Date, showStats: boolean): void {
@@ -46,6 +48,7 @@ export async function startPrintCli(options: PrintCliOptions): Promise<void> {
     worktreeSession,
     workdir,
     model,
+    mcpServers,
   } = options;
 
   if (
@@ -158,6 +161,7 @@ export async function startPrintCli(options: PrintCliOptions): Promise<void> {
       disallowedTools,
       workdir,
       model,
+      mcpServers,
       // 保持流式模式以获得更好的命令行用户体验
     });
 
@@ -167,6 +171,11 @@ export async function startPrintCli(options: PrintCliOptions): Promise<void> {
       process.stdout.write("\n");
     }
 
+    // Wait for running background tasks and subagents to complete
+    while (agent.hasRunningBackgroundWork) {
+      await new Promise((resolve) => setTimeout(resolve, 500));
+    }
+
     // Display usage summary before exit
     if (showStats) {
       try {

package/src/types.ts

@@ -1,5 +1,5 @@
 import { WorktreeSession } from "./utils/worktree.js";
-import { PermissionMode } from "wave-agent-sdk";
+import { PermissionMode, McpServerConfig } from "wave-agent-sdk";
 
 export interface BaseAppProps {
   bypassPermissions?: boolean;
@@ -12,4 +12,6 @@ export interface BaseAppProps {
   workdir?: string;
   version?: string;
   model?: string;
+  /** Optional MCP server configs to pass to Agent.create() */
+  mcpServers?: Record<string, McpServerConfig>;
 }