@lleverage-ai/agent-sdk 0.0.5 → 0.0.7

package/dist/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA2DH,OAAO,KAAK,EACV,KAAK,EACL,YAAY,EAyBb,MAAM,YAAY,CAAC;AA6pBpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,KAAK,CA0sFxD"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA4DH,OAAO,KAAK,EACV,KAAK,EACL,YAAY,EAwBb,MAAM,YAAY,CAAC;AA6pBpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,KAAK,CAmrFxD"}

package/dist/agent.js

@@ -15,9 +15,10 @@ import { MCPManager } from "./mcp/manager.js";
 import { applyMiddleware, mergeHooks, setupMiddleware } from "./middleware/index.js";
 import { createDefaultPromptBuilder } from "./prompt-builder/components.js";
 import { ACCEPT_EDITS_BLOCKED_PATTERNS } from "./security/index.js";
+import { createSubagent } from "./subagents.js";
 import { TaskManager } from "./task-manager.js";
+import { createCallToolTool } from "./tools/call-tool.js";
 import { coreToolsToToolSet, createCoreTools, createSearchToolsTool, createTaskOutputTool, createTaskTool, } from "./tools/factory.js";
-import { createUseToolsTool, ToolRegistry } from "./tools/tool-registry.js";
 let agentIdCounter = 0;
 /**
  * Internal signal for interrupt flow control.
@@ -630,43 +631,7 @@ export function createAgent(options) {
             return `[Background task failed: ${task.id}]\nCommand: ${command}\nError: ${task.error ?? "Unknown error"}`;
         });
     // Determine plugin loading mode
-    // Track whether it was explicitly set to distinguish from default
-    const explicitPluginLoading = options.pluginLoading !== undefined;
     const pluginLoadingMode = options.pluginLoading ?? "eager";
-    const preloadPlugins = new Set(options.preloadPlugins ?? []);
-    // Initialize tool registry for lazy/explicit loading modes
-    const toolRegistry = pluginLoadingMode !== "eager"
-        ? new ToolRegistry({
-            onToolRegistered: async (input) => {
-                const hooks = effectiveHooks?.ToolRegistered ?? [];
-                if (hooks.length === 0)
-                    return;
-                const hookInput = {
-                    hook_event_name: "ToolRegistered",
-                    session_id: "default",
-                    cwd: process.cwd(),
-                    tool_name: input.tool_name,
-                    description: input.description,
-                    source: input.source,
-                };
-                await invokeHooksWithTimeout(hooks, hookInput, null, agent);
-            },
-            onToolLoadError: async (input) => {
-                const hooks = effectiveHooks?.ToolLoadError ?? [];
-                if (hooks.length === 0)
-                    return;
-                const hookInput = {
-                    hook_event_name: "ToolLoadError",
-                    session_id: "default",
-                    cwd: process.cwd(),
-                    tool_name: input.tool_name,
-                    error: input.error,
-                    source: input.source,
-                };
-                await invokeHooksWithTimeout(hooks, hookInput, null, agent);
-            },
-        })
-        : undefined;
     // Collect skills from options and plugins
     const skills = [...(options.skills ?? [])];
     // Initialize MCP manager for unified plugin tool handling
@@ -728,6 +693,10 @@ export function createAgent(options) {
     const toolSearchMaxResults = toolSearchConfig.maxResults ?? 10;
     // Track whether deferred loading is active
     let deferredLoadingActive = false;
+    // Track whether any deferred or proxy plugins exist (for call_tool creation)
+    let hasProxiedTools = false;
+    // Auto-created subagent definitions from delegated plugins
+    const autoSubagents = [];
     // Count total plugin tools for threshold calculation and collect plugin skills.
     // Note: Function-based (streaming) tools are not counted since we don't know
     // their count until they're invoked with a streaming context.
@@ -746,7 +715,7 @@ export function createAgent(options) {
     // Determine if we should use deferred loading based on tool search settings
     // Note: Only activate deferred loading if explicitly requested, not based on auto threshold
     // The auto threshold should only affect whether search_tools is created, not loading behavior
-    if (toolSearchEnabled === "always") {
+    if (toolSearchEnabled === "always" || pluginLoadingMode === "proxy") {
         deferredLoadingActive = true;
     }
     // Removed: auto threshold no longer forces deferred loading
@@ -767,7 +736,7 @@ export function createAgent(options) {
         ...coreToolsToToolSet(autoCreatedCoreTools),
         ...(options.tools ?? {}),
     };
-    // Process plugins based on loading mode and deferred loading
+    // Process plugins based on loading mode, deferred, and delegation settings
     // Note: Plugin skills are collected earlier (before createCoreTools) so
     // the skill tool can include them in progressive disclosure.
     for (const plugin of options.plugins ?? []) {
@@ -775,36 +744,18 @@ export function createAgent(options) {
         // Note: Function-based (streaming) tools are handled separately in
         // getActiveToolSetWithStreaming() and are not registered here
         if (plugin.tools && typeof plugin.tools !== "function") {
-            const shouldPreload = preloadPlugins.has(plugin.name);
-            // Priority order:
-            // 1. Explicit mode - don't register
-            // 2. Preload - always load immediately
-            // 3. Explicit eager - always load immediately
-            // 4. Lazy mode - register with tool registry
-            // 5. Deferred loading - register but don't load
-            // 6. Default eager - load immediately
-            if (pluginLoadingMode === "explicit") {
-                // Explicit mode: don't auto-register, user must do it manually
-                // Skip registration entirely
-            }
-            else if (shouldPreload) {
-                // Preloaded plugins: always load immediately, regardless of other settings
+            // Check if this plugin is deferred (proxy mode or per-plugin opt-in)
+            const isDeferred = plugin.deferred === true || (pluginLoadingMode === "proxy" && plugin.deferred !== false);
+            if (isDeferred) {
+                // Deferred plugin: register in MCP for discovery via search_tools + call_tool
                 mcpManager.registerPluginTools(plugin.name, plugin.tools, {
-                    autoLoad: true,
-                });
-            }
-            else if (explicitPluginLoading && pluginLoadingMode === "eager") {
-                // Explicit eager mode: always load immediately, regardless of toolSearch settings
-                mcpManager.registerPluginTools(plugin.name, plugin.tools, {
-                    autoLoad: true,
+                    autoLoad: false,
                 });
+                hasProxiedTools = true;
             }
-            else if (pluginLoadingMode === "lazy" && toolRegistry) {
-                // Lazy mode: register with registry for on-demand loading
-                toolRegistry.registerPlugin(plugin.name, plugin.tools);
-            }
-            else if (deferredLoadingActive) {
+            else if (deferredLoadingActive && plugin.deferred !== false) {
                 // Deferred loading (auto threshold or always enabled): register tools but don't load them initially
+                // Respect explicit deferred: false opt-out
                 mcpManager.registerPluginTools(plugin.name, plugin.tools, {
                     autoLoad: false,
                 });
@@ -817,33 +768,61 @@ export function createAgent(options) {
             }
         }
     }
+    // Create subagent definitions from plugins with subagent config
+    for (const plugin of options.plugins ?? []) {
+        if (plugin.subagent) {
+            autoSubagents.push({
+                type: `plugin-${plugin.name}`,
+                description: plugin.subagent.description,
+                model: plugin.subagent.model ?? "inherit",
+                create: (_ctx) => createSubagent(agent, {
+                    name: `plugin-${plugin.name}`,
+                    description: plugin.subagent.description,
+                    model: _ctx.model,
+                    tools: plugin.subagent.tools,
+                    systemPrompt: plugin.subagent.prompt ??
+                        `You are a ${plugin.name} specialist. Complete the requested task using available tools and return a clear summary.`,
+                }),
+            });
+        }
+    }
+    // Merge auto-created subagents with user-provided ones
+    const allSubagents = [...(options.subagents ?? []), ...autoSubagents];
+    const hasSubagents = allSubagents.length > 0;
+    // In proxy mode, create call_tool and configure search_tools with schema disclosure
+    const isProxyMode = pluginLoadingMode === "proxy" || hasProxiedTools;
+    if (isProxyMode && !options.disabledCoreTools?.includes("call_tool")) {
+        coreTools.call_tool = createCallToolTool({
+            mcpManager,
+        });
+    }
     // Create search_tools for MCP tool discovery and/or plugin loading
     // New behavior:
     // - Create when auto threshold is exceeded (for lazy discovery)
     // - Create when deferred loading is active (explicitly requested)
+    // - Create when proxy mode is active (for call_tool discovery)
     // - Create when external MCP servers exist (for MCP tool search)
-    // - Always auto-load tools when found (no manual load step)
+    // - Always auto-load tools when found (no manual load step) — unless proxy mode
     const shouldCreateSearchToolsForAutoThreshold = toolSearchEnabled === "auto" && totalPluginToolCount > toolSearchThreshold;
     const shouldCreateSearchTools = !options.disabledCoreTools?.includes("search_tools") &&
         (deferredLoadingActive ||
+            isProxyMode ||
             shouldCreateSearchToolsForAutoThreshold ||
             (mcpManager.hasExternalServers() && toolSearchEnabled !== "never"));
     if (shouldCreateSearchTools) {
         coreTools.search_tools = createSearchToolsTool({
             manager: mcpManager,
             maxResults: toolSearchMaxResults,
-            enableLoad: true, // Always enable auto-loading
-            autoLoad: true, // NEW: Auto-load tools after searching
+            // In proxy mode: don't auto-load, include schema for call_tool usage
+            enableLoad: !isProxyMode,
+            autoLoad: !isProxyMode,
+            includeSchema: isProxyMode,
             onToolsLoaded: (toolNames) => {
                 // Tools are now loaded in MCPManager and will be included in getActiveToolSet()
                 // This callback can be used for logging/notifications
             },
         });
     }
-    // Add use_tools meta-tool in lazy mode
-    if (pluginLoadingMode === "lazy" && toolRegistry) {
-        coreTools.use_tools = createUseToolsTool({ registry: toolRegistry });
-    }
     /**
      * Filter a tool set by the allowedTools and disallowedTools restrictions.
      * If neither is set, returns all tools.
@@ -887,9 +866,6 @@ export function createAgent(options) {
             const allTools = { ...coreTools };
             Object.assign(allTools, runtimeTools);
             Object.assign(allTools, mcpManager.getToolSet());
-            if (toolRegistry) {
-                Object.assign(allTools, toolRegistry.getLoadedTools());
-            }
             return allTools;
         })());
         // Extract tool metadata for context
@@ -926,6 +902,10 @@ export function createAgent(options) {
             permissionMode,
             currentMessages: messages,
             threadId,
+            custom: {
+                hasSubagents,
+                delegationInstructions: options.delegationInstructions,
+            },
         };
     };
     // Helper to get system prompt (either static or built from context)
@@ -947,10 +927,6 @@ export function createAgent(options) {
         // Add MCP tools from plugin registrations
         const mcpTools = mcpManager.getToolSet();
         Object.assign(allTools, mcpTools);
-        // Add dynamically loaded tools from registry (lazy mode)
-        if (toolRegistry) {
-            Object.assign(allTools, toolRegistry.getLoadedTools());
-        }
         // Apply allowedTools filtering
         const filtered = filterToolsByAllowed(allTools);
         // Apply permission mode wrapping with canUseTool callback and approval state
@@ -991,10 +967,6 @@ export function createAgent(options) {
         // Add MCP tools from plugin registrations
         const mcpTools = mcpManager.getToolSet();
         Object.assign(allTools, mcpTools);
-        // Add dynamically loaded tools from registry (lazy mode)
-        if (toolRegistry) {
-            Object.assign(allTools, toolRegistry.getLoadedTools());
-        }
         // Apply allowedTools filtering
         const filtered = filterToolsByAllowed(allTools);
         // Apply permission mode wrapping with canUseTool callback and approval state
@@ -1047,7 +1019,7 @@ export function createAgent(options) {
         const result = {
             ...tools,
             task: createTaskTool({
-                subagents: options.subagents ?? [],
+                subagents: allSubagents,
                 defaultModel: options.model,
                 parentAgent: agent,
                 // Always include general-purpose subagent so agents can delegate tasks
@@ -1399,7 +1371,7 @@ export function createAgent(options) {
                             const checkpointThreadId = forkedSessionId ?? effectiveGenOptions.threadId;
                             const finalMessages = [
                                 ...messages,
-                                { role: "assistant", content: response.text },
+                                ...(response.text ? [{ role: "assistant", content: response.text }] : []),
                             ];
                             const savedCheckpoint = await saveCheckpoint(checkpointThreadId, finalMessages, startStep + response.steps.length);
                             if (savedCheckpoint) {
@@ -1468,10 +1440,12 @@ export function createAgent(options) {
                     // Save checkpoint - use forked session ID if forking, otherwise use original threadId
                     const checkpointThreadId = forkedSessionId ?? effectiveGenOptions.threadId;
                     if (checkpointThreadId && options.checkpointer) {
-                        // Build final messages including the assistant response
+                        // Build final messages including the assistant response.
+                        // Skip empty text to avoid invalid content blocks (e.g. when
+                        // the model finishes with only tool calls).
                         const finalMessages = [
                             ...messages,
-                            { role: "assistant", content: response.text },
+                            ...(response.text ? [{ role: "assistant", content: response.text }] : []),
                         ];
                         await saveCheckpoint(checkpointThreadId, finalMessages, startStep + response.steps.length);
                     }
@@ -1506,7 +1480,12 @@ export function createAgent(options) {
                     let lastResult = finalResult;
                     let runningMessages = hasCheckpointing
                         ? []
-                        : [...messages, { role: "assistant", content: finalResult.text }];
+                        : [
+                            ...messages,
+                            ...(finalResult.text
+                                ? [{ role: "assistant", content: finalResult.text }]
+                                : []),
+                        ];
                     let followUpPrompt = await getNextTaskPrompt();
                     while (followUpPrompt !== null) {
                         lastResult = await agent.generate({
@@ -1521,7 +1500,9 @@ export function createAgent(options) {
                             runningMessages = [
                                 ...runningMessages,
                                 { role: "user", content: followUpPrompt },
-                                { role: "assistant", content: lastResult.text },
+                                ...(lastResult.text
+                                    ? [{ role: "assistant", content: lastResult.text }]
+                                    : []),
                             ];
                         }
                         followUpPrompt = await getNextTaskPrompt();
@@ -1808,7 +1789,7 @@ export function createAgent(options) {
                     if (effectiveGenOptions.threadId && options.checkpointer) {
                         const finalMessages = [
                             ...messages,
-                            { role: "assistant", content: text },
+                            ...(text ? [{ role: "assistant", content: text }] : []),
                         ];
                         await saveCheckpoint(effectiveGenOptions.threadId, finalMessages, startStep + steps.length);
                     }
@@ -1832,7 +1813,7 @@ export function createAgent(options) {
                     const hasCheckpointing = !!(effectiveGenOptions.threadId && options.checkpointer);
                     let currentMessages = hasCheckpointing
                         ? []
-                        : [...messages, { role: "assistant", content: text }];
+                        : [...messages, ...(text ? [{ role: "assistant", content: text }] : [])];
                     let followUpPrompt = await getNextTaskPrompt();
                     while (followUpPrompt !== null) {
                         const followUpGen = agent.stream({
@@ -1850,7 +1831,7 @@ export function createAgent(options) {
                             currentMessages = [
                                 ...currentMessages,
                                 { role: "user", content: followUpPrompt },
-                                { role: "assistant", content: followUpText },
+                                ...(followUpText ? [{ role: "assistant", content: followUpText }] : []),
                             ];
                         }
                         followUpPrompt = await getNextTaskPrompt();
@@ -1958,10 +1939,9 @@ export function createAgent(options) {
                                     // Build messages including this step's results
                                     const stepMessages = [
                                         ...initialParams.messages,
-                                        {
-                                            role: "assistant",
-                                            content: stepResult.text,
-                                        },
+                                        ...(stepResult.text
+                                            ? [{ role: "assistant", content: stepResult.text }]
+                                            : []),
                                     ];
                                     await saveCheckpoint(effectiveGenOptions.threadId, stepMessages, startStep + currentStepCount);
                                 }
@@ -1980,7 +1960,9 @@ export function createAgent(options) {
                             if (effectiveGenOptions.threadId && options.checkpointer) {
                                 const finalMessages = [
                                     ...initialParams.messages,
-                                    { role: "assistant", content: finishResult.text },
+                                    ...(finishResult.text
+                                        ? [{ role: "assistant", content: finishResult.text }]
+                                        : []),
                                 ];
                                 await saveCheckpoint(effectiveGenOptions.threadId, finalMessages, startStep + finishResult.steps.length);
                             }
@@ -2021,7 +2003,7 @@ export function createAgent(options) {
                                 let accumulatedStepCount = initialSteps.length;
                                 let currentMessages = [
                                     ...messages,
-                                    { role: "assistant", content: text },
+                                    ...(text ? [{ role: "assistant", content: text }] : []),
                                 ];
                                 let followUpPrompt = await getNextTaskPrompt();
                                 while (followUpPrompt !== null) {
@@ -2048,7 +2030,9 @@ export function createAgent(options) {
                                     currentMessages = [
                                         ...currentMessages,
                                         { role: "user", content: followUpPrompt },
-                                        { role: "assistant", content: followUpText },
+                                        ...(followUpText
+                                            ? [{ role: "assistant", content: followUpText }]
+                                            : []),
                                     ];
                                     // --- Post-completion bookkeeping for follow-ups ---
                                     const followUpSteps = await followUpResult.steps;
@@ -2182,10 +2166,9 @@ export function createAgent(options) {
                                     // Build messages including this step's results
                                     const stepMessages = [
                                         ...initialParams.messages,
-                                        {
-                                            role: "assistant",
-                                            content: stepResult.text,
-                                        },
+                                        ...(stepResult.text
+                                            ? [{ role: "assistant", content: stepResult.text }]
+                                            : []),
                                     ];
                                     await saveCheckpoint(effectiveGenOptions.threadId, stepMessages, startStep + currentStepCount);
                                 }
@@ -2204,7 +2187,9 @@ export function createAgent(options) {
                             if (effectiveGenOptions.threadId && options.checkpointer) {
                                 const finalMessages = [
                                     ...initialParams.messages,
-                                    { role: "assistant", content: finishResult.text },
+                                    ...(finishResult.text
+                                        ? [{ role: "assistant", content: finishResult.text }]
+                                        : []),
                                 ];
                                 await saveCheckpoint(effectiveGenOptions.threadId, finalMessages, startStep + finishResult.steps.length);
                             }
@@ -2405,7 +2390,7 @@ export function createAgent(options) {
                                 let accumulatedStepCount = initialSteps.length;
                                 let currentMessages = [
                                     ...messages,
-                                    { role: "assistant", content: text },
+                                    ...(text ? [{ role: "assistant", content: text }] : []),
                                 ];
                                 let followUpPrompt = await getNextTaskPrompt();
                                 while (followUpPrompt !== null) {
@@ -2432,7 +2417,9 @@ export function createAgent(options) {
                                     currentMessages = [
                                         ...currentMessages,
                                         { role: "user", content: followUpPrompt },
-                                        { role: "assistant", content: followUpText },
+                                        ...(followUpText
+                                            ? [{ role: "assistant", content: followUpText }]
+                                            : []),
                                     ];
                                     // --- Post-completion bookkeeping for follow-ups ---
                                     const followUpSteps = await followUpResult.steps;
@@ -2511,17 +2498,6 @@ export function createAgent(options) {
                 delete runtimeTools[name];
             }
         },
-        loadTools(toolNames) {
-            if (!toolRegistry) {
-                // No registry in eager mode - all tools already loaded
-                return { loaded: [], notFound: toolNames };
-            }
-            const result = toolRegistry.load(toolNames);
-            return {
-                loaded: result.loaded,
-                notFound: result.notFound,
-            };
-        },
         setPermissionMode(mode) {
             permissionMode = mode;
         },