feat(skill): display MCP tool inputSchema when loading skills
Previously only tool names were shown. Now each tool displays its full inputSchema JSON so LLM can construct correct skill_mcp calls. 🤖 GENERATED WITH ASSISTANCE OF [OhMyOpenCode](https://github.com/code-yeongyu/oh-my-opencode)
This commit is contained in:
YeonGyu-Kim
230
src/tools/skill/tools.test.ts
Normal file
230
src/tools/skill/tools.test.ts
Normal file
@@ -0,0 +1,230 @@
|
||||
import { describe, it, expect, beforeEach, mock, spyOn } from "bun:test"
|
||||
import { createSkillTool } from "./tools"
|
||||
import { SkillMcpManager } from "../../features/skill-mcp-manager"
|
||||
import type { LoadedSkill } from "../../features/opencode-skill-loader/types"
|
||||
import type { Tool as McpTool } from "@modelcontextprotocol/sdk/types.js"
|
||||
|
||||
mock.module("node:fs", () => ({
|
||||
readFileSync: () => `---
|
||||
description: Test skill description
|
||||
---
|
||||
Test skill body content`,
|
||||
}))
|
||||
|
||||
function createMockSkillWithMcp(name: string, mcpServers: Record<string, unknown>): LoadedSkill {
|
||||
return {
|
||||
name,
|
||||
path: `/test/skills/${name}/SKILL.md`,
|
||||
resolvedPath: `/test/skills/${name}`,
|
||||
definition: {
|
||||
name,
|
||||
description: `Test skill ${name}`,
|
||||
template: "Test template",
|
||||
},
|
||||
scope: "opencode-project",
|
||||
mcpConfig: mcpServers as LoadedSkill["mcpConfig"],
|
||||
}
|
||||
}
|
||||
|
||||
const mockContext = {
|
||||
sessionID: "test-session",
|
||||
messageID: "msg-1",
|
||||
agent: "test-agent",
|
||||
abort: new AbortController().signal,
|
||||
}
|
||||
|
||||
describe("skill tool - MCP schema display", () => {
|
||||
let manager: SkillMcpManager
|
||||
let loadedSkills: LoadedSkill[]
|
||||
let sessionID: string
|
||||
|
||||
beforeEach(() => {
|
||||
manager = new SkillMcpManager()
|
||||
loadedSkills = []
|
||||
sessionID = "test-session-1"
|
||||
})
|
||||
|
||||
describe("formatMcpCapabilities with inputSchema", () => {
|
||||
it("displays tool inputSchema when available", async () => {
|
||||
// #given
|
||||
const mockToolsWithSchema: McpTool[] = [
|
||||
{
|
||||
name: "browser_type",
|
||||
description: "Type text into an element",
|
||||
inputSchema: {
|
||||
type: "object",
|
||||
properties: {
|
||||
element: { type: "string", description: "Human-readable element description" },
|
||||
ref: { type: "string", description: "Element reference from page snapshot" },
|
||||
text: { type: "string", description: "Text to type into the element" },
|
||||
submit: { type: "boolean", description: "Submit form after typing" },
|
||||
},
|
||||
required: ["element", "ref", "text"],
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
loadedSkills = [
|
||||
createMockSkillWithMcp("test-skill", {
|
||||
playwright: { command: "npx", args: ["-y", "@anthropic-ai/mcp-playwright"] },
|
||||
}),
|
||||
]
|
||||
|
||||
// Mock manager.listTools to return our mock tools
|
||||
spyOn(manager, "listTools").mockResolvedValue(mockToolsWithSchema)
|
||||
spyOn(manager, "listResources").mockResolvedValue([])
|
||||
spyOn(manager, "listPrompts").mockResolvedValue([])
|
||||
|
||||
const tool = createSkillTool({
|
||||
skills: loadedSkills,
|
||||
mcpManager: manager,
|
||||
getSessionID: () => sessionID,
|
||||
})
|
||||
|
||||
// #when
|
||||
const result = await tool.execute({ name: "test-skill" }, mockContext)
|
||||
|
||||
// #then
|
||||
// Should include inputSchema details
|
||||
expect(result).toContain("browser_type")
|
||||
expect(result).toContain("inputSchema")
|
||||
expect(result).toContain("element")
|
||||
expect(result).toContain("ref")
|
||||
expect(result).toContain("text")
|
||||
expect(result).toContain("submit")
|
||||
expect(result).toContain("required")
|
||||
})
|
||||
|
||||
it("displays multiple tools with their schemas", async () => {
|
||||
// #given
|
||||
const mockToolsWithSchema: McpTool[] = [
|
||||
{
|
||||
name: "browser_navigate",
|
||||
description: "Navigate to a URL",
|
||||
inputSchema: {
|
||||
type: "object",
|
||||
properties: {
|
||||
url: { type: "string", description: "URL to navigate to" },
|
||||
},
|
||||
required: ["url"],
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "browser_click",
|
||||
description: "Click an element",
|
||||
inputSchema: {
|
||||
type: "object",
|
||||
properties: {
|
||||
element: { type: "string" },
|
||||
ref: { type: "string" },
|
||||
},
|
||||
required: ["element", "ref"],
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
loadedSkills = [
|
||||
createMockSkillWithMcp("playwright-skill", {
|
||||
playwright: { command: "npx", args: ["-y", "@anthropic-ai/mcp-playwright"] },
|
||||
}),
|
||||
]
|
||||
|
||||
spyOn(manager, "listTools").mockResolvedValue(mockToolsWithSchema)
|
||||
spyOn(manager, "listResources").mockResolvedValue([])
|
||||
spyOn(manager, "listPrompts").mockResolvedValue([])
|
||||
|
||||
const tool = createSkillTool({
|
||||
skills: loadedSkills,
|
||||
mcpManager: manager,
|
||||
getSessionID: () => sessionID,
|
||||
})
|
||||
|
||||
// #when
|
||||
const result = await tool.execute({ name: "playwright-skill" }, mockContext)
|
||||
|
||||
// #then
|
||||
expect(result).toContain("browser_navigate")
|
||||
expect(result).toContain("browser_click")
|
||||
expect(result).toContain("url")
|
||||
expect(result).toContain("Navigate to a URL")
|
||||
})
|
||||
|
||||
it("handles tools without inputSchema gracefully", async () => {
|
||||
// #given
|
||||
const mockToolsMinimal: McpTool[] = [
|
||||
{
|
||||
name: "simple_tool",
|
||||
inputSchema: { type: "object" },
|
||||
},
|
||||
]
|
||||
|
||||
loadedSkills = [
|
||||
createMockSkillWithMcp("simple-skill", {
|
||||
simple: { command: "echo", args: ["test"] },
|
||||
}),
|
||||
]
|
||||
|
||||
spyOn(manager, "listTools").mockResolvedValue(mockToolsMinimal)
|
||||
spyOn(manager, "listResources").mockResolvedValue([])
|
||||
spyOn(manager, "listPrompts").mockResolvedValue([])
|
||||
|
||||
const tool = createSkillTool({
|
||||
skills: loadedSkills,
|
||||
mcpManager: manager,
|
||||
getSessionID: () => sessionID,
|
||||
})
|
||||
|
||||
// #when
|
||||
const result = await tool.execute({ name: "simple-skill" }, mockContext)
|
||||
|
||||
// #then
|
||||
expect(result).toContain("simple_tool")
|
||||
// Should not throw, should handle gracefully
|
||||
})
|
||||
|
||||
it("formats schema in a way LLM can understand for skill_mcp calls", async () => {
|
||||
// #given
|
||||
const mockTools: McpTool[] = [
|
||||
{
|
||||
name: "query",
|
||||
description: "Execute SQL query",
|
||||
inputSchema: {
|
||||
type: "object",
|
||||
properties: {
|
||||
sql: { type: "string", description: "SQL query to execute" },
|
||||
params: { type: "array", description: "Query parameters" },
|
||||
},
|
||||
required: ["sql"],
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
loadedSkills = [
|
||||
createMockSkillWithMcp("db-skill", {
|
||||
sqlite: { command: "uvx", args: ["mcp-server-sqlite"] },
|
||||
}),
|
||||
]
|
||||
|
||||
spyOn(manager, "listTools").mockResolvedValue(mockTools)
|
||||
spyOn(manager, "listResources").mockResolvedValue([])
|
||||
spyOn(manager, "listPrompts").mockResolvedValue([])
|
||||
|
||||
const tool = createSkillTool({
|
||||
skills: loadedSkills,
|
||||
mcpManager: manager,
|
||||
getSessionID: () => sessionID,
|
||||
})
|
||||
|
||||
// #when
|
||||
const result = await tool.execute({ name: "db-skill" }, mockContext)
|
||||
|
||||
// #then
|
||||
// Should provide enough info for LLM to construct valid skill_mcp call
|
||||
expect(result).toContain("sqlite")
|
||||
expect(result).toContain("query")
|
||||
expect(result).toContain("sql")
|
||||
expect(result).toContain("required")
|
||||
expect(result).toMatch(/sql[\s\S]*string/i)
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -84,7 +84,20 @@ async function formatMcpCapabilities(
|
||||
])
|
||||
|
||||
if (tools.length > 0) {
|
||||
sections.push(`**Tools**: ${tools.map((t: Tool) => t.name).join(", ")}`)
|
||||
sections.push("**Tools:**")
|
||||
sections.push("")
|
||||
for (const t of tools as Tool[]) {
|
||||
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: Resource) => r.uri).join(", ")}`)
|
||||
|
||||
Reference in New Issue
Block a user