fix: wrap command templates and stabilize integration tests (#78)

marcusrbrown · fro-bot[bot] · web-flow · commit 5a814092362a · 2026-02-14T00:03:00.000-07:00
* wrap command templates and stabilize integration tests

* test: remove CEP-rooted converter integration checks

* ci(fro-bot): change `cancel-in-progress` to false

* fix: reset regex lastIndex in false positive detector

The detectFalsePositives function was incorrectly flagging lowercase task
nouns as false positives due to regex state persistence. The .test() method
with 'g' flag maintains lastIndex between calls, causing the second test
(on original string) to start from the wrong position and return false.

Fix: Reset lastIndex=0 before each .test() call to ensure consistent
behavior across original and converted strings.

---------

Co-authored-by: fro-bot[bot] &lt;agent@fro.bot&gt;
diff --git a/.github/workflows/fro-bot.yaml b/.github/workflows/fro-bot.yaml
@@ -21,8 +21,8 @@ permissions:
   contents: read
 
 concurrency:
-  group: fro-bot-${{ github.event.issue.number || github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
+  group: fro-bot-${{ github.event.number || github.ref }}
+  cancel-in-progress: false
 
 env:
   DEFAULT_PROMPT: |
diff --git a/src/lib/config-handler.ts b/src/lib/config-handler.ts
@@ -103,8 +103,16 @@ function loadCommandAsConfig(commandInfo: {
 
     const baseDescription = description || `${name || cleanName} command`
 
+    const wrappedTemplate = `<command-instruction>
+${body.trim()}
+</command-instruction>
+
+<user-request>
+$ARGUMENTS
+</user-request>`
+
     const config: CommandConfig = {
-      template: body.trim(),
+      template: wrappedTemplate,
       description: `(Systematic) ${baseDescription}`,
     }
 
diff --git a/tests/integration/converter-validation.test.ts b/tests/integration/converter-validation.test.ts
@@ -3,309 +3,35 @@
  * Tests that the converter correctly handles real-world Claude Code content
  */
 import { describe, expect, test } from 'bun:test'
-import fs from 'node:fs'
-import path from 'node:path'
-import { type ContentType, convertContent } from '../../src/lib/converter.js'
-import { parseFrontmatter } from '../../src/lib/frontmatter.js'
+import { convertContent } from '../../src/lib/converter.js'
 
-const CEP_ROOT =
-  '/Users/mrbrown/src/github.com/kieranklaassen/compound-engineering-plugin/plugins/compound-engineering'
-
-interface ValidationResult {
-  name: string
-  type: ContentType
-  original: string
-  converted: string
-  issues: string[]
-  falsePositives: string[]
-  falseNegatives: string[]
-  frontmatterChanges: {
-    removed: string[]
-    preserved: string[]
-  }
-}
-
-function detectFalsePositives(_original: string, converted: string): string[] {
+function detectFalsePositives(original: string, converted: string): string[] {
   const falsePositives: string[] = []
-
-  // Since Task → task (same word, just lowercased), false-positive detection
-  // checks that uppercase "Task" used as a noun was NOT incorrectly lowercased.
-  // The converter's context-dependent regexes should only match tool invocation
-  // patterns, leaving noun usage with uppercase T untouched.
   const taskNounLowercased = [
     /complete the task\b/g,
     /\beach task\b/g,
     /\btask management\b/g,
     /\btask tracking\b/g,
     /\btask list\b(?! |$)/g,
   ]
-
   for (const pattern of taskNounLowercased) {
-    const matches = converted.match(pattern)
-    if (matches) {
-      falsePositives.push(
-        `False positive: "${matches[0]}" - "Task" as noun incorrectly lowercased`,
-      )
-    }
-  }
-
-  return falsePositives
-}
-
-function detectFalseNegatives(_original: string, converted: string): string[] {
-  const falseNegatives: string[] = []
-
-  const codeBlockPattern = /```[\s\S]*?```|`[^`\n]+`/g
-  const convertedWithoutCodeBlocks = converted.replace(codeBlockPattern, '')
-
-  const shouldBeConverted = [
-    { pattern: /\bTodoWrite\b/g, expected: 'todowrite' },
-    { pattern: /\bAskUserQuestion\b/g, expected: 'question' },
-    { pattern: /\bWebSearch\b/g, expected: 'google_search' },
-    { pattern: /\bWebFetch\b/g, expected: 'webfetch' },
-    { pattern: /\.claude\/skills\//g, expected: '.opencode/skills/' },
-    { pattern: /\.claude\/commands\//g, expected: '.opencode/commands/' },
-    { pattern: /CLAUDE\.md/g, expected: 'AGENTS.md' },
-    { pattern: /compound-engineering:/g, expected: 'systematic:' },
-  ]
-
-  for (const { pattern, expected } of shouldBeConverted) {
-    const matches = convertedWithoutCodeBlocks.match(pattern)
-    if (matches) {
-      falseNegatives.push(
-        `False negative: "${matches[0]}" should be converted to "${expected}"`,
-      )
-    }
-  }
-
-  return falseNegatives
-}
-
-// Helper to analyze frontmatter changes
-function analyzeFrontmatter(
-  original: string,
-  converted: string,
-  _type: ContentType,
-): { removed: string[]; preserved: string[] } {
-  const origFm = parseFrontmatter(original)
-  const convFm = parseFrontmatter(converted)
-
-  const removed: string[] = []
-  const preserved: string[] = []
-
-  const origKeys = Object.keys(origFm.data)
-  const convKeys = Object.keys(convFm.data)
-
-  for (const key of origKeys) {
-    if (convKeys.includes(key)) {
-      preserved.push(key)
-    } else {
-      removed.push(key)
-    }
-  }
-
-  return { removed, preserved }
-}
-
-// Fields that should be mapped (transformed) during conversion, not just preserved
-const MAPPED_AGENT_FIELDS = [
-  'permissionMode',
-  'maxTurns',
-  'maxSteps',
-  'disallowedTools',
-]
-
-function validateFile(filePath: string, type: ContentType): ValidationResult {
-  const original = fs.readFileSync(filePath, 'utf8')
-  const converted = convertContent(original, type)
-
-  const issues: string[] = []
-  const falsePositives = detectFalsePositives(original, converted)
-  const falseNegatives = detectFalseNegatives(original, converted)
-  const frontmatterChanges = analyzeFrontmatter(original, converted, type)
-
-  // Validate required fields preserved
-  if (frontmatterChanges.removed.includes('name')) {
-    issues.push('Required field "name" was incorrectly removed')
-  }
-  if (frontmatterChanges.removed.includes('description')) {
-    issues.push('Required field "description" was incorrectly removed')
-  }
-
-  // Validate mapped fields are consumed (not preserved as-is) for agents
-  if (type === 'agent') {
-    for (const field of MAPPED_AGENT_FIELDS) {
-      if (frontmatterChanges.preserved.includes(field)) {
-        issues.push(
-          `Mapped field "${field}" should be consumed during agent conversion`,
+    pattern.lastIndex = 0
+    const inConverted = pattern.test(converted)
+    pattern.lastIndex = 0
+    const inOriginal = pattern.test(original)
+    if (inConverted && !inOriginal) {
+      const matches = converted.match(pattern)
+      if (matches) {
+        falsePositives.push(
+          `False positive: "${matches[0]}" - "Task" as noun incorrectly lowercased`,
         )
       }
     }
   }
-
-  return {
-    name: path.basename(filePath),
-    type,
-    original,
-    converted,
-    issues,
-    falsePositives,
-    falseNegatives,
-    frontmatterChanges,
-  }
-}
-
-function logValidationIssues(fileName: string, result: ValidationResult): void {
-  if (result.issues.length > 0) {
-    console.log(`Issues in ${fileName}:`, result.issues)
-  }
-  if (result.falsePositives.length > 0) {
-    console.log(`False positives in ${fileName}:`, result.falsePositives)
-  }
-  if (result.falseNegatives.length > 0) {
-    console.log(`False negatives in ${fileName}:`, result.falseNegatives)
-  }
-}
-
-function assertValidConversion(result: ValidationResult): void {
-  expect(result.issues).toEqual([])
-  expect(result.falseNegatives).toEqual([])
+  return falsePositives
 }
 
-describe('Converter Validation Against Real CEP Content', () => {
-  const skipIfNoCEP = () => {
-    if (!fs.existsSync(CEP_ROOT)) {
-      console.log('Skipping CEP validation tests - CEP repository not found')
-      return true
-    }
-    return false
-  }
-
-  const skipIfNoFile = (fullPath: string, fileName: string) => {
-    if (!fs.existsSync(fullPath)) {
-      console.log(`Skipping ${fileName} - file not found`)
-      return true
-    }
-    return false
-  }
-
-  describe('Skills Validation', () => {
-    const skillFiles = [
-      'agent-browser/SKILL.md',
-      'agent-native-architecture/SKILL.md',
-      'compound-docs/SKILL.md',
-      'file-todos/SKILL.md',
-      'brainstorming/SKILL.md',
-      'create-agent-skills/SKILL.md',
-      'git-worktree/SKILL.md',
-      'frontend-design/SKILL.md',
-    ]
-
-    for (const skillFile of skillFiles) {
-      const fullPath = path.join(CEP_ROOT, 'skills', skillFile)
-
-      test(`converts ${skillFile} correctly`, () => {
-        if (skipIfNoCEP()) return
-        if (skipIfNoFile(fullPath, skillFile)) return
-
-        const result = validateFile(fullPath, 'skill')
-        logValidationIssues(skillFile, result)
-        assertValidConversion(result)
-      })
-    }
-
-    test('preserves CC frontmatter fields in skills', () => {
-      if (skipIfNoCEP()) return
-
-      const fullPath = path.join(CEP_ROOT, 'skills', 'compound-docs/SKILL.md')
-      if (!fs.existsSync(fullPath)) return
-
-      const result = validateFile(fullPath, 'skill')
-
-      // allowed-tools should now be preserved (non-destructive)
-      expect(result.frontmatterChanges.preserved).toContain('allowed-tools')
-      expect(result.frontmatterChanges.preserved).toContain('name')
-      expect(result.frontmatterChanges.preserved).toContain('description')
-    })
-  })
-
-  describe('Commands Validation', () => {
-    const commandFiles = [
-      'workflows/plan.md',
-      'workflows/brainstorm.md',
-      'lfg.md',
-      'deepen-plan.md',
-      'heal-skill.md',
-    ]
-
-    for (const cmdFile of commandFiles) {
-      const fullPath = path.join(CEP_ROOT, 'commands', cmdFile)
-
-      test(`converts ${cmdFile} correctly`, () => {
-        if (skipIfNoCEP()) return
-        if (skipIfNoFile(fullPath, cmdFile)) return
-
-        const result = validateFile(fullPath, 'command')
-        logValidationIssues(cmdFile, result)
-        assertValidConversion(result)
-      })
-    }
-
-    test('preserves argument-hint in command frontmatter', () => {
-      if (skipIfNoCEP()) return
-
-      const fullPath = path.join(CEP_ROOT, 'commands', 'workflows/plan.md')
-      if (!fs.existsSync(fullPath)) return
-
-      const result = validateFile(fullPath, 'command')
-
-      // argument-hint should now be preserved (non-destructive)
-      expect(result.frontmatterChanges.preserved).toContain('argument-hint')
-    })
-  })
-
-  describe('Agents Validation', () => {
-    const agentFiles = [
-      'review/security-sentinel.md',
-      'review/architecture-strategist.md',
-      'review/pattern-recognition-specialist.md',
-      'research/framework-docs-researcher.md',
-    ]
-
-    for (const agentFile of agentFiles) {
-      const fullPath = path.join(CEP_ROOT, 'agents', agentFile)
-
-      test(`converts ${agentFile} correctly`, () => {
-        if (skipIfNoCEP()) return
-        if (skipIfNoFile(fullPath, agentFile)) return
-
-        const result = validateFile(fullPath, 'agent')
-        logValidationIssues(agentFile, result)
-        assertValidConversion(result)
-      })
-    }
-
-    test('adds required OpenCode agent fields', () => {
-      if (skipIfNoCEP()) return
-
-      const fullPath = path.join(
-        CEP_ROOT,
-        'agents',
-        'review/security-sentinel.md',
-      )
-      if (!fs.existsSync(fullPath)) return
-
-      const original = fs.readFileSync(fullPath, 'utf8')
-      const converted = convertContent(original, 'agent')
-      const fm = parseFrontmatter(converted)
-
-      // OpenCode requires these fields for agents
-      expect(fm.data).toHaveProperty('mode')
-      expect(fm.data).toHaveProperty('temperature')
-      expect(fm.data).toHaveProperty('description')
-    })
-  })
-
+describe('Converter Validation', () => {
   describe('Tool Name Transformations', () => {
     test('converts Task tool references correctly', () => {
       const testCases = [
@@ -364,6 +90,13 @@ describe('Converter Validation Against Real CEP Content', () => {
   })
 
   describe('Edge Cases', () => {
+    test('does not flag lowercase task nouns as false positives', () => {
+      const original = 'Use task tracking for ongoing work.'
+      const converted = convertContent(original, 'skill')
+
+      expect(detectFalsePositives(original, converted)).toEqual([])
+    })
+
     test('handles empty content', () => {
       const converted = convertContent('', 'skill')
       expect(converted).toBe('')
diff --git a/tests/integration/opencode.test.ts b/tests/integration/opencode.test.ts
@@ -13,6 +13,7 @@ const OPENCODE_AVAILABLE = (() => {
 const TIMEOUT_MS = 120_000
 const MAX_RETRIES = 2
 const RETRY_DELAY_MS = 3_000
+const OPENCODE_TEST_MODEL = 'opencode/big-pickle'
 
 const REPO_ROOT = path.resolve(import.meta.dirname, '../..')
 
@@ -61,14 +62,17 @@ describe.skipIf(!OPENCODE_AVAILABLE)('opencode integration', () => {
     }
 
     for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
-      const result = Bun.spawnSync(['opencode', 'run', prompt], {
-        cwd: testEnv.projectDir,
-        env: {
-          ...process.env,
-          OPENCODE_CONFIG_CONTENT: buildOpencodeConfig(),
+      const result = Bun.spawnSync(
+        ['opencode', 'run', '--model', OPENCODE_TEST_MODEL, prompt],
+        {
+          cwd: testEnv.projectDir,
+          env: {
+            ...process.env,
+            OPENCODE_CONFIG_CONTENT: buildOpencodeConfig(),
+          },
+          timeout: TIMEOUT_MS,
         },
-        timeout: TIMEOUT_MS,
-      })
+      )
 
       lastResult = {
         stdout: result.stdout.toString(),
