fix: parsing of flags with = signs

Author: mrsimpson

.claude/settings.json

@@ -48,6 +48,29 @@ import { startVisualizationTool } from './visualization-launcher.js';
 import { generateConfig, GeneratorRegistry } from './config-generator.js';
 import { generateSkill, SkillGeneratorRegistry } from './skill-generator.js';
 
+/**
+ * Parse a named flag from an args array, supporting both space-separated and
+ * equals-sign notation:
+ *   --flag value       → returns "value"
+ *   --flag=value       → returns "value"
+ *
+ * Returns `undefined` when the flag is not present.
+ */
+export function parseFlag(args: string[], flag: string): string | undefined {
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    // --flag=value notation
+    if (arg.startsWith(`${flag}=`)) {
+      return arg.slice(flag.length + 1);
+    }
+    // --flag value notation
+    if (arg === flag && i + 1 < args.length) {
+      return args[i + 1];
+    }
+  }
+  return undefined;
+}
+
 /**
  * Parse command line arguments and handle CLI commands
  */
@@ -70,9 +93,7 @@ async function parseCliArgs(): Promise<{ shouldExit: boolean }> {
       handleSetupList();
       return { shouldExit: true };
     } else if (subcommand) {
-      // Parse --mode flag
-      const modeIndex = args.findIndex(arg => arg === '--mode');
-      const mode = modeIndex !== -1 ? args[modeIndex + 1] : 'skill';
+      const mode = parseFlag(args, '--mode') ?? 'skill';
       if (mode !== 'skill' && mode !== 'config') {
         console.error('❌ Error: --mode must be "skill" or "config"');
         process.exit(1);
@@ -119,10 +140,7 @@ async function parseCliArgs(): Promise<{ shouldExit: boolean }> {
       handleCrowdList();
       return { shouldExit: true };
     } else if (subcommand === 'copy') {
-      // Check for --output-dir flag
-      const outputDirIndex = args.findIndex(arg => arg === '--output-dir');
-      const outputDir =
-        outputDirIndex !== -1 ? args[outputDirIndex + 1] : undefined;
+      const outputDir = parseFlag(args, '--output-dir');
       handleCrowdCopy(outputDir);
       return { shouldExit: true };
     } else {

.mcp.json

@@ -1,4 +1,5 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { parseFlag } from '../src/cli.js';
 
 // Use vi.hoisted for proper test isolation
 const mocks = vi.hoisted(() => ({
@@ -22,6 +23,9 @@ const mocks = vi.hoisted(() => ({
       'opencode',
       'copilot',
     ]),
+    exists: vi.fn((name: string) =>
+      ['kiro', 'claude', 'gemini', 'opencode', 'copilot'].includes(name)
+    ),
     getHelpText: vi.fn(
       () =>
         `  kiro                Generate .amazonq/cli-agents/vibe.json (Kiro/Amazon Q)
@@ -31,6 +35,20 @@ const mocks = vi.hoisted(() => ({
   copilot              Generate .vscode/mcp.json, .github/agents/Vibe.agent.md`
     ),
   },
+  SkillGeneratorRegistry: {
+    getGeneratorNames: vi.fn(() => [
+      'claude',
+      'gemini',
+      'opencode',
+      'copilot',
+      'kiro',
+    ]),
+    exists: vi.fn((name: string) =>
+      ['claude', 'gemini', 'opencode', 'copilot', 'kiro'].includes(name)
+    ),
+    getHelpText: vi.fn(() => ''),
+  },
+  generateSkill: vi.fn(),
 }));
 
 vi.mock('@codemcp/workflows-core', () => ({
@@ -64,6 +82,11 @@ vi.mock('../src/config-generator.js', () => ({
   GeneratorRegistry: mocks.GeneratorRegistry,
 }));
 
+vi.mock('../src/skill-generator.js', () => ({
+  generateSkill: mocks.generateSkill,
+  SkillGeneratorRegistry: mocks.SkillGeneratorRegistry,
+}));
+
 describe('CLI', () => {
   let originalArgv: string[];
   let originalExit: typeof process.exit;
@@ -142,8 +165,9 @@ describe('CLI', () => {
       kill: vi.fn(),
     } as unknown);
 
-    // Mock generateConfig to prevent actual file generation
+    // Mock generateConfig and generateSkill to prevent actual file generation
     mocks.generateConfig.mockResolvedValue(undefined);
+    mocks.generateSkill.mockResolvedValue(undefined);
 
     // Import from source
     const module = await import('../src/cli.js');
@@ -385,6 +409,48 @@ describe('CLI', () => {
     });
   });
 
+  describe('Setup Command --mode flag', () => {
+    it('should call generateConfig when --mode config is passed (space notation)', async () => {
+      process.argv = ['node', 'cli.js', 'setup', 'claude', '--mode', 'config'];
+
+      await runCli();
+
+      expect(mocks.generateConfig).toHaveBeenCalledWith('claude', '/mock/cwd');
+    });
+
+    it('should call generateConfig when --mode=config is passed (equals notation)', async () => {
+      process.argv = ['node', 'cli.js', 'setup', 'claude', '--mode=config'];
+
+      await runCli();
+
+      expect(mocks.generateConfig).toHaveBeenCalledWith('claude', '/mock/cwd');
+    });
+
+    it('should show error for invalid --mode value', async () => {
+      process.argv = ['node', 'cli.js', 'setup', 'claude', '--mode=invalid'];
+
+      processExitSpy.mockImplementation(() => undefined as never);
+
+      await runCli();
+
+      expect(consoleErrorSpy).toHaveBeenCalledWith(
+        expect.stringContaining('--mode must be "skill" or "config"')
+      );
+    });
+
+    it('should show error for invalid --mode= value (equals notation)', async () => {
+      process.argv = ['node', 'cli.js', 'setup', 'claude', '--mode='];
+
+      processExitSpy.mockImplementation(() => undefined as never);
+
+      await runCli();
+
+      expect(consoleErrorSpy).toHaveBeenCalledWith(
+        expect.stringContaining('--mode must be "skill" or "config"')
+      );
+    });
+  });
+
   describe('Unknown Arguments', () => {
     it('should show error for unknown command', () => {
       process.argv = ['node', 'cli.js', '--unknown-flag'];
@@ -401,6 +467,38 @@ describe('CLI', () => {
     });
   });
 
+  describe('parseFlag helper', () => {
+    it('returns value for --flag value notation', () => {
+      expect(parseFlag(['--mode', 'config'], '--mode')).toBe('config');
+    });
+
+    it('returns value for --flag=value notation', () => {
+      expect(parseFlag(['--mode=config'], '--mode')).toBe('config');
+    });
+
+    it('returns undefined when flag is absent', () => {
+      expect(parseFlag(['setup', 'claude'], '--mode')).toBeUndefined();
+    });
+
+    it('returns undefined when --flag appears last with no following value', () => {
+      expect(parseFlag(['--mode'], '--mode')).toBeUndefined();
+    });
+
+    it('handles empty string value from --flag= notation', () => {
+      expect(parseFlag(['--flag='], '--flag')).toBe('');
+    });
+
+    it('does not confuse prefix-matching flags (--mode vs --mode-extra)', () => {
+      expect(parseFlag(['--mode-extra=config'], '--mode')).toBeUndefined();
+    });
+
+    it('returns first match when flag appears multiple times', () => {
+      expect(parseFlag(['--mode=skill', '--mode=config'], '--mode')).toBe(
+        'skill'
+      );
+    });
+  });
+
   describe('Default Behavior', () => {
     it('should start visualization tool by default', () => {
       process.argv = ['node', 'cli.js'];