* style(tests): normalize BDD comments from '// #given' to '// given' - Replace 4,668 Python-style BDD comments across 107 test files - Patterns changed: // #given -> // given, // #when -> // when, // #then -> // then - Also handles no-space variants: //#given -> // given * fix(rules-injector): prefer output.metadata.filePath over output.title - Extract file path resolution to dedicated output-path.ts module - Prefer metadata.filePath which contains actual file path - Fall back to output.title only when metadata unavailable - Fixes issue where rules weren't injected when tool output title was a label * feat(slashcommand): add optional user_message parameter - Add user_message optional parameter for command arguments - Model can now call: command='publish' user_message='patch' - Improves error messages with clearer format guidance - Helps LLMs understand correct parameter usage * feat(hooks): restore compaction-context-injector hook - Restore hook deleted in cbbc7bd0 for session compaction context - Injects 7 mandatory sections: User Requests, Final Goal, Work Completed, Remaining Tasks, Active Working Context, MUST NOT Do, Agent Verification State - Re-register in hooks/index.ts and main plugin entry * refactor(background-agent): split manager.ts into focused modules - Extract constants.ts for TTL values and internal types (52 lines) - Extract state.ts for TaskStateManager class (204 lines) - Extract spawner.ts for task creation logic (244 lines) - Extract result-handler.ts for completion handling (265 lines) - Reduce manager.ts from 1377 to 755 lines (45% reduction) - Maintain backward compatible exports * refactor(agents): split prometheus-prompt.ts into subdirectory - Move 1196-line prometheus-prompt.ts to prometheus/ subdirectory - Organize prompt sections into separate files for maintainability - Update agents/index.ts exports * refactor(delegate-task): split tools.ts into focused modules - Extract categories.ts for category definitions and routing - Extract executor.ts for task execution logic - Extract helpers.ts for utility functions - Extract prompt-builder.ts for prompt construction - Reduce tools.ts complexity with cleaner separation of concerns * refactor(builtin-skills): split skills.ts into individual skill files - Move each skill to dedicated file in skills/ subdirectory - Create barrel export for backward compatibility - Improve maintainability with focused skill modules * chore: update import paths and lockfile - Update prometheus import path after refactor - Update bun.lock * fix(tests): complete BDD comment normalization - Fix remaining #when/#then patterns missed by initial sed - Affected: state.test.ts, events.test.ts --------- Co-authored-by: justsisyphus <justsisyphus@users.noreply.github.com>
221 lines
5.7 KiB
TypeScript
221 lines
5.7 KiB
TypeScript
import { describe, it, expect, beforeEach, mock } from "bun:test"
|
|
import type { ToolContext } from "@opencode-ai/plugin/tool"
|
|
import { createSkillMcpTool, applyGrepFilter } from "./tools"
|
|
import { SkillMcpManager } from "../../features/skill-mcp-manager"
|
|
import type { LoadedSkill } from "../../features/opencode-skill-loader/types"
|
|
|
|
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: ToolContext = {
|
|
sessionID: "test-session",
|
|
messageID: "msg-1",
|
|
agent: "test-agent",
|
|
directory: "/test",
|
|
worktree: "/test",
|
|
abort: new AbortController().signal,
|
|
metadata: () => {},
|
|
ask: async () => {},
|
|
}
|
|
|
|
describe("skill_mcp tool", () => {
|
|
let manager: SkillMcpManager
|
|
let loadedSkills: LoadedSkill[]
|
|
let sessionID: string
|
|
|
|
beforeEach(() => {
|
|
manager = new SkillMcpManager()
|
|
loadedSkills = []
|
|
sessionID = "test-session-1"
|
|
})
|
|
|
|
describe("parameter validation", () => {
|
|
it("throws when no operation specified", async () => {
|
|
// given
|
|
const tool = createSkillMcpTool({
|
|
manager,
|
|
getLoadedSkills: () => loadedSkills,
|
|
getSessionID: () => sessionID,
|
|
})
|
|
|
|
// when / #then
|
|
await expect(
|
|
tool.execute({ mcp_name: "test-server" }, mockContext)
|
|
).rejects.toThrow(/Missing operation/)
|
|
})
|
|
|
|
it("throws when multiple operations specified", async () => {
|
|
// given
|
|
const tool = createSkillMcpTool({
|
|
manager,
|
|
getLoadedSkills: () => loadedSkills,
|
|
getSessionID: () => sessionID,
|
|
})
|
|
|
|
// when / #then
|
|
await expect(
|
|
tool.execute({
|
|
mcp_name: "test-server",
|
|
tool_name: "some-tool",
|
|
resource_name: "some://resource",
|
|
}, mockContext)
|
|
).rejects.toThrow(/Multiple operations/)
|
|
})
|
|
|
|
it("throws when mcp_name not found in any skill", async () => {
|
|
// given
|
|
loadedSkills = [
|
|
createMockSkillWithMcp("test-skill", {
|
|
"known-server": { command: "echo", args: ["test"] },
|
|
}),
|
|
]
|
|
const tool = createSkillMcpTool({
|
|
manager,
|
|
getLoadedSkills: () => loadedSkills,
|
|
getSessionID: () => sessionID,
|
|
})
|
|
|
|
// when / #then
|
|
await expect(
|
|
tool.execute({ mcp_name: "unknown-server", tool_name: "some-tool" }, mockContext)
|
|
).rejects.toThrow(/not found/)
|
|
})
|
|
|
|
it("includes available MCP servers in error message", async () => {
|
|
// given
|
|
loadedSkills = [
|
|
createMockSkillWithMcp("db-skill", {
|
|
sqlite: { command: "uvx", args: ["mcp-server-sqlite"] },
|
|
}),
|
|
createMockSkillWithMcp("api-skill", {
|
|
"rest-api": { command: "node", args: ["server.js"] },
|
|
}),
|
|
]
|
|
const tool = createSkillMcpTool({
|
|
manager,
|
|
getLoadedSkills: () => loadedSkills,
|
|
getSessionID: () => sessionID,
|
|
})
|
|
|
|
// when / #then
|
|
await expect(
|
|
tool.execute({ mcp_name: "missing", tool_name: "test" }, mockContext)
|
|
).rejects.toThrow(/sqlite.*db-skill|rest-api.*api-skill/s)
|
|
})
|
|
|
|
it("throws on invalid JSON arguments", async () => {
|
|
// given
|
|
loadedSkills = [
|
|
createMockSkillWithMcp("test-skill", {
|
|
"test-server": { command: "echo" },
|
|
}),
|
|
]
|
|
const tool = createSkillMcpTool({
|
|
manager,
|
|
getLoadedSkills: () => loadedSkills,
|
|
getSessionID: () => sessionID,
|
|
})
|
|
|
|
// when / #then
|
|
await expect(
|
|
tool.execute({
|
|
mcp_name: "test-server",
|
|
tool_name: "some-tool",
|
|
arguments: "not valid json",
|
|
}, mockContext)
|
|
).rejects.toThrow(/Invalid arguments JSON/)
|
|
})
|
|
})
|
|
|
|
describe("tool description", () => {
|
|
it("has concise description", () => {
|
|
// given / #when
|
|
const tool = createSkillMcpTool({
|
|
manager,
|
|
getLoadedSkills: () => [],
|
|
getSessionID: () => "session",
|
|
})
|
|
|
|
// then
|
|
expect(tool.description.length).toBeLessThan(200)
|
|
expect(tool.description).toContain("mcp_name")
|
|
})
|
|
|
|
it("includes grep parameter in schema", () => {
|
|
// given / #when
|
|
const tool = createSkillMcpTool({
|
|
manager,
|
|
getLoadedSkills: () => [],
|
|
getSessionID: () => "session",
|
|
})
|
|
|
|
// then
|
|
expect(tool.description).toBeDefined()
|
|
})
|
|
})
|
|
})
|
|
|
|
describe("applyGrepFilter", () => {
|
|
it("filters lines matching pattern", () => {
|
|
// given
|
|
const output = `line1: hello world
|
|
line2: foo bar
|
|
line3: hello again
|
|
line4: baz qux`
|
|
|
|
// when
|
|
const result = applyGrepFilter(output, "hello")
|
|
|
|
// then
|
|
expect(result).toContain("line1: hello world")
|
|
expect(result).toContain("line3: hello again")
|
|
expect(result).not.toContain("foo bar")
|
|
expect(result).not.toContain("baz qux")
|
|
})
|
|
|
|
it("returns original output when pattern is undefined", () => {
|
|
// given
|
|
const output = "some output"
|
|
|
|
// when
|
|
const result = applyGrepFilter(output, undefined)
|
|
|
|
// then
|
|
expect(result).toBe(output)
|
|
})
|
|
|
|
it("returns message when no lines match", () => {
|
|
// given
|
|
const output = "line1\nline2\nline3"
|
|
|
|
// when
|
|
const result = applyGrepFilter(output, "xyz")
|
|
|
|
// then
|
|
expect(result).toContain("[grep] No lines matched pattern")
|
|
})
|
|
|
|
it("handles invalid regex gracefully", () => {
|
|
// given
|
|
const output = "some output"
|
|
|
|
// when
|
|
const result = applyGrepFilter(output, "[invalid")
|
|
|
|
// then
|
|
expect(result).toBe(output)
|
|
})
|
|
})
|