wave-agent-sdk 0.16.3 → 0.16.5

package/dist/index.d.ts

@@ -22,4 +22,6 @@ export * from "./utils/gitUtils.js";
 export * from "./utils/nameGenerator.js";
 export * from "./utils/worktreeSession.js";
 export * from "./types/index.js";
+export * from "./tools/buildTool.js";
+export type { ToolPlugin, ToolResult, ToolContext } from "./tools/types.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAG1C,cAAc,sBAAsB,CAAC;AAGrC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAG3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAG1C,cAAc,sBAAsB,CAAC;AAGrC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAG3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AAGjC,cAAc,sBAAsB,CAAC;AACrC,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/index.js

@@ -26,3 +26,5 @@ export * from "./utils/gitUtils.js";
 export * from "./utils/nameGenerator.js";
 export * from "./utils/worktreeSession.js";
 export * from "./types/index.js";
+// Export tool building utilities
+export * from "./tools/buildTool.js";

package/dist/managers/mcpManager.d.ts

@@ -10,16 +10,32 @@ export interface McpManagerOptions {
     logger?: Logger;
     /** Pre-configured MCP servers passed from constructor options */
     mcpServers?: Record<string, McpServerConfig>;
+    /** Wave server URL for resolving ${WAVE_SERVER_URL} templates in MCP configs */
+    serverUrl?: string;
+    /** SSO token for resolving ${WAVE_SSO_TOKEN} templates in MCP configs */
+    ssoToken?: string;
 }
+export declare function expandEnvVars(value: string): string;
 /**
- * Expand environment variables in a string value.
- * Supports ${VAR} and ${VAR:-default} patterns.
+ * Context for resolving Wave-specific MCP template variables.
  */
-export declare function expandEnvVars(value: string): string;
+export interface McpResolverContext {
+    serverUrl?: string;
+    ssoToken?: string;
+}
+/**
+ * Walk a single McpServerConfig and replace Wave template variables.
+ * Only replaces ${WAVE_SERVER_URL} and ${WAVE_SSO_TOKEN} — does not touch
+ * arbitrary env vars (that is what expandEnvVars handles).
+ */
+export declare function resolveMcpTemplates(config: McpServerConfig, ctx: McpResolverContext): McpServerConfig;
 /**
- * Walk an MCP config and expand env vars in all string fields.
+ * Walk an MCP config and resolve variables in all string fields.
+ * Applies two steps in order:
+ *   1. expandEnvVars — resolves ${VAR} from process.env
+ *   2. resolveMcpTemplates — resolves ${WAVE_SERVER_URL}, ${WAVE_SSO_TOKEN} from context
  */
-export declare function resolveMcpConfig(config: McpConfig): McpConfig;
+export declare function resolveMcpConfig(config: McpConfig, ctx?: McpResolverContext): McpConfig;
 export declare class McpManager {
     private container;
     private config;
@@ -29,6 +45,7 @@ export declare class McpManager {
     private workdir;
     private callbacks;
     private mcpServers;
+    private resolverCtx;
     constructor(container: Container, options?: McpManagerOptions);
     /**
      * Initialize MCP manager with working directory and optionally auto-connect

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

@@ -10,20 +10,71 @@ import { logger } from "../utils/globalLogger.js";
  * Expand environment variables in a string value.
  * Supports ${VAR} and ${VAR:-default} patterns.
  */
+const WAVE_TEMPLATE_VARS = ["WAVE_SERVER_URL", "WAVE_SSO_TOKEN"];
 export function expandEnvVars(value) {
     return value.replace(/\$\{([^}]+)\}/g, (_match, expr) => {
         const [varName, ...rest] = expr.split(":-");
         const defaultValue = rest.join(":-");
+        // Skip Wave-specific template variables — they are handled by resolveMcpTemplates
+        if (WAVE_TEMPLATE_VARS.includes(varName)) {
+            return _match; // return original ${...} string untouched
+        }
         return process.env[varName] ?? defaultValue;
     });
 }
 /**
- * Walk an MCP config and expand env vars in all string fields.
+ * Walk a single McpServerConfig and replace Wave template variables.
+ * Only replaces ${WAVE_SERVER_URL} and ${WAVE_SSO_TOKEN} — does not touch
+ * arbitrary env vars (that is what expandEnvVars handles).
+ */
+export function resolveMcpTemplates(config, ctx) {
+    const resolved = { ...config };
+    const replace = (value) => {
+        let result = value;
+        if (ctx.serverUrl !== undefined) {
+            result = result.replace(/\$\{WAVE_SERVER_URL\}/g, ctx.serverUrl);
+        }
+        if (ctx.ssoToken !== undefined) {
+            result = result.replace(/\$\{WAVE_SSO_TOKEN\}/g, ctx.ssoToken);
+        }
+        return result;
+    };
+    if (resolved.command) {
+        resolved.command = replace(resolved.command);
+    }
+    if (resolved.args) {
+        resolved.args = resolved.args.map(replace);
+    }
+    if (resolved.env) {
+        const resolvedEnv = {};
+        for (const [key, val] of Object.entries(resolved.env)) {
+            resolvedEnv[key] = replace(val);
+        }
+        resolved.env = resolvedEnv;
+    }
+    if (resolved.url) {
+        resolved.url = replace(resolved.url);
+    }
+    if (resolved.headers) {
+        const resolvedHeaders = {};
+        for (const [key, val] of Object.entries(resolved.headers)) {
+            resolvedHeaders[key] = replace(val);
+        }
+        resolved.headers = resolvedHeaders;
+    }
+    return resolved;
+}
+/**
+ * Walk an MCP config and resolve variables in all string fields.
+ * Applies two steps in order:
+ *   1. expandEnvVars — resolves ${VAR} from process.env
+ *   2. resolveMcpTemplates — resolves ${WAVE_SERVER_URL}, ${WAVE_SSO_TOKEN} from context
  */
-export function resolveMcpConfig(config) {
+export function resolveMcpConfig(config, ctx) {
     const resolved = { mcpServers: {} };
     for (const [name, serverConfig] of Object.entries(config.mcpServers)) {
-        const resolvedServer = { ...serverConfig };
+        // Step 1: expand env vars from process.env
+        let resolvedServer = { ...serverConfig };
         if (resolvedServer.command) {
             resolvedServer.command = expandEnvVars(resolvedServer.command);
         }
@@ -47,6 +98,10 @@ export function resolveMcpConfig(config) {
             }
             resolvedServer.headers = resolvedHeaders;
         }
+        // Step 2: resolve Wave template variables from context
+        if (ctx) {
+            resolvedServer = resolveMcpTemplates(resolvedServer, ctx);
+        }
         resolved.mcpServers[name] = resolvedServer;
     }
     return resolved;
@@ -61,6 +116,10 @@ export class McpManager {
         this.workdir = "";
         this.callbacks = options.callbacks || {};
         this.mcpServers = options.mcpServers;
+        this.resolverCtx = {
+            serverUrl: options.serverUrl,
+            ssoToken: options.ssoToken,
+        };
     }
     /**
      * Initialize MCP manager with working directory and optionally auto-connect
@@ -115,7 +174,7 @@ export class McpManager {
         }
         try {
             const configContent = await fs.readFile(this.configPath, "utf-8");
-            const workspaceConfig = resolveMcpConfig(JSON.parse(configContent));
+            const workspaceConfig = resolveMcpConfig(JSON.parse(configContent), this.resolverCtx);
             // Merge workspace config with any existing config (e.g., from plugins or constructor)
             // Constructor-provided servers take precedence, then workspace config, then existing config
             const merged = { mcpServers: {} };

package/dist/managers/toolManager.d.ts

@@ -9,6 +9,8 @@ export interface ToolManagerOptions {
     container: Container;
     /** Optional list of tool names to enable */
     tools?: string[];
+    /** Custom tools to register alongside built-in tools */
+    customTools?: ToolPlugin[];
 }
 /**
  * Tool Manager
@@ -19,6 +21,7 @@ export interface ToolManagerOptions {
 declare class ToolManager {
     private toolsRegistry;
     private tools?;
+    private customTools?;
     private container;
     constructor(options: ToolManagerOptions);
     private get mcpManager();

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

@@ -1 +1 @@
-{"version":3,"file":"toolManager.d.ts","sourceRoot":"","sources":["../../src/managers/toolManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AA4B7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EACV,cAAc,EAGf,MAAM,mBAAmB,CAAC;AAO3B,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIlD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAKxD,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,SAAS,CAAC;IACrB,4CAA4C;IAC5C,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;;;GAKG;AACH,cAAM,WAAW;IACf,OAAO,CAAC,aAAa,CAAiC;IACtD,OAAO,CAAC,KAAK,CAAC,CAAW;IACzB,OAAO,CAAC,SAAS,CAAY;gBAEjB,OAAO,EAAE,kBAAkB;IAKvC,OAAO,KAAK,UAAU,GAErB;IAED;;OAEG;IACI,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAIvC;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACI,sBAAsB,IAAI,IAAI;IAmCrC;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAiBxB;;;;;;;;;;;;OAYG;IACG,OAAO,CACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,UAAU,CAAC;IAgJtB,IAAI,IAAI,UAAU,EAAE;IAYpB,cAAc,CAAC,OAAO,CAAC,EAAE;QACvB,kBAAkB,CAAC,EAAE,qBAAqB,EAAE,CAAC;QAC7C,eAAe,CAAC,EAAE,aAAa,EAAE,CAAC;QAClC,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,uEAAuE;QACvE,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;KAC/B,GAAG,0BAA0B,EAAE;IAgEhC;;OAEG;IACI,QAAQ,IAAI,UAAU,EAAE;IAI/B;;OAEG;IACI,iBAAiB,IAAI,cAAc;IAa1C;;;OAGG;IACI,iBAAiB,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IAIpD;;OAEG;IACI,oBAAoB,IAAI,iBAAiB,GAAG,SAAS;IAI5D;;OAEG;IACI,oBAAoB,IAAI,MAAM,EAAE;IAcvC;;OAEG;IACI,cAAc,IACjB,OAAO,4BAA4B,EAAE,WAAW,GAChD,SAAS;CAKd;AAGD,OAAO,EAAE,WAAW,EAAE,CAAC"}
+{"version":3,"file":"toolManager.d.ts","sourceRoot":"","sources":["../../src/managers/toolManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AA4B7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EACV,cAAc,EAGf,MAAM,mBAAmB,CAAC;AAO3B,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIlD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAKxD,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,SAAS,CAAC;IACrB,4CAA4C;IAC5C,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,wDAAwD;IACxD,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;CAC5B;AAED;;;;;GAKG;AACH,cAAM,WAAW;IACf,OAAO,CAAC,aAAa,CAAiC;IACtD,OAAO,CAAC,KAAK,CAAC,CAAW;IACzB,OAAO,CAAC,WAAW,CAAC,CAAe;IACnC,OAAO,CAAC,SAAS,CAAY;gBAEjB,OAAO,EAAE,kBAAkB;IAMvC,OAAO,KAAK,UAAU,GAErB;IAED;;OAEG;IACI,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAIvC;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACI,sBAAsB,IAAI,IAAI;IA0CrC;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAiBxB;;;;;;;;;;;;OAYG;IACG,OAAO,CACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,UAAU,CAAC;IAgJtB,IAAI,IAAI,UAAU,EAAE;IAYpB,cAAc,CAAC,OAAO,CAAC,EAAE;QACvB,kBAAkB,CAAC,EAAE,qBAAqB,EAAE,CAAC;QAC7C,eAAe,CAAC,EAAE,aAAa,EAAE,CAAC;QAClC,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,uEAAuE;QACvE,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;KAC/B,GAAG,0BAA0B,EAAE;IAgEhC;;OAEG;IACI,QAAQ,IAAI,UAAU,EAAE;IAI/B;;OAEG;IACI,iBAAiB,IAAI,cAAc;IAa1C;;;OAGG;IACI,iBAAiB,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IAIpD;;OAEG;IACI,oBAAoB,IAAI,iBAAiB,GAAG,SAAS;IAI5D;;OAEG;IACI,oBAAoB,IAAI,MAAM,EAAE;IAcvC;;OAEG;IACI,cAAc,IACjB,OAAO,4BAA4B,EAAE,WAAW,GAChD,SAAS;CAKd;AAGD,OAAO,EAAE,WAAW,EAAE,CAAC"}

package/dist/managers/toolManager.js

@@ -35,6 +35,7 @@ class ToolManager {
         this.toolsRegistry = new Map();
         this.container = options.container;
         this.tools = options.tools;
+        this.customTools = options.customTools;
     }
     get mcpManager() {
         return this.container.get("McpManager");
@@ -100,6 +101,12 @@ class ToolManager {
                 this.toolsRegistry.set(tool.name, tool);
             }
         }
+        // Register custom tools
+        for (const tool of this.customTools || []) {
+            if (this.shouldEnableTool(tool.name)) {
+                this.toolsRegistry.set(tool.name, tool);
+            }
+        }
     }
     /**
      * Check if a tool should be enabled based on tools configuration and permission rules

package/dist/services/authService.d.ts

@@ -13,7 +13,7 @@ export declare class AuthService {
     saveAuth(config: AuthConfig): void;
     clearAuth(): void;
     getSSOToken(): string | undefined;
-    getAiBaseUrl(): string;
+    getServerUrl(): string;
     login(options?: {
         /** Callback to receive the auth URL (for display in CLI). */
         onAuthUrl?: (url: string) => void;

package/dist/services/authService.js

@@ -62,22 +62,22 @@ export class AuthService {
         const config = this.loadAuth();
         return config.SSO_TOKEN;
     }
-    getAiBaseUrl() {
-        const url = process.env.WAVE_AI_URL;
+    getServerUrl() {
+        const url = process.env.WAVE_SERVER_URL;
         if (!url) {
-            throw new Error("WAVE_AI_URL environment variable is not set. SSO authentication requires this to be configured.");
+            throw new Error("WAVE_SERVER_URL environment variable is not set. SSO authentication requires this to be configured.");
         }
         return url;
     }
     async login(options) {
-        const aiUrl = this.getAiBaseUrl();
+        const serverUrl = this.getServerUrl();
         // Start local server, open browser, wait for callback or manual input
-        const { code } = await this.startLocalAuthServer(aiUrl, {
+        const { code } = await this.startLocalAuthServer(serverUrl, {
             onAuthUrl: options?.onAuthUrl,
             readToken: options?.readToken,
         });
         // Exchange authorization code for JWT (includes user info)
-        const { token, user } = await this.exchangeCode(aiUrl, code);
+        const { token, user } = await this.exchangeCode(serverUrl, code);
         // Save the token and user info (preserve existing keys)
         const existing = this.loadAuth();
         this.saveAuth({ ...existing, SSO_TOKEN: token, user });
@@ -87,8 +87,8 @@ export class AuthService {
      * Exchange a short-lived authorization code for a JWT token.
      * Returns both the token and user info.
      */
-    async exchangeCode(aiUrl, code) {
-        const exchangeUrl = `${aiUrl}/api/auth/exchange`;
+    async exchangeCode(serverUrl, code) {
+        const exchangeUrl = `${serverUrl}/api/auth/exchange`;
         const response = await fetch(exchangeUrl, {
             method: "POST",
             headers: { "Content-Type": "application/json" },
@@ -104,7 +104,7 @@ export class AuthService {
             user: { id: data.user.id, email: data.user.email },
         };
     }
-    startLocalAuthServer(aiUrl, options) {
+    startLocalAuthServer(serverUrl, options) {
         return new Promise((resolve, reject) => {
             let settled = false;
             const server = createServer((req, res) => {
@@ -146,7 +146,7 @@ export class AuthService {
                 }
                 const port = address.port;
                 const callbackUrl = `http://127.0.0.1:${port}`;
-                const authUrl = `${aiUrl}/login?callback_url=${encodeURIComponent(callbackUrl)}`;
+                const authUrl = `${serverUrl}/login?callback_url=${encodeURIComponent(callbackUrl)}`;
                 // Notify caller of the auth URL
                 options?.onAuthUrl?.(authUrl);
                 // Try to open browser; if it fails, keep server alive for manual visit

package/dist/services/configurationService.js

@@ -316,14 +316,14 @@ export class ConfigurationService {
      * @throws ConfigurationError if required configuration is missing after fallbacks
      */
     resolveGatewayConfig(apiKey, baseURL, defaultHeaders, fetchOptions, fetch) {
-        // Check for SSO token first - if present and AI URL is available, use SSO mode
-        // AI URL resolution: options > process.env
+        // Check for SSO token first - if present and server URL is available, use SSO mode
+        // Server URL resolution: options > process.env
         const ssoToken = this.readSSOToken();
-        const aiUrl = this.options.aiUrl || process.env.WAVE_AI_URL;
-        if (ssoToken && aiUrl) {
+        const serverUrl = this.options.serverUrl || process.env.WAVE_SERVER_URL;
+        if (ssoToken && serverUrl) {
             return {
                 apiKey: ssoToken,
-                baseURL: `${aiUrl}/api/v1`,
+                baseURL: `${serverUrl}/api/v1`,
                 defaultHeaders: Object.keys(defaultHeaders || {}).length > 0
                     ? defaultHeaders
                     : undefined,

package/dist/tools/buildTool.d.ts

@@ -0,0 +1,22 @@
+import type { ToolPlugin, ToolResult, ToolContext } from "./types.js";
+import type { SubagentConfiguration } from "../utils/subagentParser.js";
+import type { SkillMetadata } from "../types/skills.js";
+export interface ToolDef {
+    name: string;
+    description: string;
+    parameters: Record<string, unknown>;
+    required?: string[];
+    execute: (args: Record<string, unknown>, context: ToolContext) => Promise<ToolResult>;
+    prompt?: string | ((args?: {
+        availableSubagents?: SubagentConfiguration[];
+        availableSkills?: SkillMetadata[];
+        workdir?: string;
+        isSubagent?: boolean;
+    }) => string);
+    formatCompactParams?: (params: Record<string, unknown>, context: ToolContext) => string;
+    shouldDefer?: boolean;
+    alwaysLoad?: boolean;
+    additionalProperties?: boolean;
+}
+export declare function buildTool(def: ToolDef): ToolPlugin;
+//# sourceMappingURL=buildTool.d.ts.map

package/dist/tools/buildTool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildTool.d.ts","sourceRoot":"","sources":["../../src/tools/buildTool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEtE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,EAAE,CACP,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,EAAE,WAAW,KACjB,OAAO,CAAC,UAAU,CAAC,CAAC;IACzB,MAAM,CAAC,EACH,MAAM,GACN,CAAC,CAAC,IAAI,CAAC,EAAE;QACP,kBAAkB,CAAC,EAAE,qBAAqB,EAAE,CAAC;QAC7C,eAAe,CAAC,EAAE,aAAa,EAAE,CAAC;QAClC,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB,KAAK,MAAM,CAAC,CAAC;IAClB,mBAAmB,CAAC,EAAE,CACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,EAAE,WAAW,KACjB,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,CAiClD"}

package/dist/tools/buildTool.js

@@ -0,0 +1,33 @@
+export function buildTool(def) {
+    const config = {
+        type: "function",
+        function: {
+            name: def.name,
+            description: def.description,
+            parameters: {
+                type: "object",
+                properties: def.parameters,
+                required: def.required || [],
+                additionalProperties: def.additionalProperties ?? false,
+            },
+        },
+    };
+    // Normalize prompt: if string, wrap in function
+    let promptFn;
+    if (typeof def.prompt === "string") {
+        const staticPrompt = def.prompt;
+        promptFn = () => staticPrompt;
+    }
+    else {
+        promptFn = def.prompt;
+    }
+    return {
+        name: def.name,
+        config,
+        execute: def.execute,
+        prompt: promptFn,
+        formatCompactParams: def.formatCompactParams,
+        shouldDefer: def.shouldDefer ?? false,
+        alwaysLoad: def.alwaysLoad ?? false,
+    };
+}

package/dist/types/agent.d.ts

@@ -5,6 +5,7 @@ import type { MessageManagerCallbacks } from "../managers/messageManager.js";
 import type { BackgroundTaskManagerCallbacks } from "../managers/backgroundTaskManager.js";
 import type { McpManagerCallbacks } from "../managers/mcpManager.js";
 import type { SubagentManagerCallbacks } from "../managers/subagentManager.js";
+import type { ToolPlugin } from "../tools/types.js";
 /**
  * Configuration options for Agent instances
  *
@@ -14,8 +15,8 @@ import type { SubagentManagerCallbacks } from "../managers/subagentManager.js";
 export interface AgentOptions {
     apiKey?: string;
     baseURL?: string;
-    /** Wave AI URL for SSO authentication (fallback to WAVE_AI_URL env var) */
-    aiUrl?: string;
+    /** Wave server URL for SSO authentication (fallback to WAVE_SERVER_URL env var) */
+    serverUrl?: string;
     defaultHeaders?: Record<string, string>;
     fetchOptions?: ClientOptions["fetchOptions"];
     fetch?: ClientOptions["fetch"];
@@ -73,6 +74,8 @@ export interface AgentOptions {
      * Overrides .mcp.json for specified server names.
      */
     mcpServers?: Record<string, McpServerConfig>;
+    /** Custom tools provided by the SDK user, registered alongside built-in tools */
+    customTools?: ToolPlugin[];
     [key: string]: unknown;
 }
 export interface AgentCallbacks extends MessageManagerCallbacks, BackgroundTaskManagerCallbacks, McpManagerCallbacks, SubagentManagerCallbacks {

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

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

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;AAI3B,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,CA4QX"}
+{"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"}

package/dist/utils/containerSetup.js

@@ -28,6 +28,7 @@ import { AutoMemoryService } from "../services/autoMemoryService.js";
 import { USER_MEMORY_FILE } from "./constants.js";
 import { getGitMainRepoRoot } from "./gitUtils.js";
 import { logger } from "./globalLogger.js";
+import { authService } from "../services/authService.js";
 export function setupAgentContainer(setupOptions) {
     const { options, workdir, configurationService, systemPrompt, stream, onBackgroundTasksChange, onTasksChange, onPermissionModeChange, handlePlanModeTransition, setPermissionMode, addPermissionRule, addUsage, } = setupOptions;
     const callbacks = options.callbacks || {};
@@ -88,9 +89,13 @@ export function setupAgentContainer(setupOptions) {
         workdir,
     });
     container.register("BackgroundTaskManager", backgroundTaskManager);
+    const ssoToken = authService.getSSOToken();
+    const serverUrl = options.serverUrl || process.env.WAVE_SERVER_URL;
     const mcpManager = new McpManager(container, {
         callbacks,
         mcpServers: options.mcpServers,
+        serverUrl,
+        ssoToken,
     });
     container.register("McpManager", mcpManager);
     const lspManager = options.lspManager || new LspManager(container);
@@ -175,6 +180,7 @@ export function setupAgentContainer(setupOptions) {
     const toolManager = new ToolManager({
         container,
         tools: options.tools,
+        customTools: options.customTools,
     });
     container.register("ToolManager", toolManager);
     container.register("PermissionMode", options.permissionMode);

package/package.json

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

package/src/index.ts

@@ -29,3 +29,7 @@ export * from "./utils/gitUtils.js";
 export * from "./utils/nameGenerator.js";
 export * from "./utils/worktreeSession.js";
 export * from "./types/index.js";
+
+// Export tool building utilities
+export * from "./tools/buildTool.js";
+export type { ToolPlugin, ToolResult, ToolContext } from "./tools/types.js";

package/src/managers/mcpManager.ts

@@ -34,28 +34,106 @@ export interface McpManagerOptions {
   logger?: Logger;
   /** Pre-configured MCP servers passed from constructor options */
   mcpServers?: Record<string, McpServerConfig>;
+  /** Wave server URL for resolving ${WAVE_SERVER_URL} templates in MCP configs */
+  serverUrl?: string;
+  /** SSO token for resolving ${WAVE_SSO_TOKEN} templates in MCP configs */
+  ssoToken?: string;
 }
 
 /**
  * Expand environment variables in a string value.
  * Supports ${VAR} and ${VAR:-default} patterns.
  */
+const WAVE_TEMPLATE_VARS = ["WAVE_SERVER_URL", "WAVE_SSO_TOKEN"];
+
 export function expandEnvVars(value: string): string {
   return value.replace(/\$\{([^}]+)\}/g, (_match, expr: string) => {
     const [varName, ...rest] = expr.split(":-");
     const defaultValue = rest.join(":-");
+    // Skip Wave-specific template variables — they are handled by resolveMcpTemplates
+    if (WAVE_TEMPLATE_VARS.includes(varName)) {
+      return _match; // return original ${...} string untouched
+    }
     return process.env[varName] ?? defaultValue;
   });
 }
 
 /**
- * Walk an MCP config and expand env vars in all string fields.
+ * Context for resolving Wave-specific MCP template variables.
+ */
+export interface McpResolverContext {
+  serverUrl?: string; // resolves ${WAVE_SERVER_URL}
+  ssoToken?: string; // resolves ${WAVE_SSO_TOKEN}
+}
+
+/**
+ * Walk a single McpServerConfig and replace Wave template variables.
+ * Only replaces ${WAVE_SERVER_URL} and ${WAVE_SSO_TOKEN} — does not touch
+ * arbitrary env vars (that is what expandEnvVars handles).
  */
-export function resolveMcpConfig(config: McpConfig): McpConfig {
+export function resolveMcpTemplates(
+  config: McpServerConfig,
+  ctx: McpResolverContext,
+): McpServerConfig {
+  const resolved: McpServerConfig = { ...config };
+
+  const replace = (value: string): string => {
+    let result = value;
+    if (ctx.serverUrl !== undefined) {
+      result = result.replace(/\$\{WAVE_SERVER_URL\}/g, ctx.serverUrl);
+    }
+    if (ctx.ssoToken !== undefined) {
+      result = result.replace(/\$\{WAVE_SSO_TOKEN\}/g, ctx.ssoToken);
+    }
+    return result;
+  };
+
+  if (resolved.command) {
+    resolved.command = replace(resolved.command);
+  }
+
+  if (resolved.args) {
+    resolved.args = resolved.args.map(replace);
+  }
+
+  if (resolved.env) {
+    const resolvedEnv: Record<string, string> = {};
+    for (const [key, val] of Object.entries(resolved.env)) {
+      resolvedEnv[key] = replace(val);
+    }
+    resolved.env = resolvedEnv;
+  }
+
+  if (resolved.url) {
+    resolved.url = replace(resolved.url);
+  }
+
+  if (resolved.headers) {
+    const resolvedHeaders: Record<string, string> = {};
+    for (const [key, val] of Object.entries(resolved.headers)) {
+      resolvedHeaders[key] = replace(val);
+    }
+    resolved.headers = resolvedHeaders;
+  }
+
+  return resolved;
+}
+
+/**
+ * Walk an MCP config and resolve variables in all string fields.
+ * Applies two steps in order:
+ *   1. expandEnvVars — resolves ${VAR} from process.env
+ *   2. resolveMcpTemplates — resolves ${WAVE_SERVER_URL}, ${WAVE_SSO_TOKEN} from context
+ */
+export function resolveMcpConfig(
+  config: McpConfig,
+  ctx?: McpResolverContext,
+): McpConfig {
   const resolved: McpConfig = { mcpServers: {} };
 
   for (const [name, serverConfig] of Object.entries(config.mcpServers)) {
-    const resolvedServer: McpServerConfig = { ...serverConfig };
+    // Step 1: expand env vars from process.env
+    let resolvedServer: McpServerConfig = { ...serverConfig };
 
     if (resolvedServer.command) {
       resolvedServer.command = expandEnvVars(resolvedServer.command);
@@ -85,6 +163,11 @@ export function resolveMcpConfig(config: McpConfig): McpConfig {
       resolvedServer.headers = resolvedHeaders;
     }
 
+    // Step 2: resolve Wave template variables from context
+    if (ctx) {
+      resolvedServer = resolveMcpTemplates(resolvedServer, ctx);
+    }
+
     resolved.mcpServers[name] = resolvedServer;
   }
 
@@ -100,12 +183,18 @@ export class McpManager {
   private callbacks: McpManagerCallbacks;
   private mcpServers: Record<string, McpServerConfig> | undefined;
 
+  private resolverCtx: McpResolverContext | undefined;
+
   constructor(
     private container: Container,
     options: McpManagerOptions = {},
   ) {
     this.callbacks = options.callbacks || {};
     this.mcpServers = options.mcpServers;
+    this.resolverCtx = {
+      serverUrl: options.serverUrl,
+      ssoToken: options.ssoToken,
+    };
   }
 
   /**
@@ -177,7 +266,10 @@ export class McpManager {
 
     try {
       const configContent = await fs.readFile(this.configPath, "utf-8");
-      const workspaceConfig = resolveMcpConfig(JSON.parse(configContent));
+      const workspaceConfig = resolveMcpConfig(
+        JSON.parse(configContent),
+        this.resolverCtx,
+      );
 
       // Merge workspace config with any existing config (e.g., from plugins or constructor)
       // Constructor-provided servers take precedence, then workspace config, then existing config

package/src/managers/toolManager.ts

@@ -53,6 +53,8 @@ export interface ToolManagerOptions {
   container: Container;
   /** Optional list of tool names to enable */
   tools?: string[];
+  /** Custom tools to register alongside built-in tools */
+  customTools?: ToolPlugin[];
 }
 
 /**
@@ -64,11 +66,13 @@ export interface ToolManagerOptions {
 class ToolManager {
   private toolsRegistry = new Map<string, ToolPlugin>();
   private tools?: string[];
+  private customTools?: ToolPlugin[];
   private container: Container;
 
   constructor(options: ToolManagerOptions) {
     this.container = options.container;
     this.tools = options.tools;
+    this.customTools = options.customTools;
   }
 
   private get mcpManager(): McpManager {
@@ -138,6 +142,13 @@ class ToolManager {
         this.toolsRegistry.set(tool.name, tool);
       }
     }
+
+    // Register custom tools
+    for (const tool of this.customTools || []) {
+      if (this.shouldEnableTool(tool.name)) {
+        this.toolsRegistry.set(tool.name, tool);
+      }
+    }
   }
 
   /**

package/src/services/authService.ts

@@ -79,11 +79,11 @@ export class AuthService {
     return config.SSO_TOKEN;
   }
 
-  getAiBaseUrl(): string {
-    const url = process.env.WAVE_AI_URL;
+  getServerUrl(): string {
+    const url = process.env.WAVE_SERVER_URL;
     if (!url) {
       throw new Error(
-        "WAVE_AI_URL environment variable is not set. SSO authentication requires this to be configured.",
+        "WAVE_SERVER_URL environment variable is not set. SSO authentication requires this to be configured.",
       );
     }
     return url;
@@ -95,16 +95,16 @@ export class AuthService {
     /** Read authorization code manually (e.g. from stdin). Resolves with code or rejects on cancel. */
     readToken?: () => Promise<string>;
   }): Promise<string> {
-    const aiUrl = this.getAiBaseUrl();
+    const serverUrl = this.getServerUrl();
 
     // Start local server, open browser, wait for callback or manual input
-    const { code } = await this.startLocalAuthServer(aiUrl, {
+    const { code } = await this.startLocalAuthServer(serverUrl, {
       onAuthUrl: options?.onAuthUrl,
       readToken: options?.readToken,
     });
 
     // Exchange authorization code for JWT (includes user info)
-    const { token, user } = await this.exchangeCode(aiUrl, code);
+    const { token, user } = await this.exchangeCode(serverUrl, code);
 
     // Save the token and user info (preserve existing keys)
     const existing = this.loadAuth();
@@ -118,10 +118,10 @@ export class AuthService {
    * Returns both the token and user info.
    */
   private async exchangeCode(
-    aiUrl: string,
+    serverUrl: string,
     code: string,
   ): Promise<{ token: string; user: AuthUser }> {
-    const exchangeUrl = `${aiUrl}/api/auth/exchange`;
+    const exchangeUrl = `${serverUrl}/api/auth/exchange`;
     const response = await fetch(exchangeUrl, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
@@ -144,7 +144,7 @@ export class AuthService {
   }
 
   private startLocalAuthServer(
-    aiUrl: string,
+    serverUrl: string,
     options?: {
       onAuthUrl?: (url: string) => void;
       readToken?: () => Promise<string>;
@@ -200,7 +200,7 @@ export class AuthService {
         }
         const port = address.port;
         const callbackUrl = `http://127.0.0.1:${port}`;
-        const authUrl = `${aiUrl}/login?callback_url=${encodeURIComponent(callbackUrl)}`;
+        const authUrl = `${serverUrl}/login?callback_url=${encodeURIComponent(callbackUrl)}`;
 
         // Notify caller of the auth URL
         options?.onAuthUrl?.(authUrl);

package/src/services/configurationService.ts

@@ -408,14 +408,14 @@ export class ConfigurationService {
     fetchOptions?: ClientOptions["fetchOptions"],
     fetch?: ClientOptions["fetch"],
   ): GatewayConfig {
-    // Check for SSO token first - if present and AI URL is available, use SSO mode
-    // AI URL resolution: options > process.env
+    // Check for SSO token first - if present and server URL is available, use SSO mode
+    // Server URL resolution: options > process.env
     const ssoToken = this.readSSOToken();
-    const aiUrl = this.options.aiUrl || process.env.WAVE_AI_URL;
-    if (ssoToken && aiUrl) {
+    const serverUrl = this.options.serverUrl || process.env.WAVE_SERVER_URL;
+    if (ssoToken && serverUrl) {
       return {
         apiKey: ssoToken,
-        baseURL: `${aiUrl}/api/v1`,
+        baseURL: `${serverUrl}/api/v1`,
         defaultHeaders:
           Object.keys(defaultHeaders || {}).length > 0
             ? defaultHeaders

package/src/tools/buildTool.ts

@@ -0,0 +1,65 @@
+import type { ToolPlugin, ToolResult, ToolContext } from "./types.js";
+import { ChatCompletionFunctionTool } from "openai/resources.js";
+import type { SubagentConfiguration } from "../utils/subagentParser.js";
+import type { SkillMetadata } from "../types/skills.js";
+
+export interface ToolDef {
+  name: string;
+  description: string;
+  parameters: Record<string, unknown>;
+  required?: string[];
+  execute: (
+    args: Record<string, unknown>,
+    context: ToolContext,
+  ) => Promise<ToolResult>;
+  prompt?:
+    | string
+    | ((args?: {
+        availableSubagents?: SubagentConfiguration[];
+        availableSkills?: SkillMetadata[];
+        workdir?: string;
+        isSubagent?: boolean;
+      }) => string);
+  formatCompactParams?: (
+    params: Record<string, unknown>,
+    context: ToolContext,
+  ) => string;
+  shouldDefer?: boolean;
+  alwaysLoad?: boolean;
+  additionalProperties?: boolean;
+}
+
+export function buildTool(def: ToolDef): ToolPlugin {
+  const config: ChatCompletionFunctionTool = {
+    type: "function",
+    function: {
+      name: def.name,
+      description: def.description,
+      parameters: {
+        type: "object",
+        properties: def.parameters,
+        required: def.required || [],
+        additionalProperties: def.additionalProperties ?? false,
+      },
+    },
+  };
+
+  // Normalize prompt: if string, wrap in function
+  let promptFn: ToolPlugin["prompt"];
+  if (typeof def.prompt === "string") {
+    const staticPrompt = def.prompt;
+    promptFn = () => staticPrompt;
+  } else {
+    promptFn = def.prompt;
+  }
+
+  return {
+    name: def.name,
+    config,
+    execute: def.execute,
+    prompt: promptFn,
+    formatCompactParams: def.formatCompactParams,
+    shouldDefer: def.shouldDefer ?? false,
+    alwaysLoad: def.alwaysLoad ?? false,
+  };
+}

package/src/types/agent.ts

@@ -14,6 +14,7 @@ import type { MessageManagerCallbacks } from "../managers/messageManager.js";
 import type { BackgroundTaskManagerCallbacks } from "../managers/backgroundTaskManager.js";
 import type { McpManagerCallbacks } from "../managers/mcpManager.js";
 import type { SubagentManagerCallbacks } from "../managers/subagentManager.js";
+import type { ToolPlugin } from "../tools/types.js";
 
 /**
  * Configuration options for Agent instances
@@ -25,8 +26,8 @@ export interface AgentOptions {
   // Optional configuration with environment fallbacks
   apiKey?: string;
   baseURL?: string;
-  /** Wave AI URL for SSO authentication (fallback to WAVE_AI_URL env var) */
-  aiUrl?: string;
+  /** Wave server URL for SSO authentication (fallback to WAVE_SERVER_URL env var) */
+  serverUrl?: string;
   defaultHeaders?: Record<string, string>;
   fetchOptions?: ClientOptions["fetchOptions"];
   fetch?: ClientOptions["fetch"];
@@ -86,6 +87,8 @@ export interface AgentOptions {
    * Overrides .mcp.json for specified server names.
    */
   mcpServers?: Record<string, McpServerConfig>;
+  /** Custom tools provided by the SDK user, registered alongside built-in tools */
+  customTools?: ToolPlugin[];
   [key: string]: unknown;
 }
 

package/src/utils/containerSetup.ts

@@ -38,6 +38,7 @@ import type {
 } from "../types/index.js";
 
 import { logger } from "./globalLogger.js";
+import { authService } from "../services/authService.js";
 
 export interface AgentContainerSetupOptions {
   options: AgentOptions;
@@ -145,11 +146,15 @@ export function setupAgentContainer(
   });
   container.register("BackgroundTaskManager", backgroundTaskManager);
 
+  const ssoToken = authService.getSSOToken();
+  const serverUrl = options.serverUrl || process.env.WAVE_SERVER_URL;
   const mcpManager = new McpManager(container, {
     callbacks,
     mcpServers: options.mcpServers as
       | Record<string, McpServerConfig>
       | undefined,
+    serverUrl,
+    ssoToken,
   });
   container.register("McpManager", mcpManager);
 
@@ -257,6 +262,7 @@ export function setupAgentContainer(
   const toolManager = new ToolManager({
     container,
     tools: options.tools,
+    customTools: options.customTools,
   });
   container.register("ToolManager", toolManager);