diff --git a/packages/agents/src/__tests__/adapters.test.ts b/packages/agents/src/__tests__/adapters.test.ts index 6a30f233..b9de26e7 100644 --- a/packages/agents/src/__tests__/adapters.test.ts +++ b/packages/agents/src/__tests__/adapters.test.ts @@ -154,11 +154,29 @@ describe('Agent Adapters', () => { expect(config).toContain('SKILLS_TABLE_START'); }); - it('should parse skill names from XML', () => { + it('should parse skill names from XML correctly within markers', () => { const adapter = getAdapter('hermes'); - const xml = `git-ops`; + const xml = ` + +git-ops +`; const names = adapter.parseConfig(xml); expect(names).toContain('git-ops'); }); + + it('should ignore tags outside of sync markers', () => { + const adapter = getAdapter('hermes'); + const xml = ` +save-the-world + +git-ops + +internal-id`; + const names = adapter.parseConfig(xml); + expect(names).toHaveLength(1); + expect(names).toContain('git-ops'); + expect(names).not.toContain('save-the-world'); + expect(names).not.toContain('internal-id'); + }); }); }); diff --git a/packages/agents/src/hermes.ts b/packages/agents/src/hermes.ts index 7d16a16d..951ff325 100644 --- a/packages/agents/src/hermes.ts +++ b/packages/agents/src/hermes.ts @@ -59,11 +59,21 @@ ${skillsXml} } parseConfig(content: string): string[] { + const startMarker = ''; + const endMarker = ''; + const startIndex = content.indexOf(startMarker); + const endIndex = content.indexOf(endMarker); + + if (startIndex === -1 || endIndex === -1) { + return []; + } + + const scopedContent = content.substring(startIndex + startMarker.length, endIndex); const skillNames: string[] = []; const skillRegex = /([^<]+)<\/name>/g; let match; - while ((match = skillRegex.exec(content)) !== null) { + while ((match = skillRegex.exec(scopedContent)) !== null) { skillNames.push(match[1].trim()); } @@ -77,16 +87,7 @@ ${skillsXml} async isDetected(): Promise { const projectHermes = join(process.cwd(), '.hermes'); const globalHermes = join(homedir(), '.hermes'); - const hermesMd = join(process.cwd(), 'AGENTS.md'); - - // Check for hermes binary in path if possible - try { - // In a real browser/tool environment we might use which/whereis - // but for detection logic we rely on filesystem markers primarily. - } catch { - // ignore - } - return existsSync(projectHermes) || existsSync(globalHermes) || existsSync(hermesMd); + return existsSync(projectHermes) || existsSync(globalHermes); } } diff --git a/src/agents/hermes.ts b/src/agents/hermes.ts index 09ee435d..81b6ebda 100644 --- a/src/agents/hermes.ts +++ b/src/agents/hermes.ts @@ -53,11 +53,21 @@ ${skillsXml} } parseConfig(content: string): string[] { + const startMarker = ''; + const endMarker = ''; + const startIndex = content.indexOf(startMarker); + const endIndex = content.indexOf(endMarker); + + if (startIndex === -1 || endIndex === -1) { + return []; + } + + const scopedContent = content.substring(startIndex + startMarker.length, endIndex); const skillNames: string[] = []; const skillRegex = /([^<]+)<\/name>/g; let match; - while ((match = skillRegex.exec(content)) !== null) { + while ((match = skillRegex.exec(scopedContent)) !== null) { skillNames.push(match[1].trim()); } @@ -71,8 +81,7 @@ ${skillsXml} async isDetected(): Promise { const projectHermes = join(process.cwd(), '.hermes'); const globalHermes = join(homedir(), '.hermes'); - const hermesMd = join(process.cwd(), 'AGENTS.md'); - return existsSync(projectHermes) || existsSync(globalHermes) || existsSync(hermesMd); + return existsSync(projectHermes) || existsSync(globalHermes); } } diff --git a/tests/agents.test.ts b/tests/agents.test.ts index a831360e..6e0d8c75 100644 --- a/tests/agents.test.ts +++ b/tests/agents.test.ts @@ -140,7 +140,7 @@ describe('agents', () => { expect(adapter.type).toBe('windsurf'); expect(adapter.name).toBe('Windsurf'); expect(adapter.skillsDir).toBe('.windsurf/skills'); - expect(adapter.configFile).toBe('.windsurfrules'); + expect(adapter.configFile).toBe('.windsurf/rules/skills.md'); }); it('should return adapter for hermes', () => {