fix: Use "Kiro" instead of "Amazon Q" in all places

Author: mrsimpson

.amazonq/cli-agents/vibe.json

@@ -48,6 +48,6 @@
       ]
     }
   },
-  "resources": ["file://README.md", "file://.amazonq/rules/**/*.md"],
+  "resources": ["file://README.md", "file://.kiro/rules/**/*.md"],
   "hooks": {}
 }

.github/workflows/release.yml

@@ -18,6 +18,7 @@ on:
       - '.crowd/**'
       - '.windsurf/**'
       - '.amazonq/**'
+      - '.kiro/**'
       - 'examples/**'
       - 'packages/docs/**'
 

.kiro/agents/vibe.json

@@ -0,0 +1,47 @@
+{
+  "name": "vibe",
+  "description": "Responsible vibe development",
+  "prompt": "\nYou are an AI assistant that helps users develop software features using the workflows server.\n\nIMPORTANT: Call whats_next() after each user message to get phase-specific instructions and maintain the development workflow.\n\nEach tool call returns a JSON response with an \"instructions\" field. Follow these instructions immediately after you receive them.\n\nUse the development plan which you will retrieve via whats_next() to record important insights and decisions as per the structure of the plan.\n\nDo not use your own task management tools.",
+  "mcpServers": {
+    "workflows": {
+      "command": "npx",
+      "args": ["@codemcp/workflows-server@latest"]
+    }
+  },
+  "tools": [
+    "execute_bash",
+    "fs_read",
+    "fs_write",
+    "report_issue",
+    "knowledge",
+    "thinking",
+    "use_aws",
+    "@workflows"
+  ],
+  "allowedTools": [
+    "fs_read",
+    "fs_write",
+    "@workflows/whats_next",
+    "@workflows/conduct_review",
+    "@workflows/list_workflows",
+    "@workflows/get_tool_info"
+  ],
+  "toolsSettings": {
+    "execute_bash": {
+      "alwaysAllow": [
+        {
+          "preset": "readOnly"
+        }
+      ]
+    },
+    "use_aws": {
+      "alwaysAllow": [
+        {
+          "preset": "readOnly"
+        }
+      ]
+    }
+  },
+  "resources": ["file://README.md", "file://.kiro/rules/**/*.md"],
+  "hooks": {}
+}

packages/cli/.amazonq/cli-agents/vibe.json

@@ -42,6 +42,6 @@
       ]
     }
   },
-  "resources": ["file://README.md", "file://.amazonq/rules/**/*.md"],
+  "resources": ["file://README.md", "file://.kiro/rules/**/*.md"],
   "hooks": {}
 }

packages/cli/src/config-generator.ts

@@ -160,7 +160,7 @@ abstract class ConfigGenerator {
  * Generates a single comprehensive JSON file
  * Merges with existing configuration instead of overwriting
  */
-class AmazonQConfigGenerator extends ConfigGenerator {
+class KiroConfigGenerator extends ConfigGenerator {
   async generate(outputDir: string): Promise<void> {
     const systemPrompt = this.getSystemPrompt();
     const mcpServers = this.getDefaultMcpConfig();
@@ -204,15 +204,15 @@ class AmazonQConfigGenerator extends ConfigGenerator {
           ],
         },
       },
-      resources: ['file://README.md', 'file://.amazonq/rules/**/*.md'],
+      resources: ['file://README.md', 'file://.kiro/rules/**/*.md'],
       hooks: {},
     };
 
-    // Create .amazonq/cli-agents directory
-    const amazonqDir = join(outputDir, '.amazonq', 'cli-agents');
-    await mkdir(amazonqDir, { recursive: true });
+    // Create .kiro/agents directory
+    const kiroDir = join(outputDir, '.kiro', 'agents');
+    await mkdir(kiroDir, { recursive: true });
 
-    const configPath = join(amazonqDir, 'vibe.json');
+    const configPath = join(kiroDir, 'vibe.json');
     const finalConfig = await this.mergeWithExistingConfig(
       configPath,
       newConfig
@@ -506,15 +506,9 @@ class GeneratorRegistry {
 // Register all available generators
 GeneratorRegistry.register({
   name: 'kiro',
-  description: 'Generate .amazonq/cli-agents/vibe.json (Kiro/Amazon Q)',
-  aliases: ['amazonq-cli', 'amazonq'],
-  generatorClass: AmazonQConfigGenerator,
-});
-
-GeneratorRegistry.register({
-  name: 'kiro-cli',
-  description: 'Generate .amazonq/cli-agents/vibe.json (Kiro/Amazon Q CLI)',
-  generatorClass: AmazonQConfigGenerator,
+  description: 'Generate .kiro/agents/vibe.json (Kiro)',
+  aliases: ['kiro-cli'],
+  generatorClass: KiroConfigGenerator,
 });
 
 GeneratorRegistry.register({

packages/cli/src/skill-generator.ts

@@ -550,7 +550,7 @@ SkillGeneratorRegistry.register({
 SkillGeneratorRegistry.register({
   name: 'kiro-cli',
   description: 'Generate skill for Kiro/Amazon Q CLI (SKILL.md + mcp.json)',
-  aliases: ['amazonq', 'amazonq-cli'],
+  aliases: [],
   generatorClass: KiroCliSkillGenerator,
 });
 

packages/cli/test/cli.test.ts

@@ -28,7 +28,7 @@ const mocks = vi.hoisted(() => ({
     ),
     getHelpText: vi.fn(
       () =>
-        `  kiro                Generate .amazonq/cli-agents/vibe.json (Kiro/Amazon Q)
+        `  kiro                Generate .kiro/agents/vibe.json (Kiro)
   claude               Generate CLAUDE.md, .mcp.json, settings.json
   gemini               Generate settings.json, GEMINI.md
   opencode             Generate opencode.json

packages/cli/test/config-generator.test.ts

@@ -30,7 +30,7 @@ describe('Config Generator', () => {
     it('should generate Amazon Q configuration file', async () => {
       await generateConfig('kiro', tempDir);
 
-      const configPath = join(tempDir, '.amazonq', 'cli-agents', 'vibe.json');
+      const configPath = join(tempDir, '.kiro', 'agents', 'vibe.json');
       expect(existsSync(configPath)).toBe(true);
 
       const config = JSON.parse(readFileSync(configPath, 'utf-8'));
@@ -199,9 +199,9 @@ describe('Config Generator', () => {
       });
     });
 
-    describe('Amazon Q / Kiro', () => {
+    describe('Kiro', () => {
       it('should merge with existing vibe.json', async () => {
-        const configDir = join(tempDir, '.amazonq', 'cli-agents');
+        const configDir = join(tempDir, '.kiro', 'agents');
         mkdirSync(configDir, { recursive: true });
         const configPath = join(configDir, 'vibe.json');
 
@@ -213,7 +213,6 @@ describe('Config Generator', () => {
         };
         writeFileSync(configPath, JSON.stringify(existingConfig, null, 2));
 
-        // Generate config using 'kiro' (primary name, amazonq-cli is alias)
         await generateConfig('kiro', tempDir);
 
         // Read result

packages/cli/test/generator-registry.test.ts

@@ -11,14 +11,7 @@ import { GeneratorRegistry } from '../src/config-generator.js';
  */
 describe('GeneratorRegistry', () => {
   // Test with the actual built-in generators
-  const builtInGenerators = [
-    'kiro',
-    'kiro-cli',
-    'claude',
-    'gemini',
-    'opencode',
-    'copilot',
-  ];
+  const builtInGenerators = ['kiro', 'claude', 'gemini', 'opencode', 'copilot'];
 
   beforeAll(() => {
     // Verify the registry is properly initialized
@@ -37,10 +30,8 @@ describe('GeneratorRegistry', () => {
       expect(GeneratorRegistry.exists('copilot')).toBe(true);
       expect(GeneratorRegistry.exists('copilot-vscode')).toBe(true);
       expect(GeneratorRegistry.exists('vscode')).toBe(true);
-      // 'amazonq-cli' and 'amazonq' are aliases for 'kiro'
       expect(GeneratorRegistry.exists('kiro')).toBe(true);
-      expect(GeneratorRegistry.exists('amazonq-cli')).toBe(true);
-      expect(GeneratorRegistry.exists('amazonq')).toBe(true);
+      expect(GeneratorRegistry.exists('kiro-cli')).toBe(true);
     });
 
     it('should handle case-insensitive lookups', () => {
@@ -163,8 +154,6 @@ describe('GeneratorRegistry', () => {
       expect(names).not.toContain('vscode');
       expect(names).not.toContain('copilot-vscode');
       expect(names).toContain('copilot');
-      // 'amazonq-cli' is an alias for 'kiro'
-      expect(names).not.toContain('amazonq-cli');
       expect(names).toContain('kiro');
     });
   });
@@ -186,7 +175,7 @@ describe('GeneratorRegistry', () => {
       }
 
       // Check for key descriptions
-      expect(helpText).toContain('.amazonq/cli-agents/vibe.json');
+      expect(helpText).toContain('.kiro/agents/vibe.json');
       expect(helpText).toContain('CLAUDE.md');
       expect(helpText).toContain('GEMINI.md');
       expect(helpText).toContain('opencode.json');
@@ -219,9 +208,8 @@ describe('GeneratorRegistry', () => {
       expect(GeneratorRegistry.exists('vscode')).toBe(true);
       expect(GeneratorRegistry.exists('copilot-vscode')).toBe(true);
       expect(GeneratorRegistry.exists('copilot')).toBe(true);
-      // 'amazonq-cli' and 'amazonq' are aliases for 'kiro'
-      expect(GeneratorRegistry.exists('amazonq-cli')).toBe(true);
-      expect(GeneratorRegistry.exists('amazonq')).toBe(true);
+      // 'kiro-cli' is an alias for 'kiro'
+      expect(GeneratorRegistry.exists('kiro-cli')).toBe(true);
       expect(GeneratorRegistry.exists('kiro')).toBe(true);
     });
 

packages/cli/test/skill-generator.test.ts

@@ -40,8 +40,7 @@ describe('Skill Generator', () => {
       expect(SkillGeneratorRegistry.exists('gemini-cli')).toBe(true);
       expect(SkillGeneratorRegistry.exists('github-copilot')).toBe(true);
       // kiro-cli aliases
-      expect(SkillGeneratorRegistry.exists('amazonq')).toBe(true);
-      expect(SkillGeneratorRegistry.exists('amazonq-cli')).toBe(true);
+      expect(SkillGeneratorRegistry.exists('kiro-cli')).toBe(true);
     });
   });
 
@@ -313,32 +312,6 @@ describe('Skill Generator', () => {
         '@codemcp/workflows-server@latest'
       );
     });
-
-    it('should work with amazonq alias', async () => {
-      await generateSkill('amazonq', tempDir);
-
-      const skillPath = join(
-        tempDir,
-        '.kiro',
-        'skills',
-        'responsible-vibe',
-        'SKILL.md'
-      );
-      expect(existsSync(skillPath)).toBe(true);
-    });
-
-    it('should work with amazonq-cli alias', async () => {
-      await generateSkill('amazonq-cli', tempDir);
-
-      const skillPath = join(
-        tempDir,
-        '.kiro',
-        'skills',
-        'responsible-vibe',
-        'SKILL.md'
-      );
-      expect(existsSync(skillPath)).toBe(true);
-    });
   });
 
   describe('Error Handling', () => {