wave-code 0.15.1 → 0.15.3

package/dist/acp/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/acp/agent.ts"],"names":[],"mappings":"AAqBA,OAAO,EACL,KAAK,KAAK,IAAI,QAAQ,EACtB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EAUzB,KAAK,qBAAqB,EAC1B,KAAK,6BAA6B,EAClC,KAAK,8BAA8B,EAMpC,MAAM,0BAA0B,CAAC;AAElC,qBAAa,YAAa,YAAW,QAAQ;IAC3C,OAAO,CAAC,MAAM,CAAqC;IACnD,OAAO,CAAC,UAAU,CAAsB;gBAE5B,UAAU,EAAE,mBAAmB;IAI3C,OAAO,CAAC,mBAAmB;IAkC3B,OAAO,CAAC,uBAAuB;YAmCjB,gBAAgB;IASxB,UAAU,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAwBzC,YAAY,IAAI,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;YAI5C,WAAW;IAmEnB,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAalE,WAAW,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAWrE,YAAY,CAChB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,oBAAoB,CAAC;IAuB1B,qBAAqB,CACzB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAc7B,SAAS,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAO7B,cAAc,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAc5D,sBAAsB,CAC1B,MAAM,EAAE,6BAA6B,GACpC,OAAO,CAAC,8BAA8B,CAAC;IAuBpC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;IAyDtD,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IASvD,OAAO,CAAC,kBAAkB;YA2BZ,uBAAuB;IA8LrC,OAAO,CAAC,cAAc;IAwGtB,OAAO,CAAC,gBAAgB;IAmCxB,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,eAAe;CAwNxB"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/acp/agent.ts"],"names":[],"mappings":"AAqBA,OAAO,EACL,KAAK,KAAK,IAAI,QAAQ,EACtB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EAUzB,KAAK,qBAAqB,EAC1B,KAAK,6BAA6B,EAClC,KAAK,8BAA8B,EAOpC,MAAM,0BAA0B,CAAC;AAGlC,qBAAa,YAAa,YAAW,QAAQ;IAC3C,OAAO,CAAC,MAAM,CAAqC;IACnD,OAAO,CAAC,UAAU,CAAsB;gBAE5B,UAAU,EAAE,mBAAmB;IAI3C,OAAO,CAAC,mBAAmB;IAkC3B,OAAO,CAAC,uBAAuB;YAmCjB,gBAAgB;IASxB,UAAU,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAyBzC,YAAY,IAAI,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;YAI5C,WAAW;IA0EnB,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAalE,WAAW,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAWrE,YAAY,CAChB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,oBAAoB,CAAC;IAuB1B,qBAAqB,CACzB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAc7B,SAAS,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAO7B,cAAc,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAc5D,sBAAsB,CAC1B,MAAM,EAAE,6BAA6B,GACpC,OAAO,CAAC,8BAA8B,CAAC;IAuBpC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;IAyDtD,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IASvD,OAAO,CAAC,kBAAkB;YA2BZ,uBAAuB;IA8LrC,OAAO,CAAC,cAAc;IAwGtB,OAAO,CAAC,gBAAgB;IAmCxB,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,eAAe;CAyOxB"}

package/dist/acp/agent.js

@@ -89,6 +89,7 @@ export class WaveAcpAgent {
             },
             agentCapabilities: {
                 loadSession: true,
+                mcpCapabilities: { http: true, sse: true },
                 sessionCapabilities: {
                     list: {},
                     close: {},
@@ -103,13 +104,17 @@ export class WaveAcpAgent {
     async authenticate() {
         // No authentication required for now
     }
-    async createAgent(sessionId, cwd) {
+    async createAgent(sessionId, cwd, mcpServers) {
         const callbacks = {};
         const agentRef = {};
+        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");
@@ -127,6 +132,7 @@ export class WaveAcpAgent {
                 onPermissionModeChange: (mode) => callbacks.onPermissionModeChange?.(mode),
                 onModelChange: (model) => callbacks.onModelChange?.(model),
                 onUserMessageAdded: (params) => callbacks.onUserMessageAdded?.(params),
+                onMcpServersChange: (servers) => callbacks.onMcpServersChange?.(servers),
             },
         });
         agentRef.instance = agent;
@@ -154,9 +160,9 @@ export class WaveAcpAgent {
         return agent;
     }
     async newSession(params) {
-        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 {
             sessionId: agent.sessionId,
@@ -165,9 +171,9 @@ export class WaveAcpAgent {
         };
     }
     async loadSession(params) {
-        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),
             configOptions: this.getSessionConfigOptions(agent),
@@ -787,6 +793,68 @@ export class WaveAcpAgent {
                     },
                 });
             },
+            onMcpServersChange: (servers) => {
+                for (const server of servers) {
+                    this.connection.sessionUpdate({
+                        sessionId: sessionId,
+                        update: {
+                            sessionUpdate: "ext_notification",
+                            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) {
+    const result = {};
+    for (const server of servers) {
+        const config = {};
+        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) {
+    const result = {};
+    for (const entry of env) {
+        result[entry.name] = entry.value;
+    }
+    return result;
+}
+/**
+ * Convert ACP HttpHeader[] to SDK Record<string, string>.
+ */
+function convertHttpHeaders(headers) {
+    const result = {};
+    for (const entry of headers) {
+        result[entry.name] = entry.value;
+    }
+    return result;
+}

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,WAAW,UAAW,SAAQ,YAAY;IAC9C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAgEjE"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,WAAW,UAAW,SAAQ,YAAY;IAC9C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAkEjE"}

package/dist/cli.js

@@ -4,7 +4,7 @@ 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, tools, allowedTools, disallowedTools, worktreeSession, workdir, version, model, } = options;
+    const { restoreSessionId, continueLastSession, bypassPermissions, permissionMode, pluginDirs, tools, allowedTools, disallowedTools, worktreeSession, workdir, version, model, mcpServers, } = options;
     // Continue with ink-based UI for normal mode
     let shouldRemoveWorktree = false;
     const handleExit = (shouldRemove) => {
@@ -12,7 +12,7 @@ export async function startCli(options) {
         unmount();
     };
     // Render the application
-    const { unmount, waitUntilExit } = render(_jsx(App, { restoreSessionId: restoreSessionId, continueLastSession: continueLastSession, bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, worktreeSession: worktreeSession, workdir: workdir, version: version, model: model, onExit: handleExit }), { exitOnCtrlC: false });
+    const { unmount, waitUntilExit } = render(_jsx(App, { restoreSessionId: restoreSessionId, continueLastSession: continueLastSession, bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, worktreeSession: worktreeSession, workdir: workdir, version: version, model: model, mcpServers: mcpServers, onExit: handleExit }), { exitOnCtrlC: false });
     // Wait for the app to finish unmounting
     await waitUntilExit();
     try {

package/dist/components/App.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/components/App.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAWhE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,UAAU,QAAS,SAAQ,YAAY;IACrC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,MAAM,EAAE,CAAC,YAAY,EAAE,OAAO,KAAK,IAAI,CAAC;CACzC;AAiGD,eAAO,MAAM,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAmClC,CAAC"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/components/App.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAWhE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,UAAU,QAAS,SAAQ,YAAY;IACrC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,MAAM,EAAE,CAAC,YAAY,EAAE,OAAO,KAAK,IAAI,CAAC;CACzC;AAwID,eAAO,MAAM,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAqClC,CAAC"}

package/dist/components/App.js

@@ -2,34 +2,31 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { 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 { hasUncommittedChanges, hasNewCommits, getDefaultRemoteBranch, } from "wave-agent-sdk";
-const AppWithProviders = ({ bypassPermissions, permissionMode, pluginDirs, tools, allowedTools, disallowedTools, worktreeSession, workdir, version, model, onExit, }) => {
+/** Wraps ChatInterface with worktree exit handling, using useChat() for hook access. */
+const ChatWithExitPrompt = ({ worktreeSession, onExit }) => {
+    const { triggerWorktreeRemoveHook } = useChat();
     const [isExiting, setIsExiting] = useState(false);
     const [worktreeStatus, setWorktreeStatus] = useState(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);
-            if (hasChanges || hasCommits) {
-                setWorktreeStatus({
-                    hasUncommittedChanges: hasChanges,
-                    hasNewCommits: hasCommits,
-                });
-                setIsExiting(true);
-            }
-            else {
-                onExit(true);
-            }
+        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(false);
+            onExit(true);
         }
-    }, [worktreeSession, workdir, onExit]);
+    }, [worktreeSession, onExit]);
     useInput((input, key) => {
         if (input === "c" && key.ctrl) {
             handleSignal();
@@ -45,11 +42,28 @@ const AppWithProviders = ({ bypassPermissions, permissionMode, pluginDirs, tools
             process.off("SIGTERM", onSigTerm);
         };
     }, [handleSignal]);
-    if (isExiting && worktreeSession && worktreeStatus) {
-        return (_jsx(WorktreeExitPrompt, { name: worktreeSession.name, path: worktreeSession.path, hasUncommittedChanges: worktreeStatus.hasUncommittedChanges, hasNewCommits: worktreeStatus.hasNewCommits, onKeep: () => onExit(false), onRemove: () => onExit(true), onCancel: () => setIsExiting(false) }));
+    if (isExiting && worktreeStatus) {
+        return (_jsx(WorktreeExitPrompt, { name: worktreeSession.name, path: worktreeSession.path, hasUncommittedChanges: worktreeStatus.hasUncommittedChanges, hasNewCommits: worktreeStatus.hasNewCommits, onKeep: () => onExit(false), onRemove: async () => {
+                await triggerWorktreeRemoveHook(worktreeSession.path);
+                onExit(true);
+            }, onCancel: () => setIsExiting(false) }));
+    }
+    return _jsx(ChatInterface, {});
+};
+const AppWithProviders = ({ 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 (_jsx(ChatProvider, { bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, workdir: workdir, worktreeSession: worktreeSession, version: version, model: model, mcpServers: mcpServers, children: _jsx(ChatWithExitPrompt, { worktreeSession: worktreeSession, onExit: onExit }) }));
     }
-    return (_jsx(ChatProvider, { bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, workdir: workdir, worktreeSession: worktreeSession, version: version, model: model, children: _jsx(ChatInterface, {}) }));
+    return (_jsx(ChatProvider, { bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, workdir: workdir, worktreeSession: worktreeSession, version: version, model: model, mcpServers: mcpServers, children: _jsx(ChatInterface, {}) }));
 };
-export const App = ({ restoreSessionId, continueLastSession, bypassPermissions, permissionMode, pluginDirs, tools, allowedTools, disallowedTools, worktreeSession, workdir, version, model, onExit, }) => {
-    return (_jsx(AppProvider, { restoreSessionId: restoreSessionId, continueLastSession: continueLastSession, children: _jsx(AppWithProviders, { bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, worktreeSession: worktreeSession, workdir: workdir, version: version, model: model, onExit: onExit }) }));
+export const App = ({ restoreSessionId, continueLastSession, bypassPermissions, permissionMode, pluginDirs, tools, allowedTools, disallowedTools, worktreeSession, workdir, version, model, mcpServers, onExit, }) => {
+    return (_jsx(AppProvider, { restoreSessionId: restoreSessionId, continueLastSession: continueLastSession, children: _jsx(AppWithProviders, { bypassPermissions: bypassPermissions, permissionMode: permissionMode, pluginDirs: pluginDirs, tools: tools, allowedTools: allowedTools, disallowedTools: disallowedTools, worktreeSession: worktreeSession, workdir: workdir, version: version, model: model, mcpServers: mcpServers, onExit: onExit }) }));
 };

package/dist/contexts/useChat.d.ts

@@ -65,6 +65,7 @@ export interface ChatContextType {
     version?: string;
     workdir?: string;
     recreateAgent: () => void;
+    triggerWorktreeRemoveHook: (worktreePath: string) => Promise<void>;
 }
 export declare const useChat: () => ChatContextType;
 export interface ChatProviderProps extends BaseAppProps {

package/dist/contexts/useChat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useChat.d.ts","sourceRoot":"","sources":["../../src/contexts/useChat.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"useChat.d.ts","sourceRoot":"","sources":["../../src/contexts/useChat.tsx"],"names":[],"mappings":"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"}

package/dist/contexts/useChat.js

@@ -15,7 +15,7 @@ export const useChat = () => {
     }
     return context;
 };
-export const ChatProvider = ({ children, bypassPermissions, permissionMode: initialPermissionMode, pluginDirs, tools, allowedTools, disallowedTools, workdir, worktreeSession, version, model, }) => {
+export const ChatProvider = ({ children, bypassPermissions, permissionMode: initialPermissionMode, pluginDirs, tools, allowedTools, disallowedTools, workdir, worktreeSession, version, model, mcpServers, }) => {
     const { restoreSessionId, continueLastSession } = useAppConfig();
     const { stdout } = useStdout();
     // Message Display State
@@ -50,7 +50,7 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
     const [configuredModels, setConfiguredModels] = useState([]);
     const [queuedMessages, setQueuedMessages] = useState([]);
     // MCP State
-    const [mcpServers, setMcpServers] = useState([]);
+    const [mcpServerStatuses, setMcpServerStatuses] = useState([]);
     // Background tasks state
     const [backgroundTasks, setBackgroundTasks] = useState([]);
     // Tasks state
@@ -116,8 +116,8 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
             onMessagesChange: () => {
                 throttledSetMessages();
             },
-            onServersChange: (servers) => {
-                setMcpServers([...servers]);
+            onMcpServersChange: (servers) => {
+                setMcpServerStatuses([...servers]);
             },
             onSessionIdChange: (sessionId) => {
                 setSessionId(sessionId);
@@ -181,6 +181,7 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
                 worktreeName: worktreeSession?.name,
                 isNewWorktree: worktreeSession?.isNew,
                 model,
+                mcpServers,
             });
             agentRef.current = agent;
             // Get initial state
@@ -195,8 +196,8 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
             setCurrentModelState(agent.getModelConfig().model);
             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?.() || [];
             setSlashCommands(agentSlashCommands);
@@ -218,6 +219,7 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
         model,
         initialPermissionMode,
         throttledSetMessages,
+        mcpServers,
     ]);
     // Recreate agent (e.g. after plugin install) — destroys current agent and reinitializes
     const recreateAgent = useCallback(() => {
@@ -232,7 +234,7 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
         }
         agentRef.current = null;
         setMessages([]);
-        setMcpServers([]);
+        setMcpServerStatuses([]);
         setSlashCommands([]);
         setSessionId("");
         setIsLoading(false);
@@ -264,6 +266,10 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
             }
         };
     }, []);
+    // Trigger WorktreeRemove hook BEFORE agent destruction
+    const triggerWorktreeRemoveHook = useCallback(async (worktreePath) => {
+        await agentRef.current?.triggerWorktreeRemoveHook(worktreePath);
+    }, []);
     // Send message function (including judgment logic)
     const sendMessage = useCallback(async (content, images, longTextMap) => {
         // Check if there's content to send (text content or image attachments)
@@ -472,7 +478,7 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
         getConfiguredModels,
         setModel,
         isCompacting,
-        mcpServers,
+        mcpServers: mcpServerStatuses,
         connectMcpServer,
         disconnectMcpServer,
         backgroundTasks,
@@ -501,6 +507,7 @@ export const ChatProvider = ({ children, bypassPermissions, permissionMode: init
         version,
         workdir,
         recreateAgent,
+        triggerWorktreeRemoveHook,
     };
     return (_jsx(ChatContext.Provider, { value: contextValue, children: children }));
 };

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAeA,wBAAsB,IAAI,kBAoXzB;AAGD,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG3C,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,oBAAoB,GAC1B,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAoBA,wBAAsB,IAAI,kBAqZzB;AAGD,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG3C,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,oBAAoB,GAC1B,MAAM,sBAAsB,CAAC"}

package/dist/index.js

@@ -1,7 +1,7 @@
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { startCli } from "./cli.js";
-import { generateRandomName } from "wave-agent-sdk";
+import { generateRandomName, setCurrentWorktreeSession, } from "wave-agent-sdk";
 import { createWorktree } from "./utils/worktree.js";
 import path from "path";
 import { readFileSync } from "fs";
@@ -87,6 +87,11 @@ export async function main() {
             description: "Specify the AI model to use",
             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",
@@ -208,6 +213,18 @@ export async function main() {
         const tools = parseTools(argv.tools);
         const allowedTools = parseTools(argv.allowedTools);
         const disallowedTools = parseTools(argv.disallowedTools);
+        // Parse MCP server configuration from --mcp-config JSON string
+        let mcpServers;
+        if (argv.mcpConfig) {
+            try {
+                const parsed = JSON.parse(argv.mcpConfig);
+                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?.map((dir) => path.resolve(originalCwd, dir));
         let worktreeSession;
@@ -219,6 +236,15 @@ 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;
         if (worktreeSession) {
@@ -252,6 +278,7 @@ export async function main() {
                 workdir,
                 version,
                 model: argv.model,
+                mcpServers,
             });
         }
         // Handle print mode directly
@@ -272,6 +299,7 @@ export async function main() {
                 workdir,
                 version,
                 model: argv.model,
+                mcpServers,
             });
         }
         await startCli({
@@ -287,6 +315,7 @@ export async function main() {
             workdir,
             version,
             model: argv.model,
+            mcpServers,
         });
     }
     catch (error) {

package/dist/managers/inputHandlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inputHandlers.d.ts","sourceRoot":"","sources":["../../src/managers/inputHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAwB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEtE,OAAO,EACL,UAAU,EACV,WAAW,EACX,qBAAqB,EACtB,MAAM,mBAAmB,CAAC;AAE3B,eAAO,MAAM,0BAA0B,GACrC,MAAM,MAAM,EACZ,aAAa,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAClC,MAcF,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,OAAO,UAAU,EACjB,UAAU,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EACrC,WAAW,OAAO,CAAC,qBAAqB,CAAC,EACzC,yBAAyB,KAAK,CAAC;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC,KACD,OAAO,CAAC,IAAI,CA8Dd,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,UAAU,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,KACpC,OAAO,CAAC,OAAO,CAiBjB,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,aAAa,cAAc,EAC3B,UAAU,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EACrC,WAAW,OAAO,CAAC,qBAAqB,CAAC,SAc1C,CAAC;AAgCF,eAAO,MAAM,qBAAqB,GAChC,MAAM,MAAM,EACZ,gBAAgB,MAAM,KACrB,MAaF,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,MAAM,MAAM,EACZ,gBAAgB,MAAM,KACrB,MAaF,CAAC;AAEF,eAAO,MAAM,qCAAqC,GAChD,OAAO,UAAU,EACjB,UAAU,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EACrC,WAAW,MAAM,EACjB,gBAAgB,MAAM,KACrB,IAYF,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,OAAO,UAAU,EACjB,UAAU,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EACrC,MAAM,MAAM,KACX,IAkDF,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,OAAO,UAAU,EACjB,UAAU,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EACrC,WAAW,OAAO,CAAC,qBAAqB,CAAC,EACzC,OAAO,MAAM,KACZ,IAwBF,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,EAAE,UAAU,MAAM,KAAG,MAM3D,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,OAAO,UAAU,EACjB,UAAU,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EACrC,WAAW,OAAO,CAAC,qBAAqB,CAAC,EACzC,SAAS,MAAM;;;CA2DhB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,OAAO,UAAU,EACjB,UAAU,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EACrC,WAAW,OAAO,CAAC,qBAAqB,CAAC,EACzC,UAAU,MAAM;;;CAmBjB,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,OAAO,UAAU,EACjB,UAAU,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EACrC,gBAAgB,MAAM,KACrB,OAMF,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,OAAO,UAAU,EACjB,UAAU,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EACrC,gBAAgB,MAAM,KACrB,OAMF,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,OAAO,UAAU,EACjB,UAAU,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EACrC,WAAW,OAAO,CAAC,qBAAqB,CAAC,EACzC,OAAO,MAAM,EACb,KAAK,GAAG,KACP,OA8EF,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,OAAO,UAAU,EACjB,UAAU,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EACrC,WAAW,OAAO,CAAC,qBAAqB,CAAC,EACzC,OAAO,MAAM,EACb,KAAK,GAAG,EACR,cAAc,MAAM,IAAI,KACvB,OAAO,CAAC,OAAO,CA8JjB,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,OAAO,UAAU,EACjB,UAAU,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,EACrC,WAAW,OAAO,CAAC,qBAAqB,CAAC,EACzC,OAAO,MAAM,EACb,KAAK,GAAG,EACR,cAAc,MAAM,IAAI,KACvB,OAAO,CAAC,OAAO,CAwIjB,CAAC"}
+{"version":3,"file":"inputHandlers.d.ts","sourceRoot":"","sources":["../../src/managers/inputHandlers.ts"],"names":[],"mappings":"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"}

package/dist/managers/inputHandlers.js

@@ -74,7 +74,12 @@ export const handlePasteImage = async (dispatch) => {
     }
 };
 export const cyclePermissionMode = (currentMode, dispatch, callbacks) => {
-    const modes = ["default", "acceptEdits", "plan", "bypassPermissions"];
+    const modes = [
+        "default",
+        "acceptEdits",
+        "bypassPermissions",
+        "plan",
+    ];
     const currentIndex = modes.indexOf(currentMode);
     const nextIndex = currentIndex === -1 ? 0 : (currentIndex + 1) % modes.length;
     const nextMode = modes[nextIndex];

package/dist/managers/inputReducer.js

@@ -542,8 +542,8 @@ export function inputReducer(state, action) {
                 const modes = [
                     "default",
                     "acceptEdits",
-                    "plan",
                     "bypassPermissions",
+                    "plan",
                 ];
                 const currentIndex = modes.indexOf(state.permissionMode);
                 const nextIndex = currentIndex === -1 ? 0 : (currentIndex + 1) % modes.length;

package/dist/print-cli.d.ts

@@ -4,6 +4,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>;
 }
 export declare function startPrintCli(options: PrintCliOptions): Promise<void>;
 //# sourceMappingURL=print-cli.d.ts.map

package/dist/print-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"print-cli.d.ts","sourceRoot":"","sources":["../src/print-cli.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,WAAW,eAAgB,SAAQ,YAAY;IACnD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAgBD,wBAAsB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAqN3E"}
+{"version":3,"file":"print-cli.d.ts","sourceRoot":"","sources":["../src/print-cli.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,WAAW,eAAgB,SAAQ,YAAY;IACnD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,8DAA8D;IAC9D,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,CAAC;CACvE;AAgBD,wBAAsB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAuN3E"}

package/dist/print-cli.js

@@ -14,7 +14,7 @@ function displayTimingInfo(startTime, showStats) {
 }
 export async function startPrintCli(options) {
     const startTime = new Date();
-    const { restoreSessionId, continueLastSession, message, showStats = false, bypassPermissions, permissionMode, pluginDirs, tools, allowedTools, disallowedTools, worktreeSession, workdir, model, } = options;
+    const { restoreSessionId, continueLastSession, message, showStats = false, bypassPermissions, permissionMode, pluginDirs, tools, allowedTools, disallowedTools, worktreeSession, workdir, model, mcpServers, } = options;
     if ((typeof message !== "string" || message.trim() === "") &&
         !continueLastSession &&
         !restoreSessionId) {
@@ -110,6 +110,7 @@ export async function startPrintCli(options) {
             disallowedTools,
             workdir,
             model,
+            mcpServers,
             // 保持流式模式以获得更好的命令行用户体验
         });
         // Send message if provided and not empty

package/dist/types.d.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;
     permissionMode?: PermissionMode;
@@ -11,5 +11,7 @@ export interface BaseAppProps {
     workdir?: string;
     version?: string;
     model?: string;
+    /** Optional MCP server configs to pass to Agent.create() */
+    mcpServers?: Record<string, McpServerConfig>;
 }
 //# sourceMappingURL=types.d.ts.map

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.1",
+  "version": "0.15.3",
   "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.1"
+    "wave-agent-sdk": "0.15.3"
   },
   "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/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

@@ -763,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,
       // 保持流式模式以获得更好的命令行用户体验
     });
 

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>;
 }