Merge pull request #2243 from jimthompson5802/issue-2235-preserve-user-selected-llm

feat(cli): remove default LLM for copilot AI Assistant

Author: rocketstack-matt

calm-ai/README.md

@@ -127,7 +127,7 @@ Configuration files in `ai-assistants/` define how to integrate CALM prompts wit
     "topLevelPromptFileName": "CALM.agent.md",
     "skillPrefix": "`",
     "skillSuffix": "`",
-    "frontmatter": "---\ndescription: An AI Assistant for FINOS CALM development.\ntools: ['codebase', 'editFiles', 'fetch', 'runInTerminal']\nmodel: Claude Sonnet 4.5\n---",
+    "frontmatter": "---\ndescription: An AI Assistant for FINOS CALM development.\ntools: ['codebase', 'editFiles', 'fetch', 'runInTerminal']\n---",
     "skillPrompts": [
         "calm-prompts/architecture-creation.md",
         "calm-prompts/calm-cli-instructions.md",
@@ -149,7 +149,7 @@ Configuration files in `ai-assistants/` define how to integrate CALM prompts wit
 
 **GitHub Copilot specifics:**
 - Uses backticks (`` ` ``) to reference skill files
-- Frontmatter specifies Claude Sonnet 4.5 model and available tools
+- Frontmatter specifies available tools
 - Prompts placed in `.github/agents/` directory
 - Skill prompts referenced as `` `calm-prompts/architecture-creation.md` ``
 

calm-ai/ai-assistants/copilot.json

@@ -4,7 +4,7 @@
     "topLevelPromptFileName": "CALM.agent.md",
     "skillPrefix": "`",
     "skillSuffix": "`",
-    "frontmatter": "---\ndescription: An AI Assistant for FINOS CALM development.\ntools: ['codebase', 'editFiles', 'fetch', 'runInTerminal']\nmodel: Claude Sonnet 4.5\n---",
+    "frontmatter": "---\ndescription: An AI Assistant for FINOS CALM development.\ntools: ['codebase', 'editFiles', 'fetch', 'runInTerminal']\n---",
     "skillPrompts": [
         "calm-prompts/architecture-creation.md",
         "calm-prompts/calm-cli-instructions.md",

cli/README.md

@@ -241,7 +241,7 @@ This isn't a full break, but it implies that you've forgotten to fill out a deta
 
 ## CALM init-ai
 
-The `init-ai` command sets up AI-powered development assistance for CALM architecture modeling by configuring a specialized VSCode agent with comprehensive tool prompts.  At present two AI Assistant providers are supported:  Github Copilot and AWS Kiro.
+The `init-ai` command sets up AI-powered development assistance for CALM architecture modeling by configuring a specialized VSCode agent with comprehensive tool prompts.  At present three AI Assistant providers are supported:  Github Copilot, Claude Code, and AWS Kiro.
 
 ```shell
 calm init-ai --help
@@ -250,7 +250,7 @@ Usage: calm init-ai [options]
 Augment a git repository with AI assistance for CALM
 
 Options:
-  -p, --provider <provider>  AI provider to initialize (choices: "copilot", "kiro")
+  -p, --provider <provider>  AI provider to initialize (choices: "copilot", "kiro", "claude")
   -d, --directory <path>     Target directory (defaults to current directory) (default: ".")
   -v, --verbose              Enable verbose logging. (default: false)
   -h, --help                 display help for command

cli/src/cli.e2e.spec.ts

@@ -104,21 +104,25 @@ describe('CLI Integration Tests', () => {
             await run(calm(), ['init-ai', '-p', provider, '--directory', testDir]);
 
             // Define expected paths based on provider
-            const expectedPaths: Record<string, { topLevelDir: string; mainPromptFile: string; skillPromptsDir: string }> = {
+            const expectedPaths: Record<string, { topLevelDir: string; mainPromptFile: string; skillPromptsDir: string; frontmatterContains: string[]; frontmatterNotContains?: string[] }> = {
                 copilot: {
                     topLevelDir: '.github/agents',
                     mainPromptFile: '.github/agents/CALM.agent.md',
                     skillPromptsDir: '.github/agents/calm-prompts',
+                    frontmatterContains: ['description:', 'tools:'],
+                    frontmatterNotContains: ['model:'],
                 },
                 kiro: {
                     topLevelDir: '.kiro',
                     mainPromptFile: '.kiro/steering/CALM.chatmode.md',
                     skillPromptsDir: '.kiro/calm-prompts',
+                    frontmatterContains: ['inclusion: manual'],
                 },
                 claude: {
                     topLevelDir: '.claude/skills/calm',
                     mainPromptFile: '.claude/skills/calm/SKILL.md',
                     skillPromptsDir: '.claude/skills/calm/calm-prompts',
+                    frontmatterContains: ['name: calm', 'description:', 'user-invocable: true'],
                 },
             };
 
@@ -134,6 +138,13 @@ describe('CLI Integration Tests', () => {
             expect(mainPromptContent).toContain('FINOS CALM');
             expect(mainPromptContent).toContain('Common Architecture Language Model');
 
+            // Verify frontmatter content
+            const frontmatterMatch = mainPromptContent.match(/^---\n([\s\S]*?)\n---/);
+            expect(frontmatterMatch).not.toBeNull();
+            const frontmatter = frontmatterMatch![1];
+            paths.frontmatterContains.forEach((key) => expect(frontmatter).toContain(key));
+            paths.frontmatterNotContains?.forEach((key) => expect(frontmatter).not.toContain(key));
+
             // Verify calm-prompts directory exists
             const skillPromptsPath = path.join(testDir, paths.skillPromptsDir);
             expect(fs.existsSync(skillPromptsPath)).toBe(true);

docs/docs/working-with-calm/calm-ai-tools.md

@@ -72,7 +72,7 @@ Usage: calm init-ai [options]
 Augment a git repository with AI assistance for CALM
 
 Options:
-  -p, --provider <provider>  AI provider to initialize (choices: "copilot", "kiro")
+  -p, --provider <provider>  AI provider to initialize (choices: "copilot", "kiro", "claude")
   -d, --directory <path>     Target directory (defaults to current directory) (default: ".")
   -v, --verbose              Enable verbose logging. (default: false)
   -h, --help                 display help for command