wave-agent-sdk 0.16.5 → 0.16.7

package/dist/managers/mcpManager.d.ts

@@ -46,6 +46,8 @@ export declare class McpManager {
     private callbacks;
     private mcpServers;
     private resolverCtx;
+    private reconnectTimers;
+    private reconnectAttempts;
     constructor(container: Container, options?: McpManagerOptions);
     /**
      * Initialize MCP manager with working directory and optionally auto-connect
@@ -61,6 +63,12 @@ export declare class McpManager {
     addServer(name: string, config: McpServerConfig): boolean;
     removeServer(name: string): boolean;
     connectServer(name: string): Promise<boolean>;
+    /**
+     * Schedule auto-reconnect with exponential backoff.
+     * Delays: 1s, 2s, 4s, 8s, 16s, 30s, 30s, ...
+     */
+    private scheduleReconnect;
+    private cancelReconnect;
     disconnectServer(name: string): Promise<boolean>;
     getAllConnectedTools(): McpTool[];
     executeMcpTool(toolName: string, args: Record<string, unknown>, context?: ToolContext): Promise<{
@@ -74,6 +82,11 @@ export declare class McpManager {
     }>;
     private executeToolOnConnection;
     cleanup(): Promise<void>;
+    /**
+     * Update credentials and reconnect MCP servers that use template variables.
+     * Called after SSO login to refresh ${WAVE_SSO_TOKEN} and ${WAVE_SERVER_URL}.
+     */
+    refreshCredentials(serverUrl?: string, ssoToken?: string): Promise<void>;
     /**
      * Get all currently available MCP tools as plugins
      */

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

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

package/dist/managers/mcpManager.js

@@ -114,6 +114,8 @@ export class McpManager {
         this.connections = new Map();
         this.configPath = "";
         this.workdir = "";
+        this.reconnectTimers = new Map();
+        this.reconnectAttempts = new Map();
         this.callbacks = options.callbacks || {};
         this.mcpServers = options.mcpServers;
         this.resolverCtx = {
@@ -250,19 +252,21 @@ export class McpManager {
         if (this.servers.has(name)) {
             return false;
         }
+        // Resolve template variables before storing
+        const resolvedConfig = resolveMcpTemplates(config, this.resolverCtx ?? { serverUrl: undefined, ssoToken: undefined });
         const newServer = {
             name,
-            config,
+            config: resolvedConfig,
             status: "disconnected",
         };
         this.servers.set(name, newServer);
         // Update config
         if (this.config) {
-            this.config.mcpServers[name] = config;
+            this.config.mcpServers[name] = resolvedConfig;
         }
         else {
             this.config = {
-                mcpServers: { [name]: config },
+                mcpServers: { [name]: resolvedConfig },
             };
         }
         return true;
@@ -413,6 +417,10 @@ export class McpManager {
                     tools: [],
                     toolCount: 0,
                 });
+                // Auto-reconnect with exponential backoff (not triggered by explicit disconnect)
+                if (!this.reconnectTimers.has(name)) {
+                    this.scheduleReconnect(name);
+                }
             };
             // Store connection
             this.connections.set(name, {
@@ -441,7 +449,46 @@ export class McpManager {
             return false;
         }
     }
+    /**
+     * Schedule auto-reconnect with exponential backoff.
+     * Delays: 1s, 2s, 4s, 8s, 16s, 30s, 30s, ...
+     */
+    scheduleReconnect(name) {
+        const attempts = this.reconnectAttempts.get(name) ?? 0;
+        const delay = Math.min(1000 * Math.pow(2, attempts), 30000);
+        this.reconnectAttempts.set(name, attempts + 1);
+        logger?.info(`Scheduling MCP server ${name} reconnect in ${delay}ms (attempt ${attempts + 1})`);
+        const timer = setTimeout(() => {
+            this.reconnectTimers.delete(name);
+            logger?.debug(`Auto-reconnecting MCP server: ${name}`);
+            this.connectServer(name)
+                .then((success) => {
+                if (success) {
+                    logger?.info(`Auto-reconnected MCP server: ${name}`);
+                    this.reconnectAttempts.delete(name);
+                }
+                else {
+                    logger?.warn(`Auto-reconnect failed for MCP server: ${name}`);
+                    // Will be retried via onclose handler
+                }
+            })
+                .catch((error) => {
+                logger?.error(`Auto-reconnect error for MCP server ${name}:`, error);
+            });
+        }, delay);
+        this.reconnectTimers.set(name, timer);
+    }
+    cancelReconnect(name) {
+        const timer = this.reconnectTimers.get(name);
+        if (timer) {
+            clearTimeout(timer);
+            this.reconnectTimers.delete(name);
+        }
+        this.reconnectAttempts.delete(name);
+    }
     async disconnectServer(name) {
+        // Cancel any pending reconnect attempts
+        this.cancelReconnect(name);
         const connection = this.connections.get(name);
         if (!connection)
             return false;
@@ -550,9 +597,70 @@ export class McpManager {
     }
     // Cleanup all connections
     async cleanup() {
+        // Cancel all pending reconnect timers
+        for (const name of this.reconnectTimers.keys()) {
+            this.cancelReconnect(name);
+        }
         const disconnectPromises = Array.from(this.connections.keys()).map((name) => this.disconnectServer(name));
         await Promise.all(disconnectPromises);
     }
+    /**
+     * Update credentials and reconnect MCP servers that use template variables.
+     * Called after SSO login to refresh ${WAVE_SSO_TOKEN} and ${WAVE_SERVER_URL}.
+     */
+    async refreshCredentials(serverUrl, ssoToken) {
+        // Update resolver context
+        this.resolverCtx = {
+            serverUrl: serverUrl ?? this.resolverCtx?.serverUrl,
+            ssoToken: ssoToken ?? this.resolverCtx?.ssoToken,
+        };
+        logger?.info(`MCP refreshCredentials: serverUrl=${serverUrl}, hasToken=${!!ssoToken}`);
+        // Collect servers that need reconnection
+        const serversToReconnect = [];
+        for (const [name, server] of this.servers) {
+            // Re-resolve config with new credentials
+            const originalConfig = server.config;
+            const resolvedConfig = resolveMcpTemplates(originalConfig, this.resolverCtx);
+            // Update the stored config
+            this.servers.set(name, {
+                ...server,
+                config: resolvedConfig,
+            });
+            if (this.config && this.config.mcpServers[name]) {
+                this.config.mcpServers[name] = resolvedConfig;
+            }
+            // Determine if reconnection is needed
+            const wasConnected = this.connections.has(name);
+            const wasDisconnected = server.status === "disconnected" || server.status === "error";
+            if (wasConnected) {
+                // Disconnect first, then reconnect with new resolved config
+                await this.disconnectServer(name);
+                serversToReconnect.push(name);
+            }
+            else if (wasDisconnected) {
+                // Was disconnected or errored — try to reconnect now that we have credentials
+                serversToReconnect.push(name);
+            }
+        }
+        // Reconnect servers
+        for (const name of serversToReconnect) {
+            logger?.debug(`Reconnecting MCP server after credential refresh: ${name}`);
+            this.connectServer(name)
+                .then((success) => {
+                if (success) {
+                    logger?.info(`Successfully reconnected MCP server: ${name}`);
+                }
+                else {
+                    logger?.warn(`Failed to reconnect MCP server: ${name}`);
+                }
+            })
+                .catch((error) => {
+                logger?.error(`Reconnection to MCP server ${name} failed:`, error);
+            });
+        }
+        // Trigger state change callback
+        this.callbacks.onMcpServersChange?.(this.getAllServers());
+    }
     // ========== Tools Registry Methods ==========
     /**
      * Get all currently available MCP tools as plugins

package/dist/services/authService.d.ts

@@ -7,7 +7,20 @@
 import type { AuthConfig, AuthUser } from "../types/auth.js";
 export declare class AuthService {
     private static instance;
+    private _serverUrl;
+    private onAuthChangeCallbacks;
     static getInstance(): AuthService;
+    /**
+     * Set server URL programmatically (e.g. from AgentOptions.serverUrl).
+     * Takes priority over WAVE_SERVER_URL environment variable.
+     */
+    setServerUrl(url: string): void;
+    /**
+     * Register a callback for auth state changes.
+     * Returns an unsubscribe function.
+     */
+    onAuthChange(callback: (event: "login" | "logout") => void): () => void;
+    private notifyAuthChange;
     getAuthPath(): string;
     loadAuth(): AuthConfig;
     saveAuth(config: AuthConfig): void;
@@ -19,6 +32,8 @@ export declare class AuthService {
         onAuthUrl?: (url: string) => void;
         /** Read authorization code manually (e.g. from stdin). Resolves with code or rejects on cancel. */
         readToken?: () => Promise<string>;
+        /** Server URL override. Falls back to setServerUrl() or WAVE_SERVER_URL env var. */
+        serverUrl?: string;
     }): Promise<string>;
     /**
      * Exchange a short-lived authorization code for a JWT token.

package/dist/services/authService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authService.d.ts","sourceRoot":"","sources":["../../src/services/authService.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAgBH,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAI7D,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAc;IAErC,MAAM,CAAC,WAAW,IAAI,WAAW;IAOjC,WAAW,IAAI,MAAM;IAKrB,QAAQ,IAAI,UAAU;IAatB,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAUlC,SAAS,IAAI,IAAI;IAajB,WAAW,IAAI,MAAM,GAAG,SAAS;IAKjC,YAAY,IAAI,MAAM;IAUhB,KAAK,CAAC,OAAO,CAAC,EAAE;QACpB,6DAA6D;QAC7D,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAClC,mGAAmG;QACnG,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;KACnC,GAAG,OAAO,CAAC,MAAM,CAAC;IAmBnB;;;OAGG;YACW,YAAY;IA0B1B,OAAO,CAAC,oBAAoB;YAoGd,WAAW;IAmBzB,kBAAkB,IAAI,OAAO;IAI7B,WAAW,IAAI,QAAQ,GAAG,SAAS;CAIpC;AAED,eAAO,MAAM,WAAW,aAA4B,CAAC"}
+{"version":3,"file":"authService.d.ts","sourceRoot":"","sources":["../../src/services/authService.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAgBH,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAI7D,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAc;IACrC,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,qBAAqB,CACxB;IAEL,MAAM,CAAC,WAAW,IAAI,WAAW;IAOjC;;;OAGG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI/B;;;OAGG;IACH,YAAY,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,QAAQ,KAAK,IAAI,GAAG,MAAM,IAAI;IASvE,OAAO,CAAC,gBAAgB;IAUxB,WAAW,IAAI,MAAM;IAKrB,QAAQ,IAAI,UAAU;IAatB,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAUlC,SAAS,IAAI,IAAI;IAcjB,WAAW,IAAI,MAAM,GAAG,SAAS;IAKjC,YAAY,IAAI,MAAM;IAUhB,KAAK,CAAC,OAAO,CAAC,EAAE;QACpB,6DAA6D;QAC7D,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAClC,mGAAmG;QACnG,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;QAClC,oFAAoF;QACpF,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,MAAM,CAAC;IAqBnB;;;OAGG;YACW,YAAY;IA0B1B,OAAO,CAAC,oBAAoB;YAoGd,WAAW;IAmBzB,kBAAkB,IAAI,OAAO;IAI7B,WAAW,IAAI,QAAQ,GAAG,SAAS;CAIpC;AAED,eAAO,MAAM,WAAW,aAA4B,CAAC"}

package/dist/services/authService.js

@@ -13,12 +13,42 @@ import { execFile } from "child_process";
 import { promisify } from "util";
 const execFileAsync = promisify(execFile);
 export class AuthService {
+    constructor() {
+        this.onAuthChangeCallbacks = [];
+    }
     static getInstance() {
         if (!AuthService.instance) {
             AuthService.instance = new AuthService();
         }
         return AuthService.instance;
     }
+    /**
+     * Set server URL programmatically (e.g. from AgentOptions.serverUrl).
+     * Takes priority over WAVE_SERVER_URL environment variable.
+     */
+    setServerUrl(url) {
+        this._serverUrl = url;
+    }
+    /**
+     * Register a callback for auth state changes.
+     * Returns an unsubscribe function.
+     */
+    onAuthChange(callback) {
+        this.onAuthChangeCallbacks.push(callback);
+        return () => {
+            this.onAuthChangeCallbacks = this.onAuthChangeCallbacks.filter((cb) => cb !== callback);
+        };
+    }
+    notifyAuthChange(event) {
+        for (const cb of this.onAuthChangeCallbacks) {
+            try {
+                cb(event);
+            }
+            catch {
+                // Don't let callback errors break auth flow
+            }
+        }
+    }
     getAuthPath() {
         const homeDir = os.homedir();
         return path.join(homeDir, ".wave", "auth.json");
@@ -57,20 +87,21 @@ export class AuthService {
         else {
             this.saveAuth(config);
         }
+        this.notifyAuthChange("logout");
     }
     getSSOToken() {
         const config = this.loadAuth();
         return config.SSO_TOKEN;
     }
     getServerUrl() {
-        const url = process.env.WAVE_SERVER_URL;
+        const url = this._serverUrl || process.env.WAVE_SERVER_URL;
         if (!url) {
             throw new Error("WAVE_SERVER_URL environment variable is not set. SSO authentication requires this to be configured.");
         }
         return url;
     }
     async login(options) {
-        const serverUrl = this.getServerUrl();
+        const serverUrl = options?.serverUrl || this.getServerUrl();
         // Start local server, open browser, wait for callback or manual input
         const { code } = await this.startLocalAuthServer(serverUrl, {
             onAuthUrl: options?.onAuthUrl,
@@ -81,6 +112,7 @@ export class AuthService {
         // Save the token and user info (preserve existing keys)
         const existing = this.loadAuth();
         this.saveAuth({ ...existing, SSO_TOKEN: token, user });
+        this.notifyAuthChange("login");
         return token;
     }
     /**

package/dist/utils/containerSetup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"containerSetup.d.ts","sourceRoot":"","sources":["../../src/utils/containerSetup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAwB3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAM3E,OAAO,KAAK,EAAE,YAAY,EAAmB,MAAM,mBAAmB,CAAC;AACvE,OAAO,KAAK,EACV,cAAc,EACd,KAAK,EACL,IAAI,EACJ,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAK3B,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;IAGhB,uBAAuB,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,IAAI,CAAC;IAC3D,aAAa,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC;IACvC,sBAAsB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IACvD,wBAAwB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IACzD,iBAAiB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IAClD,iBAAiB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC;AAED,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,0BAA0B,GACvC,SAAS,CAiRX"}
+{"version":3,"file":"containerSetup.d.ts","sourceRoot":"","sources":["../../src/utils/containerSetup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAwB3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAM3E,OAAO,KAAK,EAAE,YAAY,EAAmB,MAAM,mBAAmB,CAAC;AACvE,OAAO,KAAK,EACV,cAAc,EACd,KAAK,EACL,IAAI,EACJ,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAK3B,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;IAGhB,uBAAuB,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,IAAI,CAAC;IAC3D,aAAa,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC;IACvC,sBAAsB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IACvD,wBAAwB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IACzD,iBAAiB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IAClD,iBAAiB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC;AAED,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,0BAA0B,GACvC,SAAS,CA6RX"}

package/dist/utils/containerSetup.js

@@ -91,6 +91,9 @@ export function setupAgentContainer(setupOptions) {
     container.register("BackgroundTaskManager", backgroundTaskManager);
     const ssoToken = authService.getSSOToken();
     const serverUrl = options.serverUrl || process.env.WAVE_SERVER_URL;
+    if (options.serverUrl) {
+        authService.setServerUrl(options.serverUrl);
+    }
     const mcpManager = new McpManager(container, {
         callbacks,
         mcpServers: options.mcpServers,
@@ -98,6 +101,14 @@ export function setupAgentContainer(setupOptions) {
         ssoToken,
     });
     container.register("McpManager", mcpManager);
+    // Wire up auth change callback to reconnect MCP servers after SSO login
+    authService.onAuthChange((event) => {
+        if (event === "login") {
+            const newServerUrl = options.serverUrl || process.env.WAVE_SERVER_URL;
+            const newToken = authService.getSSOToken();
+            mcpManager.refreshCredentials(newServerUrl, newToken);
+        }
+    });
     const lspManager = options.lspManager || new LspManager(container);
     container.register("LspManager", lspManager);
     const permissionManager = new PermissionManager(container, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-agent-sdk",
-  "version": "0.16.5",
+  "version": "0.16.7",
   "description": "SDK for building AI-powered development tools and agents",
   "keywords": [
     "ai",

package/src/managers/mcpManager.ts

@@ -184,6 +184,8 @@ export class McpManager {
   private mcpServers: Record<string, McpServerConfig> | undefined;
 
   private resolverCtx: McpResolverContext | undefined;
+  private reconnectTimers: Map<string, NodeJS.Timeout> = new Map();
+  private reconnectAttempts: Map<string, number> = new Map();
 
   constructor(
     private container: Container,
@@ -353,9 +355,15 @@ export class McpManager {
       return false;
     }
 
+    // Resolve template variables before storing
+    const resolvedConfig = resolveMcpTemplates(
+      config,
+      this.resolverCtx ?? { serverUrl: undefined, ssoToken: undefined },
+    );
+
     const newServer: McpServerStatus = {
       name,
-      config,
+      config: resolvedConfig,
       status: "disconnected",
     };
 
@@ -363,10 +371,10 @@ export class McpManager {
 
     // Update config
     if (this.config) {
-      this.config.mcpServers[name] = config;
+      this.config.mcpServers[name] = resolvedConfig;
     } else {
       this.config = {
-        mcpServers: { [name]: config },
+        mcpServers: { [name]: resolvedConfig },
       };
     }
 
@@ -554,6 +562,10 @@ export class McpManager {
           tools: [],
           toolCount: 0,
         });
+        // Auto-reconnect with exponential backoff (not triggered by explicit disconnect)
+        if (!this.reconnectTimers.has(name)) {
+          this.scheduleReconnect(name);
+        }
       };
 
       // Store connection
@@ -585,7 +597,53 @@ export class McpManager {
     }
   }
 
+  /**
+   * Schedule auto-reconnect with exponential backoff.
+   * Delays: 1s, 2s, 4s, 8s, 16s, 30s, 30s, ...
+   */
+  private scheduleReconnect(name: string): void {
+    const attempts = this.reconnectAttempts.get(name) ?? 0;
+    const delay = Math.min(1000 * Math.pow(2, attempts), 30000);
+    this.reconnectAttempts.set(name, attempts + 1);
+
+    logger?.info(
+      `Scheduling MCP server ${name} reconnect in ${delay}ms (attempt ${attempts + 1})`,
+    );
+
+    const timer = setTimeout(() => {
+      this.reconnectTimers.delete(name);
+      logger?.debug(`Auto-reconnecting MCP server: ${name}`);
+      this.connectServer(name)
+        .then((success) => {
+          if (success) {
+            logger?.info(`Auto-reconnected MCP server: ${name}`);
+            this.reconnectAttempts.delete(name);
+          } else {
+            logger?.warn(`Auto-reconnect failed for MCP server: ${name}`);
+            // Will be retried via onclose handler
+          }
+        })
+        .catch((error) => {
+          logger?.error(`Auto-reconnect error for MCP server ${name}:`, error);
+        });
+    }, delay);
+
+    this.reconnectTimers.set(name, timer);
+  }
+
+  private cancelReconnect(name: string): void {
+    const timer = this.reconnectTimers.get(name);
+    if (timer) {
+      clearTimeout(timer);
+      this.reconnectTimers.delete(name);
+    }
+    this.reconnectAttempts.delete(name);
+  }
+
   async disconnectServer(name: string): Promise<boolean> {
+    // Cancel any pending reconnect attempts
+    this.cancelReconnect(name);
+
     const connection = this.connections.get(name);
     if (!connection) return false;
 
@@ -749,12 +807,92 @@ export class McpManager {
 
   // Cleanup all connections
   async cleanup(): Promise<void> {
+    // Cancel all pending reconnect timers
+    for (const name of this.reconnectTimers.keys()) {
+      this.cancelReconnect(name);
+    }
     const disconnectPromises = Array.from(this.connections.keys()).map((name) =>
       this.disconnectServer(name),
     );
     await Promise.all(disconnectPromises);
   }
 
+  /**
+   * Update credentials and reconnect MCP servers that use template variables.
+   * Called after SSO login to refresh ${WAVE_SSO_TOKEN} and ${WAVE_SERVER_URL}.
+   */
+  async refreshCredentials(
+    serverUrl?: string,
+    ssoToken?: string,
+  ): Promise<void> {
+    // Update resolver context
+    this.resolverCtx = {
+      serverUrl: serverUrl ?? this.resolverCtx?.serverUrl,
+      ssoToken: ssoToken ?? this.resolverCtx?.ssoToken,
+    };
+
+    logger?.info(
+      `MCP refreshCredentials: serverUrl=${serverUrl}, hasToken=${!!ssoToken}`,
+    );
+
+    // Collect servers that need reconnection
+    const serversToReconnect: string[] = [];
+
+    for (const [name, server] of this.servers) {
+      // Re-resolve config with new credentials
+      const originalConfig = server.config;
+      const resolvedConfig = resolveMcpTemplates(
+        originalConfig,
+        this.resolverCtx,
+      );
+
+      // Update the stored config
+      this.servers.set(name, {
+        ...server,
+        config: resolvedConfig,
+      });
+
+      if (this.config && this.config.mcpServers[name]) {
+        this.config.mcpServers[name] = resolvedConfig;
+      }
+
+      // Determine if reconnection is needed
+      const wasConnected = this.connections.has(name);
+      const wasDisconnected =
+        server.status === "disconnected" || server.status === "error";
+
+      if (wasConnected) {
+        // Disconnect first, then reconnect with new resolved config
+        await this.disconnectServer(name);
+        serversToReconnect.push(name);
+      } else if (wasDisconnected) {
+        // Was disconnected or errored — try to reconnect now that we have credentials
+        serversToReconnect.push(name);
+      }
+    }
+
+    // Reconnect servers
+    for (const name of serversToReconnect) {
+      logger?.debug(
+        `Reconnecting MCP server after credential refresh: ${name}`,
+      );
+      this.connectServer(name)
+        .then((success) => {
+          if (success) {
+            logger?.info(`Successfully reconnected MCP server: ${name}`);
+          } else {
+            logger?.warn(`Failed to reconnect MCP server: ${name}`);
+          }
+        })
+        .catch((error) => {
+          logger?.error(`Reconnection to MCP server ${name} failed:`, error);
+        });
+    }
+
+    // Trigger state change callback
+    this.callbacks.onMcpServersChange?.(this.getAllServers());
+  }
+
   // ========== Tools Registry Methods ==========
 
   /**

package/src/services/authService.ts

@@ -25,6 +25,9 @@ const execFileAsync = promisify(execFile);
 
 export class AuthService {
   private static instance: AuthService;
+  private _serverUrl: string | undefined;
+  private onAuthChangeCallbacks: Array<(event: "login" | "logout") => void> =
+    [];
 
   static getInstance(): AuthService {
     if (!AuthService.instance) {
@@ -33,6 +36,37 @@ export class AuthService {
     return AuthService.instance;
   }
 
+  /**
+   * Set server URL programmatically (e.g. from AgentOptions.serverUrl).
+   * Takes priority over WAVE_SERVER_URL environment variable.
+   */
+  setServerUrl(url: string): void {
+    this._serverUrl = url;
+  }
+
+  /**
+   * Register a callback for auth state changes.
+   * Returns an unsubscribe function.
+   */
+  onAuthChange(callback: (event: "login" | "logout") => void): () => void {
+    this.onAuthChangeCallbacks.push(callback);
+    return () => {
+      this.onAuthChangeCallbacks = this.onAuthChangeCallbacks.filter(
+        (cb) => cb !== callback,
+      );
+    };
+  }
+
+  private notifyAuthChange(event: "login" | "logout"): void {
+    for (const cb of this.onAuthChangeCallbacks) {
+      try {
+        cb(event);
+      } catch {
+        // Don't let callback errors break auth flow
+      }
+    }
+  }
+
   getAuthPath(): string {
     const homeDir = os.homedir();
     return path.join(homeDir, ".wave", "auth.json");
@@ -72,6 +106,7 @@ export class AuthService {
     } else {
       this.saveAuth(config);
     }
+    this.notifyAuthChange("logout");
   }
 
   getSSOToken(): string | undefined {
@@ -80,7 +115,7 @@ export class AuthService {
   }
 
   getServerUrl(): string {
-    const url = process.env.WAVE_SERVER_URL;
+    const url = this._serverUrl || process.env.WAVE_SERVER_URL;
     if (!url) {
       throw new Error(
         "WAVE_SERVER_URL environment variable is not set. SSO authentication requires this to be configured.",
@@ -94,8 +129,10 @@ export class AuthService {
     onAuthUrl?: (url: string) => void;
     /** Read authorization code manually (e.g. from stdin). Resolves with code or rejects on cancel. */
     readToken?: () => Promise<string>;
+    /** Server URL override. Falls back to setServerUrl() or WAVE_SERVER_URL env var. */
+    serverUrl?: string;
   }): Promise<string> {
-    const serverUrl = this.getServerUrl();
+    const serverUrl = options?.serverUrl || this.getServerUrl();
 
     // Start local server, open browser, wait for callback or manual input
     const { code } = await this.startLocalAuthServer(serverUrl, {
@@ -110,6 +147,8 @@ export class AuthService {
     const existing = this.loadAuth();
     this.saveAuth({ ...existing, SSO_TOKEN: token, user });
 
+    this.notifyAuthChange("login");
+
     return token;
   }
 

package/src/utils/containerSetup.ts

@@ -148,6 +148,9 @@ export function setupAgentContainer(
 
   const ssoToken = authService.getSSOToken();
   const serverUrl = options.serverUrl || process.env.WAVE_SERVER_URL;
+  if (options.serverUrl) {
+    authService.setServerUrl(options.serverUrl);
+  }
   const mcpManager = new McpManager(container, {
     callbacks,
     mcpServers: options.mcpServers as
@@ -158,6 +161,15 @@ export function setupAgentContainer(
   });
   container.register("McpManager", mcpManager);
 
+  // Wire up auth change callback to reconnect MCP servers after SSO login
+  authService.onAuthChange((event) => {
+    if (event === "login") {
+      const newServerUrl = options.serverUrl || process.env.WAVE_SERVER_URL;
+      const newToken = authService.getSSOToken();
+      mcpManager.refreshCredentials(newServerUrl, newToken);
+    }
+  });
+
   const lspManager = options.lspManager || new LspManager(container);
   container.register("LspManager", lspManager);