luna/oh-my-opencode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: major codebase cleanup - BDD comments, file splitting, bug fixes (#1350)

Browse Source 
* 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>
This commit is contained in:
YeonGyu-Kim
2026-02-01 16:47:50 +09:00
committed by GitHub
parent c83150d9ea
commit f146aeff0f
145 changed files with 10307 additions and 9562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/features/opencode-skill-loader/async-loader.test.ts
+60 -60
View File
@@ -36,19 +36,19 @@ describe("async-loader", () => {
describe("discoverSkillsInDirAsync", () => {
it("returns empty array for non-existent directory", async () => {
// #given - non-existent directory
// given - non-existent directory
const nonExistentDir = join(TEST_DIR, "does-not-exist")
// #when
// when
const { discoverSkillsInDirAsync } = await import("./async-loader")
const skills = await discoverSkillsInDirAsync(nonExistentDir)
// #then - should return empty array, not throw
// then - should return empty array, not throw
expect(skills).toEqual([])
})
it("discovers skills from SKILL.md in directory", async () => {
// #given
// given
const skillContent = `---
name: test-skill
description: A test skill
@@ -57,18 +57,18 @@ This is the skill body.
`
createTestSkill("test-skill", skillContent)
// #when
// when
const { discoverSkillsInDirAsync } = await import("./async-loader")
const skills = await discoverSkillsInDirAsync(SKILLS_DIR)
// #then
// then
expect(skills).toHaveLength(1)
expect(skills[0].name).toBe("test-skill")
expect(skills[0].definition.description).toContain("A test skill")
})
it("discovers skills from {name}.md pattern in directory", async () => {
// #given
// given
const skillContent = `---
name: named-skill
description: Named pattern skill
@@ -79,17 +79,17 @@ Skill body.
mkdirSync(skillDir, { recursive: true })
writeFileSync(join(skillDir, "named-skill.md"), skillContent)
// #when
// when
const { discoverSkillsInDirAsync } = await import("./async-loader")
const skills = await discoverSkillsInDirAsync(SKILLS_DIR)
// #then
// then
expect(skills).toHaveLength(1)
expect(skills[0].name).toBe("named-skill")
})
it("discovers direct .md files", async () => {
// #given
// given
const skillContent = `---
name: direct-skill
description: Direct markdown file
@@ -98,17 +98,17 @@ Direct skill.
`
createDirectSkill("direct-skill", skillContent)
// #when
// when
const { discoverSkillsInDirAsync } = await import("./async-loader")
const skills = await discoverSkillsInDirAsync(SKILLS_DIR)
// #then
// then
expect(skills).toHaveLength(1)
expect(skills[0].name).toBe("direct-skill")
})
it("skips entries starting with dot", async () => {
// #given
// given
const validContent = `---
name: valid-skill
---
@@ -122,17 +122,17 @@ Hidden.
createTestSkill("valid-skill", validContent)
createTestSkill(".hidden-skill", hiddenContent)
// #when
// when
const { discoverSkillsInDirAsync } = await import("./async-loader")
const skills = await discoverSkillsInDirAsync(SKILLS_DIR)
// #then - only valid-skill should be discovered
// then - only valid-skill should be discovered
expect(skills).toHaveLength(1)
expect(skills[0]?.name).toBe("valid-skill")
})
it("skips invalid files and continues with valid ones", async () => {
// #given - one valid, one invalid (unreadable)
// given - one valid, one invalid (unreadable)
const validContent = `---
name: valid-skill
---
@@ -152,11 +152,11 @@ Invalid skill.
chmodSync(invalidFile, 0o000)
}
// #when
// when
const { discoverSkillsInDirAsync } = await import("./async-loader")
const skills = await discoverSkillsInDirAsync(SKILLS_DIR)
// #then - should skip invalid and return only valid
// then - should skip invalid and return only valid
expect(skills.length).toBeGreaterThanOrEqual(1)
expect(skills.some((s: LoadedSkill) => s.name === "valid-skill")).toBe(true)
@@ -167,7 +167,7 @@ Invalid skill.
})
it("discovers multiple skills correctly", async () => {
// #given
// given
const skill1 = `---
name: skill-one
description: First skill
@@ -183,11 +183,11 @@ Skill two.
createTestSkill("skill-one", skill1)
createTestSkill("skill-two", skill2)
// #when
// when
const { discoverSkillsInDirAsync } = await import("./async-loader")
const asyncSkills = await discoverSkillsInDirAsync(SKILLS_DIR)
// #then
// then
expect(asyncSkills.length).toBe(2)
expect(asyncSkills.map((s: LoadedSkill) => s.name).sort()).toEqual(["skill-one", "skill-two"])
@@ -196,7 +196,7 @@ Skill two.
})
it("loads MCP config from frontmatter", async () => {
// #given
// given
const skillContent = `---
name: mcp-skill
description: Skill with MCP
@@ -209,11 +209,11 @@ MCP skill.
`
createTestSkill("mcp-skill", skillContent)
// #when
// when
const { discoverSkillsInDirAsync } = await import("./async-loader")
const skills = await discoverSkillsInDirAsync(SKILLS_DIR)
// #then
// then
const skill = skills.find((s: LoadedSkill) => s.name === "mcp-skill")
expect(skill?.mcpConfig).toBeDefined()
expect(skill?.mcpConfig?.sqlite).toBeDefined()
@@ -221,7 +221,7 @@ MCP skill.
})
it("loads MCP config from mcp.json file", async () => {
// #given
// given
const skillContent = `---
name: json-mcp-skill
description: Skill with mcp.json
@@ -238,18 +238,18 @@ Skill body.
}
createTestSkill("json-mcp-skill", skillContent, mcpJson)
// #when
// when
const { discoverSkillsInDirAsync } = await import("./async-loader")
const skills = await discoverSkillsInDirAsync(SKILLS_DIR)
// #then
// then
const skill = skills.find((s: LoadedSkill) => s.name === "json-mcp-skill")
expect(skill?.mcpConfig?.playwright).toBeDefined()
expect(skill?.mcpConfig?.playwright?.command).toBe("npx")
})
it("prioritizes mcp.json over frontmatter MCP", async () => {
// #given
// given
const skillContent = `---
name: priority-test
mcp:
@@ -267,11 +267,11 @@ Skill.
}
createTestSkill("priority-test", skillContent, mcpJson)
// #when
// when
const { discoverSkillsInDirAsync } = await import("./async-loader")
const skills = await discoverSkillsInDirAsync(SKILLS_DIR)
// #then - mcp.json should take priority
// then - mcp.json should take priority
const skill = skills.find((s: LoadedSkill) => s.name === "priority-test")
expect(skill?.mcpConfig?.["from-json"]).toBeDefined()
expect(skill?.mcpConfig?.["from-yaml"]).toBeUndefined()
@@ -280,7 +280,7 @@ Skill.
describe("mapWithConcurrency", () => {
it("processes items with concurrency limit", async () => {
// #given
// given
const { mapWithConcurrency } = await import("./async-loader")
const items = Array.from({ length: 50 }, (_, i) => i)
let maxConcurrent = 0
@@ -294,41 +294,41 @@ Skill.
return item * 2
}
// #when
// when
const results = await mapWithConcurrency(items, mapper, 16)
// #then
// then
expect(results).toEqual(items.map(i => i * 2))
expect(maxConcurrent).toBeLessThanOrEqual(16)
expect(maxConcurrent).toBeGreaterThan(1) // Should actually run concurrently
})
it("handles empty array", async () => {
// #given
// given
const { mapWithConcurrency } = await import("./async-loader")
// #when
// when
const results = await mapWithConcurrency([], async (x: number) => x * 2, 16)
// #then
// then
expect(results).toEqual([])
})
it("handles single item", async () => {
// #given
// given
const { mapWithConcurrency } = await import("./async-loader")
// #when
// when
const results = await mapWithConcurrency([42], async (x: number) => x * 2, 16)
// #then
// then
expect(results).toEqual([84])
})
})
describe("loadSkillFromPathAsync", () => {
it("loads skill from valid path", async () => {
// #given
// given
const skillContent = `---
name: path-skill
description: Loaded from path
@@ -338,47 +338,47 @@ Path skill.
const skillDir = createTestSkill("path-skill", skillContent)
const skillPath = join(skillDir, "SKILL.md")
// #when
// when
const { loadSkillFromPathAsync } = await import("./async-loader")
const skill = await loadSkillFromPathAsync(skillPath, skillDir, "path-skill", "opencode-project")
// #then
// then
expect(skill).not.toBeNull()
expect(skill?.name).toBe("path-skill")
expect(skill?.scope).toBe("opencode-project")
})
it("returns null for invalid path", async () => {
// #given
// given
const invalidPath = join(TEST_DIR, "nonexistent.md")
// #when
// when
const { loadSkillFromPathAsync } = await import("./async-loader")
const skill = await loadSkillFromPathAsync(invalidPath, TEST_DIR, "invalid", "opencode")
// #then
// then
expect(skill).toBeNull()
})
it("returns null for malformed skill file", async () => {
// #given
// given
const malformedContent = "This is not valid frontmatter content\nNo YAML here!"
mkdirSync(SKILLS_DIR, { recursive: true })
const malformedPath = join(SKILLS_DIR, "malformed.md")
writeFileSync(malformedPath, malformedContent)
// #when
// when
const { loadSkillFromPathAsync } = await import("./async-loader")
const skill = await loadSkillFromPathAsync(malformedPath, SKILLS_DIR, "malformed", "user")
// #then
// then
expect(skill).not.toBeNull() // parseFrontmatter handles missing frontmatter gracefully
})
})
describe("loadMcpJsonFromDirAsync", () => {
it("loads mcp.json with mcpServers format", async () => {
// #given
// given
mkdirSync(SKILLS_DIR, { recursive: true })
const mcpJson = {
mcpServers: {
@@ -390,43 +390,43 @@ Path skill.
}
writeFileSync(join(SKILLS_DIR, "mcp.json"), JSON.stringify(mcpJson))
// #when
// when
const { loadMcpJsonFromDirAsync } = await import("./async-loader")
const config = await loadMcpJsonFromDirAsync(SKILLS_DIR)
// #then
// then
expect(config).toBeDefined()
expect(config?.test).toBeDefined()
expect(config?.test?.command).toBe("test-cmd")
})
it("returns undefined for non-existent mcp.json", async () => {
// #given
// given
mkdirSync(SKILLS_DIR, { recursive: true })
// #when
// when
const { loadMcpJsonFromDirAsync } = await import("./async-loader")
const config = await loadMcpJsonFromDirAsync(SKILLS_DIR)
// #then
// then
expect(config).toBeUndefined()
})
it("returns undefined for invalid JSON", async () => {
// #given
// given
mkdirSync(SKILLS_DIR, { recursive: true })
writeFileSync(join(SKILLS_DIR, "mcp.json"), "{ invalid json }")
// #when
// when
const { loadMcpJsonFromDirAsync } = await import("./async-loader")
const config = await loadMcpJsonFromDirAsync(SKILLS_DIR)
// #then
// then
expect(config).toBeUndefined()
})
it("supports direct format without mcpServers", async () => {
// #given
// given
mkdirSync(SKILLS_DIR, { recursive: true })
const mcpJson = {
direct: {
@@ -436,11 +436,11 @@ Path skill.
}
writeFileSync(join(SKILLS_DIR, "mcp.json"), JSON.stringify(mcpJson))
// #when
// when
const { loadMcpJsonFromDirAsync } = await import("./async-loader")
const config = await loadMcpJsonFromDirAsync(SKILLS_DIR)
// #then
// then
expect(config?.direct).toBeDefined()
expect(config?.direct?.command).toBe("direct-cmd")
})
src/features/opencode-skill-loader/blocking.test.ts
+21 -21
View File
@@ -17,7 +17,7 @@ afterEach(() => {
describe("discoverAllSkillsBlocking", () => {
it("returns skills synchronously from valid directories", () => {
// #given valid skill directory
// given valid skill directory
const skillDir = join(TEST_DIR, "skills")
mkdirSync(skillDir, { recursive: true })
@@ -34,10 +34,10 @@ This is test skill content.`
const dirs = [skillDir]
const scopes: SkillScope[] = ["opencode-project"]
// #when discoverAllSkillsBlocking called
// when discoverAllSkillsBlocking called
const skills = discoverAllSkillsBlocking(dirs, scopes)
// #then returns skills synchronously
// then returns skills synchronously
expect(skills).toBeArray()
expect(skills.length).toBe(1)
expect(skills[0].name).toBe("test-skill")
@@ -45,38 +45,38 @@ This is test skill content.`
})
it("returns empty array for empty directories", () => {
// #given empty directory
// given empty directory
const emptyDir = join(TEST_DIR, "empty")
mkdirSync(emptyDir, { recursive: true })
const dirs = [emptyDir]
const scopes: SkillScope[] = ["opencode-project"]
// #when discoverAllSkillsBlocking called
// when discoverAllSkillsBlocking called
const skills = discoverAllSkillsBlocking(dirs, scopes)
// #then returns empty array
// then returns empty array
expect(skills).toBeArray()
expect(skills.length).toBe(0)
})
it("returns empty array for non-existent directories", () => {
// #given non-existent directory
// given non-existent directory
const nonExistentDir = join(TEST_DIR, "does-not-exist")
const dirs = [nonExistentDir]
const scopes: SkillScope[] = ["opencode-project"]
// #when discoverAllSkillsBlocking called
// when discoverAllSkillsBlocking called
const skills = discoverAllSkillsBlocking(dirs, scopes)
// #then returns empty array (no throw)
// then returns empty array (no throw)
expect(skills).toBeArray()
expect(skills.length).toBe(0)
})
it("handles multiple directories with mixed content", () => {
// #given multiple directories with valid and invalid skills
// given multiple directories with valid and invalid skills
const dir1 = join(TEST_DIR, "dir1")
const dir2 = join(TEST_DIR, "dir2")
mkdirSync(dir1, { recursive: true })
@@ -103,10 +103,10 @@ Skill 2 content.`
const dirs = [dir1, dir2]
const scopes: SkillScope[] = ["opencode-project"]
// #when discoverAllSkillsBlocking called
// when discoverAllSkillsBlocking called
const skills = discoverAllSkillsBlocking(dirs, scopes)
// #then returns all valid skills
// then returns all valid skills
expect(skills).toBeArray()
expect(skills.length).toBe(2)
@@ -115,7 +115,7 @@ Skill 2 content.`
})
it("skips invalid YAML files", () => {
// #given directory with invalid YAML
// given directory with invalid YAML
const skillDir = join(TEST_DIR, "skills")
mkdirSync(skillDir, { recursive: true })
@@ -142,17 +142,17 @@ Invalid content.`
const dirs = [skillDir]
const scopes: SkillScope[] = ["opencode-project"]
// #when discoverAllSkillsBlocking called
// when discoverAllSkillsBlocking called
const skills = discoverAllSkillsBlocking(dirs, scopes)
// #then skips invalid, returns valid
// then skips invalid, returns valid
expect(skills).toBeArray()
expect(skills.length).toBe(1)
expect(skills[0].name).toBe("valid-skill")
})
it("handles directory-based skills with SKILL.md", () => {
// #given directory-based skill structure
// given directory-based skill structure
const skillsDir = join(TEST_DIR, "skills")
const mySkillDir = join(skillsDir, "my-skill")
mkdirSync(mySkillDir, { recursive: true })
@@ -170,17 +170,17 @@ This is a directory-based skill.`
const dirs = [skillsDir]
const scopes: SkillScope[] = ["opencode-project"]
// #when discoverAllSkillsBlocking called
// when discoverAllSkillsBlocking called
const skills = discoverAllSkillsBlocking(dirs, scopes)
// #then returns skill from SKILL.md
// then returns skill from SKILL.md
expect(skills).toBeArray()
expect(skills.length).toBe(1)
expect(skills[0].name).toBe("my-skill")
})
it("processes large skill sets without timeout", () => {
// #given directory with many skills (20+)
// given directory with many skills (20+)
const skillDir = join(TEST_DIR, "many-skills")
mkdirSync(skillDir, { recursive: true })
@@ -200,10 +200,10 @@ Content for skill ${i}.`
const dirs = [skillDir]
const scopes: SkillScope[] = ["opencode-project"]
// #when discoverAllSkillsBlocking called
// when discoverAllSkillsBlocking called
const skills = discoverAllSkillsBlocking(dirs, scopes)
// #then completes without timeout
// then completes without timeout
expect(skills).toBeArray()
expect(skills.length).toBe(skillCount)
})
src/features/opencode-skill-loader/loader.test.ts
+33 -33
View File
@@ -28,7 +28,7 @@ describe("skill loader MCP parsing", () => {
describe("parseSkillMcpConfig", () => {
it("parses skill with nested MCP config", async () => {
// #given
// given
const skillContent = `---
name: test-skill
description: A test skill with MCP
@@ -47,7 +47,7 @@ This is the skill body.
`
createTestSkill("test-mcp-skill", skillContent)
// #when
// when
const { discoverSkills } = await import("./loader")
const originalCwd = process.cwd()
process.chdir(TEST_DIR)
@@ -56,7 +56,7 @@ This is the skill body.
const skills = await discoverSkills({ includeClaudeCodePaths: false })
const skill = skills.find(s => s.name === "test-skill")
// #then
// then
expect(skill).toBeDefined()
expect(skill?.mcpConfig).toBeDefined()
expect(skill?.mcpConfig?.sqlite).toBeDefined()
@@ -74,7 +74,7 @@ This is the skill body.
})
it("returns undefined mcpConfig for skill without MCP", async () => {
// #given
// given
const skillContent = `---
name: simple-skill
description: A simple skill without MCP
@@ -83,7 +83,7 @@ This is a simple skill.
`
createTestSkill("simple-skill", skillContent)
// #when
// when
const { discoverSkills } = await import("./loader")
const originalCwd = process.cwd()
process.chdir(TEST_DIR)
@@ -92,7 +92,7 @@ This is a simple skill.
const skills = await discoverSkills({ includeClaudeCodePaths: false })
const skill = skills.find(s => s.name === "simple-skill")
// #then
// then
expect(skill).toBeDefined()
expect(skill?.mcpConfig).toBeUndefined()
} finally {
@@ -101,7 +101,7 @@ This is a simple skill.
})
it("preserves env var placeholders without expansion", async () => {
// #given
// given
const skillContent = `---
name: env-skill
mcp:
@@ -116,7 +116,7 @@ Skill with env vars.
`
createTestSkill("env-skill", skillContent)
// #when
// when
const { discoverSkills } = await import("./loader")
const originalCwd = process.cwd()
process.chdir(TEST_DIR)
@@ -125,7 +125,7 @@ Skill with env vars.
const skills = await discoverSkills({ includeClaudeCodePaths: false })
const skill = skills.find(s => s.name === "env-skill")
// #then
// 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 {
@@ -134,7 +134,7 @@ Skill with env vars.
})
it("handles malformed YAML gracefully", async () => {
// #given - malformed YAML causes entire frontmatter to fail parsing
// given - malformed YAML causes entire frontmatter to fail parsing
const skillContent = `---
name: bad-yaml
mcp: [this is not valid yaml for mcp
@@ -143,14 +143,14 @@ Skill body.
`
createTestSkill("bad-yaml-skill", skillContent)
// #when
// 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
// then - when YAML fails, skill uses directory name as fallback
const skill = skills.find(s => s.name === "bad-yaml-skill")
expect(skill).toBeDefined()
@@ -163,7 +163,7 @@ Skill body.
describe("mcp.json file loading (AmpCode compat)", () => {
it("loads MCP config from mcp.json with mcpServers format", async () => {
// #given
// given
const skillContent = `---
name: ampcode-skill
description: Skill with mcp.json
@@ -180,7 +180,7 @@ Skill body.
}
createTestSkill("ampcode-skill", skillContent, mcpJson)
// #when
// when
const { discoverSkills } = await import("./loader")
const originalCwd = process.cwd()
process.chdir(TEST_DIR)
@@ -189,7 +189,7 @@ Skill body.
const skills = await discoverSkills({ includeClaudeCodePaths: false })
const skill = skills.find(s => s.name === "ampcode-skill")
// #then
// then
expect(skill).toBeDefined()
expect(skill?.mcpConfig).toBeDefined()
expect(skill?.mcpConfig?.playwright).toBeDefined()
@@ -201,7 +201,7 @@ Skill body.
})
it("mcp.json takes priority over YAML frontmatter", async () => {
// #given
// given
const skillContent = `---
name: priority-skill
mcp:
@@ -221,7 +221,7 @@ Skill body.
}
createTestSkill("priority-skill", skillContent, mcpJson)
// #when
// when
const { discoverSkills } = await import("./loader")
const originalCwd = process.cwd()
process.chdir(TEST_DIR)
@@ -230,7 +230,7 @@ Skill body.
const skills = await discoverSkills({ includeClaudeCodePaths: false })
const skill = skills.find(s => s.name === "priority-skill")
// #then - mcp.json should take priority
// then - mcp.json should take priority
expect(skill?.mcpConfig?.["from-json"]).toBeDefined()
expect(skill?.mcpConfig?.["from-yaml"]).toBeUndefined()
} finally {
@@ -239,7 +239,7 @@ Skill body.
})
it("supports direct format without mcpServers wrapper", async () => {
// #given
// given
const skillContent = `---
name: direct-format
---
@@ -253,7 +253,7 @@ Skill body.
}
createTestSkill("direct-format", skillContent, mcpJson)
// #when
// when
const { discoverSkills } = await import("./loader")
const originalCwd = process.cwd()
process.chdir(TEST_DIR)
@@ -262,7 +262,7 @@ Skill body.
const skills = await discoverSkills({ includeClaudeCodePaths: false })
const skill = skills.find(s => s.name === "direct-format")
// #then
// then
expect(skill?.mcpConfig?.sqlite).toBeDefined()
expect(skill?.mcpConfig?.sqlite?.command).toBe("uvx")
} finally {
@@ -273,7 +273,7 @@ Skill body.
describe("allowed-tools parsing", () => {
it("parses space-separated allowed-tools string", async () => {
// #given
// given
const skillContent = `---
name: space-separated-tools
description: Skill with space-separated allowed-tools
@@ -283,7 +283,7 @@ Skill body.
`
createTestSkill("space-separated-tools", skillContent)
// #when
// when
const { discoverSkills } = await import("./loader")
const originalCwd = process.cwd()
process.chdir(TEST_DIR)
@@ -292,7 +292,7 @@ Skill body.
const skills = await discoverSkills({ includeClaudeCodePaths: false })
const skill = skills.find(s => s.name === "space-separated-tools")
// #then
// then
expect(skill).toBeDefined()
expect(skill?.allowedTools).toEqual(["Read", "Write", "Edit", "Bash"])
} finally {
@@ -301,7 +301,7 @@ Skill body.
})
it("parses YAML inline array allowed-tools", async () => {
// #given
// given
const skillContent = `---
name: yaml-inline-array
description: Skill with YAML inline array allowed-tools
@@ -311,7 +311,7 @@ Skill body.
`
createTestSkill("yaml-inline-array", skillContent)
// #when
// when
const { discoverSkills } = await import("./loader")
const originalCwd = process.cwd()
process.chdir(TEST_DIR)
@@ -320,7 +320,7 @@ Skill body.
const skills = await discoverSkills({ includeClaudeCodePaths: false })
const skill = skills.find(s => s.name === "yaml-inline-array")
// #then
// then
expect(skill).toBeDefined()
expect(skill?.allowedTools).toEqual(["Read", "Write", "Edit", "Bash"])
} finally {
@@ -329,7 +329,7 @@ Skill body.
})
it("parses YAML multi-line array allowed-tools", async () => {
// #given
// given
const skillContent = `---
name: yaml-multiline-array
description: Skill with YAML multi-line array allowed-tools
@@ -343,7 +343,7 @@ Skill body.
`
createTestSkill("yaml-multiline-array", skillContent)
// #when
// when
const { discoverSkills } = await import("./loader")
const originalCwd = process.cwd()
process.chdir(TEST_DIR)
@@ -352,7 +352,7 @@ Skill body.
const skills = await discoverSkills({ includeClaudeCodePaths: false })
const skill = skills.find(s => s.name === "yaml-multiline-array")
// #then
// then
expect(skill).toBeDefined()
expect(skill?.allowedTools).toEqual(["Read", "Write", "Edit", "Bash"])
} finally {
@@ -361,7 +361,7 @@ Skill body.
})
it("returns undefined for skill without allowed-tools", async () => {
// #given
// given
const skillContent = `---
name: no-allowed-tools
description: Skill without allowed-tools field
@@ -370,7 +370,7 @@ Skill body.
`
createTestSkill("no-allowed-tools", skillContent)
// #when
// when
const { discoverSkills } = await import("./loader")
const originalCwd = process.cwd()
process.chdir(TEST_DIR)
@@ -379,7 +379,7 @@ Skill body.
const skills = await discoverSkills({ includeClaudeCodePaths: false })
const skill = skills.find(s => s.name === "no-allowed-tools")
// #then
// then
expect(skill).toBeDefined()
expect(skill?.allowedTools).toBeUndefined()
} finally {
src/features/opencode-skill-loader/skill-content.test.ts
+72 -72
View File
@@ -3,55 +3,55 @@ import { resolveSkillContent, resolveMultipleSkills, resolveSkillContentAsync, r
describe("resolveSkillContent", () => {
it("should return template for existing skill", () => {
// #given: builtin skills with 'frontend-ui-ux' skill
// #when: resolving content for 'frontend-ui-ux'
// given: builtin skills with 'frontend-ui-ux' skill
// when: resolving content for 'frontend-ui-ux'
const result = resolveSkillContent("frontend-ui-ux")
// #then: returns template string
// then: returns template string
expect(result).not.toBeNull()
expect(typeof result).toBe("string")
expect(result).toContain("Role: Designer-Turned-Developer")
})
it("should return template for 'playwright' skill", () => {
// #given: builtin skills with 'playwright' skill
// #when: resolving content for 'playwright'
// given: builtin skills with 'playwright' skill
// when: resolving content for 'playwright'
const result = resolveSkillContent("playwright")
// #then: returns template string
// then: returns template string
expect(result).not.toBeNull()
expect(typeof result).toBe("string")
expect(result).toContain("Playwright Browser Automation")
})
it("should return null for non-existent skill", () => {
// #given: builtin skills without 'nonexistent' skill
// #when: resolving content for 'nonexistent'
// given: builtin skills without 'nonexistent' skill
// when: resolving content for 'nonexistent'
const result = resolveSkillContent("nonexistent")
// #then: returns null
// then: returns null
expect(result).toBeNull()
})
it("should return null for empty string", () => {
// #given: builtin skills
// #when: resolving content for empty string
// given: builtin skills
// when: resolving content for empty string
const result = resolveSkillContent("")
// #then: returns null
// then: returns null
expect(result).toBeNull()
})
})
describe("resolveMultipleSkills", () => {
it("should resolve all existing skills", () => {
// #given: list of existing skill names
// given: list of existing skill names
const skillNames = ["frontend-ui-ux", "playwright"]
// #when: resolving multiple skills
// when: resolving multiple skills
const result = resolveMultipleSkills(skillNames)
// #then: all skills resolved, none not found
// then: all skills resolved, none not found
expect(result.resolved.size).toBe(2)
expect(result.notFound).toEqual([])
expect(result.resolved.get("frontend-ui-ux")).toContain("Designer-Turned-Developer")
@@ -59,13 +59,13 @@ describe("resolveMultipleSkills", () => {
})
it("should handle partial success - some skills not found", () => {
// #given: list with existing and non-existing skills
// given: list with existing and non-existing skills
const skillNames = ["frontend-ui-ux", "nonexistent", "playwright", "another-missing"]
// #when: resolving multiple skills
// when: resolving multiple skills
const result = resolveMultipleSkills(skillNames)
// #then: resolves existing skills, lists not found skills
// then: resolves existing skills, lists not found skills
expect(result.resolved.size).toBe(2)
expect(result.notFound).toEqual(["nonexistent", "another-missing"])
expect(result.resolved.get("frontend-ui-ux")).toContain("Designer-Turned-Developer")
@@ -73,37 +73,37 @@ describe("resolveMultipleSkills", () => {
})
it("should handle empty array", () => {
// #given: empty skill names list
// given: empty skill names list
const skillNames: string[] = []
// #when: resolving multiple skills
// when: resolving multiple skills
const result = resolveMultipleSkills(skillNames)
// #then: returns empty resolved and notFound
// then: returns empty resolved and notFound
expect(result.resolved.size).toBe(0)
expect(result.notFound).toEqual([])
})
it("should handle all skills not found", () => {
// #given: list of non-existing skills
// given: list of non-existing skills
const skillNames = ["skill-one", "skill-two", "skill-three"]
// #when: resolving multiple skills
// when: resolving multiple skills
const result = resolveMultipleSkills(skillNames)
// #then: no skills resolved, all in notFound
// then: no skills resolved, all in notFound
expect(result.resolved.size).toBe(0)
expect(result.notFound).toEqual(["skill-one", "skill-two", "skill-three"])
})
it("should preserve skill order in resolved map", () => {
// #given: list of skill names in specific order
// given: list of skill names in specific order
const skillNames = ["playwright", "frontend-ui-ux"]
// #when: resolving multiple skills
// when: resolving multiple skills
const result = resolveMultipleSkills(skillNames)
// #then: map contains skills with expected keys
// then: map contains skills with expected keys
expect(result.resolved.has("playwright")).toBe(true)
expect(result.resolved.has("frontend-ui-ux")).toBe(true)
expect(result.resolved.size).toBe(2)
@@ -112,35 +112,35 @@ describe("resolveMultipleSkills", () => {
describe("resolveSkillContentAsync", () => {
it("should return template for builtin skill", async () => {
// #given: builtin skill 'frontend-ui-ux'
// #when: resolving content async
// given: builtin skill 'frontend-ui-ux'
// when: resolving content async
const result = await resolveSkillContentAsync("frontend-ui-ux")
// #then: returns template string
// then: returns template string
expect(result).not.toBeNull()
expect(typeof result).toBe("string")
expect(result).toContain("Role: Designer-Turned-Developer")
})
it("should return null for non-existent skill", async () => {
// #given: non-existent skill name
// #when: resolving content async
// given: non-existent skill name
// when: resolving content async
const result = await resolveSkillContentAsync("definitely-not-a-skill-12345")
// #then: returns null
// then: returns null
expect(result).toBeNull()
})
})
describe("resolveMultipleSkillsAsync", () => {
it("should resolve builtin skills", async () => {
// #given: builtin skill names
// given: builtin skill names
const skillNames = ["playwright", "frontend-ui-ux"]
// #when: resolving multiple skills async
// when: resolving multiple skills async
const result = await resolveMultipleSkillsAsync(skillNames)
// #then: all builtin skills resolved
// then: all builtin skills resolved
expect(result.resolved.size).toBe(2)
expect(result.notFound).toEqual([])
expect(result.resolved.get("playwright")).toContain("Playwright Browser Automation")
@@ -148,20 +148,20 @@ describe("resolveMultipleSkillsAsync", () => {
})
it("should handle partial success with non-existent skills", async () => {
// #given: mix of existing and non-existing skills
// given: mix of existing and non-existing skills
const skillNames = ["playwright", "nonexistent-skill-12345"]
// #when: resolving multiple skills async
// when: resolving multiple skills async
const result = await resolveMultipleSkillsAsync(skillNames)
// #then: existing skills resolved, non-existing in notFound
// then: existing skills resolved, non-existing in notFound
expect(result.resolved.size).toBe(1)
expect(result.notFound).toEqual(["nonexistent-skill-12345"])
expect(result.resolved.get("playwright")).toContain("Playwright Browser Automation")
})
it("should NOT inject watermark when both options are disabled", async () => {
// #given: git-master skill with watermark disabled
// given: git-master skill with watermark disabled
const skillNames = ["git-master"]
const options = {
gitMasterConfig: {
@@ -170,10 +170,10 @@ describe("resolveMultipleSkillsAsync", () => {
},
}
// #when: resolving with git-master config
// when: resolving with git-master config
const result = await resolveMultipleSkillsAsync(skillNames, options)
// #then: no watermark section injected
// then: no watermark section injected
expect(result.resolved.size).toBe(1)
expect(result.notFound).toEqual([])
const gitMasterContent = result.resolved.get("git-master")
@@ -182,7 +182,7 @@ describe("resolveMultipleSkillsAsync", () => {
})
it("should inject watermark when enabled (default)", async () => {
// #given: git-master skill with default config (watermark enabled)
// given: git-master skill with default config (watermark enabled)
const skillNames = ["git-master"]
const options = {
gitMasterConfig: {
@@ -191,10 +191,10 @@ describe("resolveMultipleSkillsAsync", () => {
},
}
// #when: resolving with git-master config
// when: resolving with git-master config
const result = await resolveMultipleSkillsAsync(skillNames, options)
// #then: watermark section is injected
// then: watermark section is injected
expect(result.resolved.size).toBe(1)
const gitMasterContent = result.resolved.get("git-master")
expect(gitMasterContent).toContain("Ultraworked with [Sisyphus]")
@@ -202,7 +202,7 @@ describe("resolveMultipleSkillsAsync", () => {
})
it("should inject only footer when co-author is disabled", async () => {
// #given: git-master skill with only footer enabled
// given: git-master skill with only footer enabled
const skillNames = ["git-master"]
const options = {
gitMasterConfig: {
@@ -211,23 +211,23 @@ describe("resolveMultipleSkillsAsync", () => {
},
}
// #when: resolving with git-master config
// when: resolving with git-master config
const result = await resolveMultipleSkillsAsync(skillNames, options)
// #then: only footer is injected
// then: only footer is injected
const gitMasterContent = result.resolved.get("git-master")
expect(gitMasterContent).toContain("Ultraworked with [Sisyphus]")
expect(gitMasterContent).not.toContain("Co-authored-by: Sisyphus")
})
it("should inject watermark by default when no config provided", async () => {
// #given: git-master skill with NO config (default behavior)
// given: git-master skill with NO config (default behavior)
const skillNames = ["git-master"]
// #when: resolving without any gitMasterConfig
// when: resolving without any gitMasterConfig
const result = await resolveMultipleSkillsAsync(skillNames)
// #then: watermark is injected (default is ON)
// then: watermark is injected (default is ON)
expect(result.resolved.size).toBe(1)
const gitMasterContent = result.resolved.get("git-master")
expect(gitMasterContent).toContain("Ultraworked with [Sisyphus]")
@@ -235,7 +235,7 @@ describe("resolveMultipleSkillsAsync", () => {
})
it("should inject only co-author when footer is disabled", async () => {
// #given: git-master skill with only co-author enabled
// given: git-master skill with only co-author enabled
const skillNames = ["git-master"]
const options = {
gitMasterConfig: {
@@ -244,23 +244,23 @@ describe("resolveMultipleSkillsAsync", () => {
},
}
// #when: resolving with git-master config
// when: resolving with git-master config
const result = await resolveMultipleSkillsAsync(skillNames, options)
// #then: only co-author is injected
// then: only co-author is injected
const gitMasterContent = result.resolved.get("git-master")
expect(gitMasterContent).not.toContain("Ultraworked with [Sisyphus]")
expect(gitMasterContent).toContain("Co-authored-by: Sisyphus")
})
it("should handle empty array", async () => {
// #given: empty skill names
// given: empty skill names
const skillNames: string[] = []
// #when: resolving multiple skills async
// when: resolving multiple skills async
const result = await resolveMultipleSkillsAsync(skillNames)
// #then: empty results
// then: empty results
expect(result.resolved.size).toBe(0)
expect(result.notFound).toEqual([])
})
@@ -268,62 +268,62 @@ describe("resolveMultipleSkillsAsync", () => {
describe("resolveSkillContent with browserProvider", () => {
it("should resolve agent-browser skill when browserProvider is 'agent-browser'", () => {
// #given: browserProvider set to agent-browser
// given: browserProvider set to agent-browser
const options = { browserProvider: "agent-browser" as const }
// #when: resolving content for 'agent-browser'
// when: resolving content for 'agent-browser'
const result = resolveSkillContent("agent-browser", options)
// #then: returns agent-browser template
// then: returns agent-browser template
expect(result).not.toBeNull()
expect(result).toContain("agent-browser")
})
it("should return null for agent-browser when browserProvider is default", () => {
// #given: no browserProvider (defaults to playwright)
// given: no browserProvider (defaults to playwright)
// #when: resolving content for 'agent-browser'
// when: resolving content for 'agent-browser'
const result = resolveSkillContent("agent-browser")
// #then: returns null because agent-browser is not in default builtin skills
// then: returns null because agent-browser is not in default builtin skills
expect(result).toBeNull()
})
it("should return null for playwright when browserProvider is agent-browser", () => {
// #given: browserProvider set to agent-browser
// given: browserProvider set to agent-browser
const options = { browserProvider: "agent-browser" as const }
// #when: resolving content for 'playwright'
// when: resolving content for 'playwright'
const result = resolveSkillContent("playwright", options)
// #then: returns null because playwright is replaced by agent-browser
// then: returns null because playwright is replaced by agent-browser
expect(result).toBeNull()
})
})
describe("resolveMultipleSkills with browserProvider", () => {
it("should resolve agent-browser when browserProvider is set", () => {
// #given: agent-browser and git-master requested with browserProvider
// given: agent-browser and git-master requested with browserProvider
const skillNames = ["agent-browser", "git-master"]
const options = { browserProvider: "agent-browser" as const }
// #when: resolving multiple skills
// when: resolving multiple skills
const result = resolveMultipleSkills(skillNames, options)
// #then: both resolved
// then: both resolved
expect(result.resolved.has("agent-browser")).toBe(true)
expect(result.resolved.has("git-master")).toBe(true)
expect(result.notFound).toHaveLength(0)
})
it("should not resolve agent-browser without browserProvider option", () => {
// #given: agent-browser requested without browserProvider
// given: agent-browser requested without browserProvider
const skillNames = ["agent-browser"]
// #when: resolving multiple skills
// when: resolving multiple skills
const result = resolveMultipleSkills(skillNames)
// #then: agent-browser not found
// then: agent-browser not found
expect(result.resolved.has("agent-browser")).toBe(false)
expect(result.notFound).toContain("agent-browser")
})