opencode-lazy-loader 1.0.0 → 1.0.2

package/dist/skill-mcp-manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-mcp-manager.d.ts","sourceRoot":"","sources":["../src/skill-mcp-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAA;AAElE,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAU5E,MAAM,WAAW,eAAe;IAC9B,iBAAiB,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAChF,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACnD,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAC9B,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IACvE,aAAa,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAC3E,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IACzE,QAAQ,CACN,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC,OAAO,CAAC,CAAA;IACnB,YAAY,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IACrF,SAAS,CACP,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC,OAAO,CAAC,CAAA;IACnB,mBAAmB,IAAI,MAAM,EAAE,CAAA;IAC/B,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAA;CAC1C;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,IAAI,eAAe,CAoUvD"}

package/dist/skill-mcp-manager.js

@@ -0,0 +1,279 @@
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
+import { expandEnvVarsInObject, createCleanMcpEnvironment, normalizeCommand, normalizeEnv } from './utils/env-vars.js';
+/**
+ * Create a SkillMcpManager instance
+ *
+ * Features:
+ * - Connection pooling keyed by session/skill/server
+ * - Lazy connection creation
+ * - Idle cleanup after 5 minutes
+ * - Session/process cleanup
+ */
+export function createSkillMcpManager() {
+    const clients = new Map();
+    const pendingConnections = new Map();
+    let cleanupRegistered = false;
+    let cleanupInterval = null;
+    const IDLE_TIMEOUT = 5 * 60 * 1000; // 5 minutes
+    const getClientKey = (info) => {
+        return `${info.sessionID}:${info.skillName}:${info.serverName}`;
+    };
+    const registerProcessCleanup = () => {
+        if (cleanupRegistered) {
+            return;
+        }
+        cleanupRegistered = true;
+        const cleanup = async () => {
+            for (const [, managed] of clients) {
+                try {
+                    await managed.client.close();
+                }
+                catch {
+                    // Ignore cleanup errors
+                }
+                try {
+                    await managed.transport.close();
+                }
+                catch {
+                    // Ignore cleanup errors
+                }
+            }
+            clients.clear();
+            pendingConnections.clear();
+        };
+        process.on('SIGINT', async () => {
+            await cleanup();
+            process.exit(0);
+        });
+        process.on('SIGTERM', async () => {
+            await cleanup();
+            process.exit(0);
+        });
+        if (process.platform === 'win32') {
+            process.on('SIGBREAK', async () => {
+                await cleanup();
+                process.exit(0);
+            });
+        }
+    };
+    const createClient = async (info, config) => {
+        const key = getClientKey(info);
+        if (!config.command) {
+            throw new Error(`MCP server "${info.serverName}" is missing required 'command' field.\n\n` +
+                `The MCP configuration in skill "${info.skillName}" must specify a command to execute.\n\n` +
+                `Supported formats:\n` +
+                `  Format A (array):  command: ["npx", "-y", "@some/mcp-server"]\n` +
+                `  Format B (string): command: "npx", args: ["-y", "@some/mcp-server"]`);
+        }
+        const { command, args } = normalizeCommand(config);
+        const { env } = normalizeEnv(config);
+        const mergedEnv = createCleanMcpEnvironment(env);
+        registerProcessCleanup();
+        const transport = new StdioClientTransport({
+            command,
+            args,
+            env: mergedEnv,
+            stderr: 'ignore'
+        });
+        const client = new Client({ name: `skill-mcp-${info.skillName}-${info.serverName}`, version: '1.0.0' }, { capabilities: {} });
+        try {
+            await client.connect(transport);
+        }
+        catch (error) {
+            try {
+                await transport.close();
+            }
+            catch {
+                // Ignore cleanup errors
+            }
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            throw new Error(`Failed to connect to MCP server "${info.serverName}".\n\n` +
+                `Command: ${command} ${args.join(' ')}\n` +
+                `Reason: ${errorMessage}\n\n` +
+                `Hints:\n` +
+                `  - Ensure the command is installed and available in PATH\n` +
+                `  - Check if the MCP server package exists\n` +
+                `  - Verify the args are correct for this server`);
+        }
+        clients.set(key, {
+            client,
+            transport,
+            skillName: info.skillName,
+            lastUsedAt: Date.now()
+        });
+        startCleanupTimer();
+        return client;
+    };
+    const getOrCreateClient = async (info, config) => {
+        const key = getClientKey(info);
+        const existing = clients.get(key);
+        if (existing) {
+            existing.lastUsedAt = Date.now();
+            return existing.client;
+        }
+        const pending = pendingConnections.get(key);
+        if (pending) {
+            return pending;
+        }
+        const expandedConfig = expandEnvVarsInObject(config);
+        const connectionPromise = createClient(info, expandedConfig);
+        pendingConnections.set(key, connectionPromise);
+        try {
+            const client = await connectionPromise;
+            return client;
+        }
+        finally {
+            pendingConnections.delete(key);
+        }
+    };
+    const disconnectSession = async (sessionID) => {
+        for (const [key, managed] of clients.entries()) {
+            if (key.startsWith(`${sessionID}:`)) {
+                clients.delete(key);
+                try {
+                    await managed.client.close();
+                }
+                catch {
+                    // Ignore cleanup errors
+                }
+                try {
+                    await managed.transport.close();
+                }
+                catch {
+                    // Ignore cleanup errors
+                }
+            }
+        }
+    };
+    const disconnectAll = async () => {
+        stopCleanupTimer();
+        const allClients = Array.from(clients.values());
+        clients.clear();
+        for (const managed of allClients) {
+            try {
+                await managed.client.close();
+            }
+            catch {
+                // Ignore cleanup errors
+            }
+            try {
+                await managed.transport.close();
+            }
+            catch {
+                // Ignore cleanup errors
+            }
+        }
+    };
+    const startCleanupTimer = () => {
+        if (cleanupInterval) {
+            return;
+        }
+        cleanupInterval = setInterval(() => {
+            cleanupIdleClients();
+        }, 60000);
+        cleanupInterval.unref();
+    };
+    const stopCleanupTimer = () => {
+        if (cleanupInterval) {
+            clearInterval(cleanupInterval);
+            cleanupInterval = null;
+        }
+    };
+    const cleanupIdleClients = async () => {
+        const now = Date.now();
+        for (const [key, managed] of clients) {
+            if (now - managed.lastUsedAt > IDLE_TIMEOUT) {
+                clients.delete(key);
+                try {
+                    await managed.client.close();
+                }
+                catch {
+                    // Ignore cleanup errors
+                }
+                try {
+                    await managed.transport.close();
+                }
+                catch {
+                    // Ignore cleanup errors
+                }
+            }
+        }
+    };
+    const getOrCreateClientWithRetry = async (info, config) => {
+        try {
+            return await getOrCreateClient(info, config);
+        }
+        catch (error) {
+            const key = getClientKey(info);
+            const existing = clients.get(key);
+            if (existing) {
+                clients.delete(key);
+                try {
+                    await existing.client.close();
+                }
+                catch {
+                    // Ignore
+                }
+                try {
+                    await existing.transport.close();
+                }
+                catch {
+                    // Ignore
+                }
+                return await getOrCreateClient(info, config);
+            }
+            throw error;
+        }
+    };
+    const listTools = async (info, context) => {
+        const client = await getOrCreateClientWithRetry(info, context.config);
+        const result = await client.listTools();
+        return result.tools;
+    };
+    const listResources = async (info, context) => {
+        const client = await getOrCreateClientWithRetry(info, context.config);
+        const result = await client.listResources();
+        return result.resources;
+    };
+    const listPrompts = async (info, context) => {
+        const client = await getOrCreateClientWithRetry(info, context.config);
+        const result = await client.listPrompts();
+        return result.prompts;
+    };
+    const callTool = async (info, context, name, args) => {
+        const client = await getOrCreateClientWithRetry(info, context.config);
+        const result = await client.callTool({ name, arguments: args });
+        return result.content;
+    };
+    const readResource = async (info, context, uri) => {
+        const client = await getOrCreateClientWithRetry(info, context.config);
+        const result = await client.readResource({ uri });
+        return result.contents;
+    };
+    const getPrompt = async (info, context, name, args) => {
+        const client = await getOrCreateClientWithRetry(info, context.config);
+        const result = await client.getPrompt({ name, arguments: args });
+        return result.messages;
+    };
+    const getConnectedServers = () => {
+        return Array.from(clients.keys());
+    };
+    const isConnected = (info) => {
+        return clients.has(getClientKey(info));
+    };
+    return {
+        getOrCreateClient,
+        disconnectSession,
+        disconnectAll,
+        listTools,
+        listResources,
+        listPrompts,
+        callTool,
+        readResource,
+        getPrompt,
+        getConnectedServers,
+        isConnected
+    };
+}
+//# sourceMappingURL=skill-mcp-manager.js.map

package/dist/skill-mcp-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-mcp-manager.js","sourceRoot":"","sources":["../src/skill-mcp-manager.ts"],"names":[],"mappings":"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"}

package/dist/tools/skill-mcp.d.ts

@@ -0,0 +1,13 @@
+import { type ToolDefinition } from '@opencode-ai/plugin/tool';
+import type { LoadedSkill } from '../types.js';
+import type { SkillMcpManager } from '../skill-mcp-manager.js';
+export interface CreateSkillMcpToolOptions {
+    manager: SkillMcpManager;
+    getLoadedSkills: () => LoadedSkill[];
+    getSessionID: () => string;
+}
+/**
+ * Create the skill_mcp tool
+ */
+export declare function createSkillMcpTool(options: CreateSkillMcpToolOptions): ToolDefinition;
+//# sourceMappingURL=skill-mcp.d.ts.map

package/dist/tools/skill-mcp.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-mcp.d.ts","sourceRoot":"","sources":["../../src/tools/skill-mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAmB,MAAM,aAAa,CAAA;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAqI9D,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,eAAe,CAAA;IACxB,eAAe,EAAE,MAAM,WAAW,EAAE,CAAA;IACpC,YAAY,EAAE,MAAM,MAAM,CAAA;CAC3B;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,cAAc,CAoErF"}

package/dist/tools/skill-mcp.js

@@ -0,0 +1,162 @@
+import { tool } from '@opencode-ai/plugin/tool';
+const SKILL_MCP_DESCRIPTION = `Invoke MCP server operations from skill-embedded MCPs. Requires mcp_name plus exactly one of: tool_name, resource_name, or prompt_name.`;
+/**
+ * Validate that exactly one operation parameter is provided
+ */
+function validateOperationParams(args) {
+    const operations = [];
+    if (args.tool_name) {
+        operations.push({ type: 'tool', name: args.tool_name });
+    }
+    if (args.resource_name) {
+        operations.push({ type: 'resource', name: args.resource_name });
+    }
+    if (args.prompt_name) {
+        operations.push({ type: 'prompt', name: args.prompt_name });
+    }
+    if (operations.length === 0) {
+        throw new Error(`Missing operation. Exactly one of tool_name, resource_name, or prompt_name must be specified.\n\n` +
+            `Examples:\n` +
+            `  skill_mcp(mcp_name="sqlite", tool_name="query", arguments='{"sql": "SELECT * FROM users"}')\n` +
+            `  skill_mcp(mcp_name="memory", resource_name="memory://notes")\n` +
+            `  skill_mcp(mcp_name="helper", prompt_name="summarize", arguments='{"text": "..."}')`);
+    }
+    if (operations.length > 1) {
+        const provided = [
+            args.tool_name && `tool_name="${args.tool_name}"`,
+            args.resource_name && `resource_name="${args.resource_name}"`,
+            args.prompt_name && `prompt_name="${args.prompt_name}"`
+        ].filter(Boolean).join(', ');
+        throw new Error(`Multiple operations specified. Exactly one of tool_name, resource_name, or prompt_name must be provided.\n\n` +
+            `Received: ${provided}\n\n` +
+            `Use separate calls for each operation.`);
+    }
+    return operations[0];
+}
+/**
+ * Find an MCP server configuration by name across all skills
+ */
+function findMcpServer(mcpName, skills) {
+    for (const skill of skills) {
+        if (skill.mcpConfig && mcpName in skill.mcpConfig) {
+            return { skill, config: skill.mcpConfig[mcpName] };
+        }
+    }
+    return null;
+}
+/**
+ * Format available MCPs for error message
+ */
+function formatAvailableMcps(skills) {
+    const mcps = [];
+    for (const skill of skills) {
+        if (skill.mcpConfig) {
+            for (const serverName of Object.keys(skill.mcpConfig)) {
+                mcps.push(`  - "${serverName}" from skill "${skill.name}"`);
+            }
+        }
+    }
+    return mcps.length > 0 ? mcps.join('\n') : '  (none found)';
+}
+/**
+ * Parse JSON arguments string
+ */
+function parseArguments(argsJson) {
+    if (!argsJson) {
+        return {};
+    }
+    try {
+        const parsed = JSON.parse(argsJson);
+        if (typeof parsed !== 'object' || parsed === null) {
+            throw new Error('Arguments must be a JSON object');
+        }
+        return parsed;
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        throw new Error(`Invalid arguments JSON: ${errorMessage}\n\n` +
+            `Expected a valid JSON object, e.g.: '{"key": "value"}'\n` +
+            `Received: ${argsJson}`);
+    }
+}
+/**
+ * Apply grep filter to output
+ */
+function applyGrepFilter(output, pattern) {
+    if (!pattern) {
+        return output;
+    }
+    try {
+        const regex = new RegExp(pattern, 'i');
+        const lines = output.split('\n');
+        const filtered = lines.filter((line) => regex.test(line));
+        return filtered.length > 0
+            ? filtered.join('\n')
+            : `[grep] No lines matched pattern: ${pattern}`;
+    }
+    catch {
+        return output;
+    }
+}
+/**
+ * Create the skill_mcp tool
+ */
+export function createSkillMcpTool(options) {
+    const { manager, getLoadedSkills, getSessionID } = options;
+    return tool({
+        description: SKILL_MCP_DESCRIPTION,
+        args: {
+            mcp_name: tool.schema.string().describe('Name of the MCP server from skill config'),
+            tool_name: tool.schema.string().optional().describe('MCP tool to call'),
+            resource_name: tool.schema.string().optional().describe('MCP resource URI to read'),
+            prompt_name: tool.schema.string().optional().describe('MCP prompt to get'),
+            arguments: tool.schema.string().optional().describe('JSON string of arguments'),
+            grep: tool.schema.string().optional().describe('Regex pattern to filter output lines (only matching lines returned)')
+        },
+        async execute(args) {
+            const operation = validateOperationParams(args);
+            const skills = getLoadedSkills();
+            const found = findMcpServer(args.mcp_name, skills);
+            if (!found) {
+                throw new Error(`MCP server "${args.mcp_name}" not found.\n\n` +
+                    `Available MCP servers in loaded skills:\n` +
+                    formatAvailableMcps(skills) + '\n\n' +
+                    `Hint: Load the skill first using the 'skill' tool, then call skill_mcp.`);
+            }
+            const info = {
+                serverName: args.mcp_name,
+                skillName: found.skill.name,
+                sessionID: getSessionID()
+            };
+            const context = {
+                config: found.config,
+                skillName: found.skill.name
+            };
+            const parsedArgs = parseArguments(args.arguments);
+            let output;
+            switch (operation.type) {
+                case 'tool': {
+                    const result = await manager.callTool(info, context, operation.name, parsedArgs);
+                    output = JSON.stringify(result, null, 2);
+                    break;
+                }
+                case 'resource': {
+                    const result = await manager.readResource(info, context, operation.name);
+                    output = JSON.stringify(result, null, 2);
+                    break;
+                }
+                case 'prompt': {
+                    const stringArgs = {};
+                    for (const [key, value] of Object.entries(parsedArgs)) {
+                        stringArgs[key] = String(value);
+                    }
+                    const result = await manager.getPrompt(info, context, operation.name, stringArgs);
+                    output = JSON.stringify(result, null, 2);
+                    break;
+                }
+            }
+            return applyGrepFilter(output, args.grep);
+        }
+    });
+}
+//# sourceMappingURL=skill-mcp.js.map

package/dist/tools/skill-mcp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-mcp.js","sourceRoot":"","sources":["../../src/tools/skill-mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAuB,MAAM,0BAA0B,CAAA;AAIpE,MAAM,qBAAqB,GACzB,yIAAyI,CAAA;AAO3I;;GAEG;AACH,SAAS,uBAAuB,CAAC,IAIhC;IACC,MAAM,UAAU,GAAoB,EAAE,CAAA;IAEtC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;IACzD,CAAC;IACD,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAA;IACjE,CAAC;IACD,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QACrB,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;IAC7D,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CACb,mGAAmG;YACnG,aAAa;YACb,iGAAiG;YACjG,kEAAkE;YAClE,sFAAsF,CACvF,CAAA;IACH,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAAG;YACf,IAAI,CAAC,SAAS,IAAI,cAAc,IAAI,CAAC,SAAS,GAAG;YACjD,IAAI,CAAC,aAAa,IAAI,kBAAkB,IAAI,CAAC,aAAa,GAAG;YAC7D,IAAI,CAAC,WAAW,IAAI,gBAAgB,IAAI,CAAC,WAAW,GAAG;SACxD,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAE5B,MAAM,IAAI,KAAK,CACb,8GAA8G;YAC9G,aAAa,QAAQ,MAAM;YAC3B,wCAAwC,CACzC,CAAA;IACH,CAAC;IAED,OAAO,UAAU,CAAC,CAAC,CAAC,CAAA;AACtB,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CACpB,OAAe,EACf,MAAqB;IAErB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,KAAK,CAAC,SAAS,IAAI,OAAO,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YAClD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAA;QACpD,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED;;GAEG;AACH,SAAS,mBAAmB,CAAC,MAAqB;IAChD,MAAM,IAAI,GAAa,EAAE,CAAA;IAEzB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;gBACtD,IAAI,CAAC,IAAI,CAAC,QAAQ,UAAU,iBAAiB,KAAK,CAAC,IAAI,GAAG,CAAC,CAAA;YAC7D,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAA;AAC7D,CAAC;AAED;;GAEG;AACH,SAAS,cAAc,CAAC,QAAiB;IACvC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,CAAA;IACX,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QACnC,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;QACpD,CAAC;QACD,OAAO,MAAiC,CAAA;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC3E,MAAM,IAAI,KAAK,CACb,2BAA2B,YAAY,MAAM;YAC7C,0DAA0D;YAC1D,aAAa,QAAQ,EAAE,CACxB,CAAA;IACH,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,eAAe,CAAC,MAAc,EAAE,OAAgB;IACvD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,MAAM,CAAA;IACf,CAAC;IAED,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;QACtC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAChC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QACzD,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC;YACxB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;YACrB,CAAC,CAAC,oCAAoC,OAAO,EAAE,CAAA;IACnD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAA;IACf,CAAC;AACH,CAAC;AAQD;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAkC;IACnE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,GAAG,OAAO,CAAA;IAE1D,OAAO,IAAI,CAAC;QACV,WAAW,EAAE,qBAAqB;QAClC,IAAI,EAAE;YACJ,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,0CAA0C,CAAC;YACnF,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,kBAAkB,CAAC;YACvE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,0BAA0B,CAAC;YACnF,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC;YAC1E,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,0BAA0B,CAAC;YAC/E,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAC5C,qEAAqE,CACtE;SACF;QACD,KAAK,CAAC,OAAO,CAAC,IAAI;YAChB,MAAM,SAAS,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAA;YAC/C,MAAM,MAAM,GAAG,eAAe,EAAE,CAAA;YAChC,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;YAElD,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CACb,eAAe,IAAI,CAAC,QAAQ,kBAAkB;oBAC9C,2CAA2C;oBAC3C,mBAAmB,CAAC,MAAM,CAAC,GAAG,MAAM;oBACpC,yEAAyE,CAC1E,CAAA;YACH,CAAC;YAED,MAAM,IAAI,GAAG;gBACX,UAAU,EAAE,IAAI,CAAC,QAAQ;gBACzB,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI;gBAC3B,SAAS,EAAE,YAAY,EAAE;aAC1B,CAAA;YAED,MAAM,OAAO,GAAG;gBACd,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI;aAC5B,CAAA;YAED,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACjD,IAAI,MAAc,CAAA;YAElB,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;gBACvB,KAAK,MAAM,CAAC,CAAC,CAAC;oBACZ,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;oBAChF,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;oBACxC,MAAK;gBACP,CAAC;gBACD,KAAK,UAAU,CAAC,CAAC,CAAC;oBAChB,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;oBACxE,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;oBACxC,MAAK;gBACP,CAAC;gBACD,KAAK,QAAQ,CAAC,CAAC,CAAC;oBACd,MAAM,UAAU,GAA2B,EAAE,CAAA;oBAC7C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;wBACtD,UAAU,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;oBACjC,CAAC;oBACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;oBACjF,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;oBACxC,MAAK;gBACP,CAAC;YACH,CAAC;YAED,OAAO,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;QAC3C,CAAC;KACF,CAAC,CAAA;AACJ,CAAC"}

package/dist/tools/skill.d.ts

@@ -0,0 +1,13 @@
+import { type ToolDefinition } from '@opencode-ai/plugin/tool';
+import type { LoadedSkill } from '../types.js';
+import type { SkillMcpManager } from '../skill-mcp-manager.js';
+export interface CreateSkillToolOptions {
+    skills: LoadedSkill[];
+    mcpManager?: SkillMcpManager;
+    getSessionID?: () => string;
+}
+/**
+ * Create the skill tool
+ */
+export declare function createSkillTool(options: CreateSkillToolOptions): ToolDefinition;
+//# sourceMappingURL=skill.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"skill.d.ts","sourceRoot":"","sources":["../../src/tools/skill.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAEpE,OAAO,KAAK,EAAE,WAAW,EAAmB,MAAM,aAAa,CAAA;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAqK9D,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,UAAU,CAAC,EAAE,eAAe,CAAA;IAC5B,YAAY,CAAC,EAAE,MAAM,MAAM,CAAA;CAC5B;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,cAAc,CAgD/E"}

package/dist/tools/skill.js

@@ -0,0 +1,160 @@
+import { tool } from '@opencode-ai/plugin/tool';
+import { dirname } from 'path';
+import { parseFrontmatter } from '../utils/frontmatter.js';
+const TOOL_DESCRIPTION_NO_SKILLS = 'Load a skill to get detailed instructions for a specific task. No skills are currently available.';
+const TOOL_DESCRIPTION_PREFIX = `Load a skill to get detailed instructions for a specific task.
+
+Skills provide specialized knowledge and step-by-step guidance.
+Use this when a task matches an available skill's description.`;
+/**
+ * Convert loaded skill to info for display
+ */
+function loadedSkillToInfo(skill) {
+    return {
+        name: skill.name,
+        description: skill.definition.description || '',
+        scope: skill.scope
+    };
+}
+/**
+ * Format skills as XML for tool description
+ */
+function formatSkillsXml(skills) {
+    if (skills.length === 0)
+        return '';
+    const skillsXml = skills.map((skill) => {
+        return [
+            '  <skill>',
+            `    <name>${skill.name}</name>`,
+            `    <description>${skill.description}</description>`,
+            '  </skill>'
+        ].join('\n');
+    }).join('\n');
+    return `
+
+<available_skills>
+${skillsXml}
+</available_skills>`;
+}
+/**
+ * Extract skill body content
+ */
+async function extractSkillBody(skill) {
+    if (skill.lazyContent) {
+        const fullTemplate = await skill.lazyContent.load();
+        const templateMatch = fullTemplate.match(/<skill-instruction>([\s\S]*?)<\/skill-instruction>/);
+        return templateMatch ? templateMatch[1].trim() : fullTemplate;
+    }
+    if (skill.path) {
+        const { readFileSync } = await import('fs');
+        const content = readFileSync(skill.path, 'utf-8');
+        const { body } = parseFrontmatter(content);
+        return body.trim();
+    }
+    const templateMatch = skill.definition.template?.match(/<skill-instruction>([\s\S]*?)<\/skill-instruction>/);
+    return templateMatch ? templateMatch[1].trim() : skill.definition.template || '';
+}
+/**
+ * Format MCP capabilities for display
+ */
+async function formatMcpCapabilities(skill, manager, sessionID) {
+    if (!skill.mcpConfig || Object.keys(skill.mcpConfig).length === 0) {
+        return null;
+    }
+    const sections = ['', '## Available MCP Servers', ''];
+    for (const [serverName, config] of Object.entries(skill.mcpConfig)) {
+        const info = {
+            serverName,
+            skillName: skill.name,
+            sessionID
+        };
+        const context = {
+            config: config,
+            skillName: skill.name
+        };
+        sections.push(`### ${serverName}`);
+        sections.push('');
+        try {
+            const [tools, resources, prompts] = await Promise.all([
+                manager.listTools(info, context).catch(() => []),
+                manager.listResources(info, context).catch(() => []),
+                manager.listPrompts(info, context).catch(() => [])
+            ]);
+            if (tools.length > 0) {
+                sections.push('**Tools:**');
+                sections.push('');
+                for (const t of tools) {
+                    sections.push(`#### \`${t.name}\``);
+                    if (t.description) {
+                        sections.push(t.description);
+                    }
+                    sections.push('');
+                    sections.push('**inputSchema:**');
+                    sections.push('```json');
+                    sections.push(JSON.stringify(t.inputSchema, null, 2));
+                    sections.push('```');
+                    sections.push('');
+                }
+            }
+            if (resources.length > 0) {
+                sections.push(`**Resources**: ${resources.map((r) => r.uri).join(', ')}`);
+            }
+            if (prompts.length > 0) {
+                sections.push(`**Prompts**: ${prompts.map((p) => p.name).join(', ')}`);
+            }
+            if (tools.length === 0 && resources.length === 0 && prompts.length === 0) {
+                sections.push('*No capabilities discovered*');
+            }
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            sections.push(`*Failed to connect: ${errorMessage.split('\n')[0]}*`);
+        }
+        sections.push('');
+        sections.push(`Use \`skill_mcp\` tool with \`mcp_name="${serverName}"\` to invoke.`);
+        sections.push('');
+    }
+    return sections.join('\n');
+}
+/**
+ * Create the skill tool
+ */
+export function createSkillTool(options) {
+    const { skills, mcpManager, getSessionID } = options;
+    // Build description with available skills
+    const skillInfos = skills.map(loadedSkillToInfo);
+    const description = skillInfos.length === 0
+        ? TOOL_DESCRIPTION_NO_SKILLS
+        : TOOL_DESCRIPTION_PREFIX + formatSkillsXml(skillInfos);
+    return tool({
+        description,
+        args: {
+            name: tool.schema.string().describe("The skill identifier from available_skills (e.g., 'code-review' or 'my-skill')")
+        },
+        async execute(args) {
+            const skill = skills.find((s) => s.name === args.name);
+            if (!skill) {
+                const available = skills.map((s) => s.name).join(', ');
+                throw new Error(`Skill "${args.name}" not found. Available skills: ${available || 'none'}`);
+            }
+            const body = await extractSkillBody(skill);
+            const dir = skill.path ? dirname(skill.path) : skill.resolvedPath || process.cwd();
+            const output = [
+                `## Skill: ${skill.name}`,
+                '',
+                `**Base directory**: ${dir}`,
+                '',
+                body
+            ];
+            // Add MCP capabilities if manager available
+            if (mcpManager && getSessionID && skill.mcpConfig) {
+                const mcpInfo = await formatMcpCapabilities(skill, mcpManager, getSessionID());
+                if (mcpInfo) {
+                    output.push(mcpInfo);
+                }
+            }
+            return output.join('\n');
+        }
+    });
+}
+//# sourceMappingURL=skill.js.map