* 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>
391 lines
11 KiB
TypeScript
391 lines
11 KiB
TypeScript
import { describe, it, expect, beforeEach, afterEach } from "bun:test"
|
|
import { mkdirSync, writeFileSync, rmSync } from "fs"
|
|
import { join } from "path"
|
|
import { tmpdir } from "os"
|
|
|
|
const TEST_DIR = join(tmpdir(), "skill-loader-test-" + Date.now())
|
|
const SKILLS_DIR = join(TEST_DIR, ".opencode", "skills")
|
|
|
|
function createTestSkill(name: string, content: string, mcpJson?: object): string {
|
|
const skillDir = join(SKILLS_DIR, name)
|
|
mkdirSync(skillDir, { recursive: true })
|
|
const skillPath = join(skillDir, "SKILL.md")
|
|
writeFileSync(skillPath, content)
|
|
if (mcpJson) {
|
|
writeFileSync(join(skillDir, "mcp.json"), JSON.stringify(mcpJson, null, 2))
|
|
}
|
|
return skillDir
|
|
}
|
|
|
|
describe("skill loader MCP parsing", () => {
|
|
beforeEach(() => {
|
|
mkdirSync(TEST_DIR, { recursive: true })
|
|
})
|
|
|
|
afterEach(() => {
|
|
rmSync(TEST_DIR, { recursive: true, force: true })
|
|
})
|
|
|
|
describe("parseSkillMcpConfig", () => {
|
|
it("parses skill with nested MCP config", async () => {
|
|
// given
|
|
const skillContent = `---
|
|
name: test-skill
|
|
description: A test skill with MCP
|
|
mcp:
|
|
sqlite:
|
|
command: uvx
|
|
args:
|
|
- mcp-server-sqlite
|
|
- --db-path
|
|
- ./data.db
|
|
memory:
|
|
command: npx
|
|
args: [-y, "@anthropic-ai/mcp-server-memory"]
|
|
---
|
|
This is the skill body.
|
|
`
|
|
createTestSkill("test-mcp-skill", skillContent)
|
|
|
|
// when
|
|
const { discoverSkills } = await import("./loader")
|
|
const originalCwd = process.cwd()
|
|
process.chdir(TEST_DIR)
|
|
|
|
try {
|
|
const skills = await discoverSkills({ includeClaudeCodePaths: false })
|
|
const skill = skills.find(s => s.name === "test-skill")
|
|
|
|
// then
|
|
expect(skill).toBeDefined()
|
|
expect(skill?.mcpConfig).toBeDefined()
|
|
expect(skill?.mcpConfig?.sqlite).toBeDefined()
|
|
expect(skill?.mcpConfig?.sqlite?.command).toBe("uvx")
|
|
expect(skill?.mcpConfig?.sqlite?.args).toEqual([
|
|
"mcp-server-sqlite",
|
|
"--db-path",
|
|
"./data.db"
|
|
])
|
|
expect(skill?.mcpConfig?.memory).toBeDefined()
|
|
expect(skill?.mcpConfig?.memory?.command).toBe("npx")
|
|
} finally {
|
|
process.chdir(originalCwd)
|
|
}
|
|
})
|
|
|
|
it("returns undefined mcpConfig for skill without MCP", async () => {
|
|
// given
|
|
const skillContent = `---
|
|
name: simple-skill
|
|
description: A simple skill without MCP
|
|
---
|
|
This is a simple skill.
|
|
`
|
|
createTestSkill("simple-skill", skillContent)
|
|
|
|
// when
|
|
const { discoverSkills } = await import("./loader")
|
|
const originalCwd = process.cwd()
|
|
process.chdir(TEST_DIR)
|
|
|
|
try {
|
|
const skills = await discoverSkills({ includeClaudeCodePaths: false })
|
|
const skill = skills.find(s => s.name === "simple-skill")
|
|
|
|
// then
|
|
expect(skill).toBeDefined()
|
|
expect(skill?.mcpConfig).toBeUndefined()
|
|
} finally {
|
|
process.chdir(originalCwd)
|
|
}
|
|
})
|
|
|
|
it("preserves env var placeholders without expansion", async () => {
|
|
// given
|
|
const skillContent = `---
|
|
name: env-skill
|
|
mcp:
|
|
api-server:
|
|
command: node
|
|
args: [server.js]
|
|
env:
|
|
API_KEY: "\${API_KEY}"
|
|
DB_PATH: "\${HOME}/data.db"
|
|
---
|
|
Skill with env vars.
|
|
`
|
|
createTestSkill("env-skill", skillContent)
|
|
|
|
// when
|
|
const { discoverSkills } = await import("./loader")
|
|
const originalCwd = process.cwd()
|
|
process.chdir(TEST_DIR)
|
|
|
|
try {
|
|
const skills = await discoverSkills({ includeClaudeCodePaths: false })
|
|
const skill = skills.find(s => s.name === "env-skill")
|
|
|
|
// then
|
|
expect(skill?.mcpConfig?.["api-server"]?.env?.API_KEY).toBe("${API_KEY}")
|
|
expect(skill?.mcpConfig?.["api-server"]?.env?.DB_PATH).toBe("${HOME}/data.db")
|
|
} finally {
|
|
process.chdir(originalCwd)
|
|
}
|
|
})
|
|
|
|
it("handles malformed YAML gracefully", async () => {
|
|
// given - malformed YAML causes entire frontmatter to fail parsing
|
|
const skillContent = `---
|
|
name: bad-yaml
|
|
mcp: [this is not valid yaml for mcp
|
|
---
|
|
Skill body.
|
|
`
|
|
createTestSkill("bad-yaml-skill", skillContent)
|
|
|
|
// when
|
|
const { discoverSkills } = await import("./loader")
|
|
const originalCwd = process.cwd()
|
|
process.chdir(TEST_DIR)
|
|
|
|
try {
|
|
const skills = await discoverSkills({ includeClaudeCodePaths: false })
|
|
// then - when YAML fails, skill uses directory name as fallback
|
|
const skill = skills.find(s => s.name === "bad-yaml-skill")
|
|
|
|
expect(skill).toBeDefined()
|
|
expect(skill?.mcpConfig).toBeUndefined()
|
|
} finally {
|
|
process.chdir(originalCwd)
|
|
}
|
|
})
|
|
})
|
|
|
|
describe("mcp.json file loading (AmpCode compat)", () => {
|
|
it("loads MCP config from mcp.json with mcpServers format", async () => {
|
|
// given
|
|
const skillContent = `---
|
|
name: ampcode-skill
|
|
description: Skill with mcp.json
|
|
---
|
|
Skill body.
|
|
`
|
|
const mcpJson = {
|
|
mcpServers: {
|
|
playwright: {
|
|
command: "npx",
|
|
args: ["@playwright/mcp@latest"]
|
|
}
|
|
}
|
|
}
|
|
createTestSkill("ampcode-skill", skillContent, mcpJson)
|
|
|
|
// when
|
|
const { discoverSkills } = await import("./loader")
|
|
const originalCwd = process.cwd()
|
|
process.chdir(TEST_DIR)
|
|
|
|
try {
|
|
const skills = await discoverSkills({ includeClaudeCodePaths: false })
|
|
const skill = skills.find(s => s.name === "ampcode-skill")
|
|
|
|
// then
|
|
expect(skill).toBeDefined()
|
|
expect(skill?.mcpConfig).toBeDefined()
|
|
expect(skill?.mcpConfig?.playwright).toBeDefined()
|
|
expect(skill?.mcpConfig?.playwright?.command).toBe("npx")
|
|
expect(skill?.mcpConfig?.playwright?.args).toEqual(["@playwright/mcp@latest"])
|
|
} finally {
|
|
process.chdir(originalCwd)
|
|
}
|
|
})
|
|
|
|
it("mcp.json takes priority over YAML frontmatter", async () => {
|
|
// given
|
|
const skillContent = `---
|
|
name: priority-skill
|
|
mcp:
|
|
from-yaml:
|
|
command: yaml-cmd
|
|
args: [yaml-arg]
|
|
---
|
|
Skill body.
|
|
`
|
|
const mcpJson = {
|
|
mcpServers: {
|
|
"from-json": {
|
|
command: "json-cmd",
|
|
args: ["json-arg"]
|
|
}
|
|
}
|
|
}
|
|
createTestSkill("priority-skill", skillContent, mcpJson)
|
|
|
|
// when
|
|
const { discoverSkills } = await import("./loader")
|
|
const originalCwd = process.cwd()
|
|
process.chdir(TEST_DIR)
|
|
|
|
try {
|
|
const skills = await discoverSkills({ includeClaudeCodePaths: false })
|
|
const skill = skills.find(s => s.name === "priority-skill")
|
|
|
|
// then - mcp.json should take priority
|
|
expect(skill?.mcpConfig?.["from-json"]).toBeDefined()
|
|
expect(skill?.mcpConfig?.["from-yaml"]).toBeUndefined()
|
|
} finally {
|
|
process.chdir(originalCwd)
|
|
}
|
|
})
|
|
|
|
it("supports direct format without mcpServers wrapper", async () => {
|
|
// given
|
|
const skillContent = `---
|
|
name: direct-format
|
|
---
|
|
Skill body.
|
|
`
|
|
const mcpJson = {
|
|
sqlite: {
|
|
command: "uvx",
|
|
args: ["mcp-server-sqlite"]
|
|
}
|
|
}
|
|
createTestSkill("direct-format", skillContent, mcpJson)
|
|
|
|
// when
|
|
const { discoverSkills } = await import("./loader")
|
|
const originalCwd = process.cwd()
|
|
process.chdir(TEST_DIR)
|
|
|
|
try {
|
|
const skills = await discoverSkills({ includeClaudeCodePaths: false })
|
|
const skill = skills.find(s => s.name === "direct-format")
|
|
|
|
// then
|
|
expect(skill?.mcpConfig?.sqlite).toBeDefined()
|
|
expect(skill?.mcpConfig?.sqlite?.command).toBe("uvx")
|
|
} finally {
|
|
process.chdir(originalCwd)
|
|
}
|
|
})
|
|
})
|
|
|
|
describe("allowed-tools parsing", () => {
|
|
it("parses space-separated allowed-tools string", async () => {
|
|
// given
|
|
const skillContent = `---
|
|
name: space-separated-tools
|
|
description: Skill with space-separated allowed-tools
|
|
allowed-tools: Read Write Edit Bash
|
|
---
|
|
Skill body.
|
|
`
|
|
createTestSkill("space-separated-tools", skillContent)
|
|
|
|
// when
|
|
const { discoverSkills } = await import("./loader")
|
|
const originalCwd = process.cwd()
|
|
process.chdir(TEST_DIR)
|
|
|
|
try {
|
|
const skills = await discoverSkills({ includeClaudeCodePaths: false })
|
|
const skill = skills.find(s => s.name === "space-separated-tools")
|
|
|
|
// then
|
|
expect(skill).toBeDefined()
|
|
expect(skill?.allowedTools).toEqual(["Read", "Write", "Edit", "Bash"])
|
|
} finally {
|
|
process.chdir(originalCwd)
|
|
}
|
|
})
|
|
|
|
it("parses YAML inline array allowed-tools", async () => {
|
|
// given
|
|
const skillContent = `---
|
|
name: yaml-inline-array
|
|
description: Skill with YAML inline array allowed-tools
|
|
allowed-tools: [Read, Write, Edit, Bash]
|
|
---
|
|
Skill body.
|
|
`
|
|
createTestSkill("yaml-inline-array", skillContent)
|
|
|
|
// when
|
|
const { discoverSkills } = await import("./loader")
|
|
const originalCwd = process.cwd()
|
|
process.chdir(TEST_DIR)
|
|
|
|
try {
|
|
const skills = await discoverSkills({ includeClaudeCodePaths: false })
|
|
const skill = skills.find(s => s.name === "yaml-inline-array")
|
|
|
|
// then
|
|
expect(skill).toBeDefined()
|
|
expect(skill?.allowedTools).toEqual(["Read", "Write", "Edit", "Bash"])
|
|
} finally {
|
|
process.chdir(originalCwd)
|
|
}
|
|
})
|
|
|
|
it("parses YAML multi-line array allowed-tools", async () => {
|
|
// given
|
|
const skillContent = `---
|
|
name: yaml-multiline-array
|
|
description: Skill with YAML multi-line array allowed-tools
|
|
allowed-tools:
|
|
- Read
|
|
- Write
|
|
- Edit
|
|
- Bash
|
|
---
|
|
Skill body.
|
|
`
|
|
createTestSkill("yaml-multiline-array", skillContent)
|
|
|
|
// when
|
|
const { discoverSkills } = await import("./loader")
|
|
const originalCwd = process.cwd()
|
|
process.chdir(TEST_DIR)
|
|
|
|
try {
|
|
const skills = await discoverSkills({ includeClaudeCodePaths: false })
|
|
const skill = skills.find(s => s.name === "yaml-multiline-array")
|
|
|
|
// then
|
|
expect(skill).toBeDefined()
|
|
expect(skill?.allowedTools).toEqual(["Read", "Write", "Edit", "Bash"])
|
|
} finally {
|
|
process.chdir(originalCwd)
|
|
}
|
|
})
|
|
|
|
it("returns undefined for skill without allowed-tools", async () => {
|
|
// given
|
|
const skillContent = `---
|
|
name: no-allowed-tools
|
|
description: Skill without allowed-tools field
|
|
---
|
|
Skill body.
|
|
`
|
|
createTestSkill("no-allowed-tools", skillContent)
|
|
|
|
// when
|
|
const { discoverSkills } = await import("./loader")
|
|
const originalCwd = process.cwd()
|
|
process.chdir(TEST_DIR)
|
|
|
|
try {
|
|
const skills = await discoverSkills({ includeClaudeCodePaths: false })
|
|
const skill = skills.find(s => s.name === "no-allowed-tools")
|
|
|
|
// then
|
|
expect(skill).toBeDefined()
|
|
expect(skill?.allowedTools).toBeUndefined()
|
|
} finally {
|
|
process.chdir(originalCwd)
|
|
}
|
|
})
|
|
})
|
|
})
|