fix: harden Gemini and Qwen TOML parsing (v1.8.3)

Author: loppety

CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.8.3] - 2025-11-15
+
+### 🐛 Fixes
+- Hardened Gemini CLI and Qwen Code CLI TOML parsing so only the inner prompt body is injected, preventing duplicated headers and keeping custom commands discoverable.
+
+### 🧪 Testing
+- `npm run lint`
+- `npx tsc --noEmit`
+- `NODE_OPTIONS="--localstorage-file=.jest-localstorage" npm test`
+- `npm run build:prod`
+
 ## [1.8.2] - 2025-11-15
 
 ### ✨ Features

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "clavix",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "description": "AI prompt improvement and PRD generation CLI tool for developers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package.json

@@ -12,6 +12,7 @@ import { ClavixConfig, DEFAULT_CONFIG } from '../../types/config';
 import { CommandTemplate, AgentAdapter } from '../../types/agent';
 import { GeminiAdapter } from '../../core/adapters/gemini-adapter';
 import { QwenAdapter } from '../../core/adapters/qwen-adapter';
+import { parseTomlSlashCommand } from '../../utils/toml-templates';
 
 export default class Init extends Command {
   static description = 'Initialize Clavix in the current project';
@@ -382,7 +383,7 @@ See documentation for template format details.
       const name = file.slice(0, -extension.length);
 
       if (extension === '.toml') {
-        const parsed = this.parseTomlTemplate(content, name, adapter.name);
+        const parsed = parseTomlSlashCommand(content, name, adapter.name);
         templates.push({
           name,
           content: parsed.prompt,
@@ -463,19 +464,6 @@ See documentation for template format details.
     return '';
   }
 
-  private parseTomlTemplate(content: string, templateName: string, providerName: string): { description: string; prompt: string } {
-    const descriptionMatch = content.match(/^\s*description\s*=\s*(['"])(.*?)\1/m);
-    const promptMatch = content.match(/^\s*prompt\s*=\s*"""([\s\S]*?)"""/m);
-
-    if (!promptMatch) {
-      throw new Error(`Template ${templateName}.toml for ${providerName} is missing a prompt = """ ... """ block.`);
-    }
-
-    const description = descriptionMatch ? descriptionMatch[2] : '';
-    const prompt = promptMatch[1];
-
-    return { description, prompt };
-  }
 
   private extractClavixBlock(content: string): string {
     const match = content.match(/<!-- CLAVIX:START -->([\s\S]*?)<!-- CLAVIX:END -->/);

src/cli/commands/init.ts

@@ -161,7 +161,7 @@ export default class Update extends Command {
   }
 
   private async updateCommands(adapter: AgentAdapter, force: boolean): Promise<number> {
-    this.log(chalk.cyan('\n🔧 Updating slash commands...'));
+    this.log(chalk.cyan(`\n🔧 Updating slash commands for ${adapter.displayName}...`));
 
     const commandsDir = adapter.getCommandPath();
     const commandsPath = path.join(process.cwd(), commandsDir);

src/cli/commands/update.ts

@@ -0,0 +1,48 @@
+export interface ParsedTomlTemplate {
+  description: string;
+  prompt: string;
+}
+
+/**
+ * Parse TOML-based slash command templates (Gemini/Qwen) and extract metadata.
+ * Ensures the resulting prompt body does not include duplicated frontmatter.
+ */
+export function parseTomlSlashCommand(
+  content: string,
+  templateName: string,
+  providerName: string,
+): ParsedTomlTemplate {
+  let normalized = content.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
+  if (normalized.charCodeAt(0) === 0xfeff) {
+    normalized = normalized.slice(1);
+  }
+
+  const descriptionMatch = normalized.match(/^\s*description\s*=\s*(['"])(.*?)\1\s*$/m);
+  const promptHeaderMatch = normalized.match(/^\s*prompt\s*=\s*"""/m);
+
+  if (!promptHeaderMatch || promptHeaderMatch.index === undefined) {
+    throw new Error(`Template ${templateName}.toml for ${providerName} is missing a prompt = """ ... """ block.`);
+  }
+
+  const bodyStart = promptHeaderMatch.index + promptHeaderMatch[0].length;
+  const bodyRemainder = normalized.slice(bodyStart);
+  const closingIndex = bodyRemainder.indexOf('"""');
+
+  if (closingIndex === -1) {
+    throw new Error(`Template ${templateName}.toml for ${providerName} does not terminate its prompt = """ ... """ block.`);
+  }
+
+  let promptBody = bodyRemainder.slice(0, closingIndex);
+  const promptLines = promptBody.split('\n');
+
+  while (promptLines.length > 0 && /^\s*(description\s*=|prompt\s*=)/.test(promptLines[0])) {
+    promptLines.shift();
+  }
+
+  promptBody = promptLines.join('\n').replace(/^\n+/, '').replace(/[\s]+$/, '');
+
+  return {
+    description: descriptionMatch ? descriptionMatch[2] : '',
+    prompt: promptBody,
+  };
+}

src/utils/toml-templates.ts

@@ -7,6 +7,7 @@ import * as path from 'path';
 import { AgentManager } from '../../src/core/agent-manager';
 import { FileSystem } from '../../src/utils/file-system';
 import { DEFAULT_CONFIG } from '../../src/types/config';
+import { parseTomlSlashCommand } from '../../src/utils/toml-templates';
 
 describe('Init command', () => {
   const testDir = path.join(__dirname, '../fixtures/test-init');
@@ -377,6 +378,22 @@ describe('Init command', () => {
     });
   });
 
+  describe('TOML template parsing', () => {
+    it('extracts description and prompt body without duplicating headers', async () => {
+      const templatePath = path.join(__dirname, '../../src/templates/slash-commands/gemini/archive.toml');
+      const templateContent = await fs.readFile(templatePath, 'utf8');
+
+      const parsed = parseTomlSlashCommand(templateContent, 'archive', 'gemini');
+
+      expect(parsed.description).toBe('Archive completed PRD projects');
+      expect(parsed.prompt.startsWith('# Clavix Archive')).toBe(true);
+      expect(parsed.prompt).not.toMatch(/^description\s*=/m);
+      expect(parsed.prompt).not.toMatch(/^prompt\s*=/m);
+      const occurrences = (parsed.prompt.match(/prompt\s*=\s*"""/g) ?? []).length;
+      expect(occurrences).toBe(0);
+    });
+  });
+
   describe('edge cases', () => {
     it('should handle empty providers array validation', () => {
       const providers: string[] = [];