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

fix: address review findings - git-master identity check, test fixtures, regression strength

Browse Source
This commit is contained in:
LYY
2026-05-18 17:15:13 +08:00
parent 77997d8e74
commit 47fced7473
3 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/features/opencode-skill-loader/skill-content.test.ts
+7 -7
View File
@@ -221,10 +221,10 @@ describe("resolveSkillContentAsync", () => {
it("prefers exact match over short name match async", async () => {
// given: an exact skill name "debugging" and a nested "superpowers/debugging"
createNestedSkill(testConfigDir, "superpowers", "debugging", "nested debugging")
// Also create the exact match by placing it at dir root
const dir = join(testConfigDir, "skills")
mkdirSync(dir, { recursive: true })
writeFileSync(join(dir, "debugging.md"), "---\nname: debugging\ndescription: exact debugging\n---\nexact match content")
// Exact match as a non-namespaced dir with SKILL.md
const exactDir = join(testConfigDir, "skills", "debugging")
mkdirSync(exactDir, { recursive: true })
writeFileSync(join(exactDir, "SKILL.md"), "---\nname: debugging\ndescription: exact debugging\n---\nexact match content")
// when: resolving by name "debugging"
const result = await resolveSkillContentAsync("debugging")
@@ -468,9 +468,9 @@ describe("resolveMultipleSkillsAsync", () => {
it("prefers exact match over short name in batch", async () => {
// given: an exact skill and a nested skill with same base name
const dir = join(testConfigDir, "skills")
mkdirSync(dir, { recursive: true })
writeFileSync(join(dir, "debugging.md"), "---\nname: debugging\ndescription: exact debugging\n---\nexact match content")
const exactDir = join(testConfigDir, "skills", "debugging")
mkdirSync(exactDir, { recursive: true })
writeFileSync(join(exactDir, "SKILL.md"), "---\nname: debugging\ndescription: exact debugging\n---\nexact match content")
createNestedSkill(testConfigDir, "superpowers", "debugging", "nested content")
// when: resolving "debugging" in batch
src/features/opencode-skill-loader/skill-template-resolver.ts
+9 -9
View File
@@ -14,7 +14,7 @@ export function resolveSkillContent(skillName: string, options?: SkillResolution
const skill = skills.find((builtinSkill) => builtinSkill.name === skillName)
if (!skill) return null
if (skillName === "git-master") {
if (skill.name === "git-master") {
return injectGitMasterConfig(skill.template, options?.gitMasterConfig)
}
@@ -30,18 +30,18 @@ export function resolveMultipleSkills(
disabledSkills: options?.disabledSkills,
teamModeEnabled: options?.teamModeEnabled,
})
const skillMap = new Map(skills.map((skill) => [skill.name, skill.template]))
const skillMap = new Map(skills.map((skill) => [skill.name, skill]))
const resolved = new Map<string, string>()
const notFound: string[] = []
for (const name of skillNames) {
const template = skillMap.get(name)
if (template) {
if (name === "git-master") {
resolved.set(name, injectGitMasterConfig(template, options?.gitMasterConfig))
const match = skillMap.get(name)
if (match) {
if (match.name === "git-master") {
resolved.set(name, injectGitMasterConfig(match.template, options?.gitMasterConfig))
} else {
resolved.set(name, template)
resolved.set(name, match.template)
}
} else {
notFound.push(name)
@@ -61,7 +61,7 @@ export async function resolveSkillContentAsync(
const template = await extractSkillTemplate(skill)
if (skillName === "git-master") {
if (skill.name === "git-master") {
return injectGitMasterConfig(template, options?.gitMasterConfig)
}
@@ -81,7 +81,7 @@ export async function resolveMultipleSkillsAsync(
const skill = matchSkillByName(allSkills, name)
if (skill) {
const template = await extractSkillTemplate(skill)
if (name === "git-master") {
if (skill.name === "git-master") {
resolved.set(name, injectGitMasterConfig(template, options?.gitMasterConfig))
} else {
resolved.set(name, template)