prjct-cli 0.35.4 → 0.36.1

package/core/infrastructure/setup.ts

@@ -2,10 +2,15 @@
  * Setup Module - Core installation logic
  *
  * Executes ALL setup needed for prjct-cli:
- * 1. Install Claude Code CLI if missing
- * 2. Sync commands to ~/.claude/commands/p/
- * 3. Install global config ~/.claude/CLAUDE.md
- * 4. Save version in editors-config
+ * 1. Detect AI provider (Claude Code or Gemini CLI)
+ * 2. Install CLI if missing
+ * 3. Sync commands to provider's commands directory
+ * 4. Install global config (CLAUDE.md or GEMINI.md)
+ * 5. Save version in editors-config
+ *
+ * Supports multiple AI CLI agents:
+ * - Claude Code: ~/.claude/commands/p/, CLAUDE.md
+ * - Gemini CLI: ~/.gemini/commands/p/, GEMINI.md
  *
  * This module is called from:
  * - core/index.js (on first CLI use)
@@ -20,6 +25,13 @@ import installer from './command-installer'
 import editorsConfig from './editors-config'
 import { VERSION, getPackageRoot } from '../utils/version'
 import { isNotFoundError } from '../types/fs'
+import {
+  selectProvider,
+  detectProvider,
+  detectAllProviders,
+  Providers,
+} from './ai-provider'
+import type { AIProviderName, AIProviderConfig } from '../types/provider'
 
 // Colors
 const GREEN = '\x1b[32m'
@@ -27,102 +39,161 @@ const YELLOW = '\x1b[33m'
 const DIM = '\x1b[2m'
 const NC = '\x1b[0m'
 
+interface ProviderSetupResult {
+  provider: AIProviderName
+  cliInstalled: boolean
+  commandsAdded: number
+  commandsUpdated: number
+  configAction: string | null
+}
+
 interface SetupResults {
-  claudeInstalled: boolean
+  provider: AIProviderName  // Primary provider (for backward compat)
+  providers: ProviderSetupResult[]  // All installed providers
+  cliInstalled: boolean
   commandsAdded: number
   commandsUpdated: number
   configAction: string | null
 }
 
 /**
- * Check if Claude Code CLI is installed
+ * Check if an AI CLI is installed
  */
-async function hasClaudeCodeCLI(): Promise<boolean> {
-  try {
-    execSync('which claude', { stdio: 'ignore' })
-    return true
-  } catch (_error) {
-    return false
-  }
+async function hasAICLI(provider: AIProviderConfig): Promise<boolean> {
+  const detection = detectProvider(provider.name)
+  return detection.installed
 }
 
 /**
- * Install Claude Code CLI
+ * Install AI CLI for the specified provider
  */
-async function installClaudeCode(): Promise<boolean> {
+async function installAICLI(provider: AIProviderConfig): Promise<boolean> {
+  const packageName = provider.name === 'claude'
+    ? '@anthropic-ai/claude-code'
+    : '@google/gemini-cli'
+
   try {
-    console.log(`${YELLOW}📦 Claude Code not found. Installing...${NC}`)
+    console.log(`${YELLOW}📦 ${provider.displayName} not found. Installing...${NC}`)
     console.log('')
-    execSync('npm install -g @anthropic-ai/claude-code', { stdio: 'inherit' })
+    execSync(`npm install -g ${packageName}`, { stdio: 'inherit' })
     console.log('')
-    console.log(`${GREEN}✓${NC} Claude Code installed successfully`)
+    console.log(`${GREEN}✓${NC} ${provider.displayName} installed successfully`)
     console.log('')
     return true
   } catch (error) {
-    console.log(`${YELLOW}⚠️  Failed to install Claude Code: ${(error as Error).message}${NC}`)
-    console.log(`${DIM}Please install manually: npm install -g @anthropic-ai/claude-code${NC}`)
+    console.log(`${YELLOW}⚠️  Failed to install ${provider.displayName}: ${(error as Error).message}${NC}`)
+    console.log(`${DIM}Please install manually: npm install -g ${packageName}${NC}`)
     console.log('')
     return false
   }
 }
 
 /**
- * Main setup function
+ * Main setup function - installs for ALL detected providers
  */
 export async function run(): Promise<SetupResults> {
+  // Step 0: Detect all available providers
+  const detection = detectAllProviders()
+  const selection = selectProvider()
+  const primaryProvider = Providers[selection.provider]
+
   const results: SetupResults = {
-    claudeInstalled: false,
+    provider: selection.provider,
+    providers: [],
+    cliInstalled: false,
     commandsAdded: 0,
     commandsUpdated: 0,
     configAction: null,
   }
 
-  // Step 1: Ensure Claude Code CLI is installed
-  const hasClaude = await hasClaudeCodeCLI()
+  // Step 1: Install for each detected provider
+  const providerNames: AIProviderName[] = ['claude', 'gemini']
 
-  if (!hasClaude) {
-    const installed = await installClaudeCode()
-    if (installed) {
-      results.claudeInstalled = true
-    } else {
-      throw new Error('Claude Code installation failed')
+  for (const providerName of providerNames) {
+    const providerConfig = Providers[providerName]
+    const providerDetection = detection[providerName]
+
+    const providerResult: ProviderSetupResult = {
+      provider: providerName,
+      cliInstalled: false,
+      commandsAdded: 0,
+      commandsUpdated: 0,
+      configAction: null,
+    }
+
+    // Check if CLI is installed
+    if (!providerDetection.installed) {
+      // Only prompt to install the primary (selected) provider
+      if (providerName === selection.provider) {
+        const installed = await installAICLI(providerConfig)
+        if (installed) {
+          providerResult.cliInstalled = true
+          results.cliInstalled = true
+        } else {
+          throw new Error(`${providerConfig.displayName} installation failed`)
+        }
+      } else {
+        // Skip non-primary providers that aren't installed
+        continue
+      }
     }
-  }
 
-  // Step 2: Detect Claude directory (for commands)
-  const claudeDetected = await installer.detectClaude()
+    // Step 2: Install commands and config for this provider
+    if (providerName === 'claude') {
+      const claudeDetected = await installer.detectClaude()
+
+      if (claudeDetected) {
+        // Sync commands
+        const syncResult = await installer.syncCommands()
+        if (syncResult.success) {
+          providerResult.commandsAdded = syncResult.added
+          providerResult.commandsUpdated = syncResult.updated
+          results.commandsAdded += syncResult.added
+          results.commandsUpdated += syncResult.updated
+        }
 
-  if (claudeDetected) {
-    // Step 3: Sync commands
-    const syncResult = await installer.syncCommands()
+        // Install global configuration
+        const configResult = await installer.installGlobalConfig()
+        if (configResult.success) {
+          providerResult.configAction = configResult.action
+          if (!results.configAction) {
+            results.configAction = configResult.action
+          }
+        }
 
-    if (syncResult.success) {
-      results.commandsAdded = syncResult.added
-      results.commandsUpdated = syncResult.updated
-    }
+        // Install documentation files
+        await installer.installDocs()
 
-    // Step 4: Install global configuration
-    const configResult = await installer.installGlobalConfig()
+        // Install status line (Claude only)
+        await installStatusLine()
+      }
+    } else if (providerName === 'gemini') {
+      // Gemini provider - install router and global config
+      const geminiInstalled = await installGeminiRouter()
+      if (geminiInstalled) {
+        providerResult.commandsAdded = 1
+        results.commandsAdded += 1
+      }
 
-    if (configResult.success) {
-      results.configAction = configResult.action
+      const geminiConfigResult = await installGeminiGlobalConfig()
+      if (geminiConfigResult.success) {
+        providerResult.configAction = geminiConfigResult.action
+      }
     }
 
-    // Step 4b: Install documentation files
-    await installer.installDocs()
-
-    // Step 4c: Install status line with version check
-    await installStatusLine()
+    results.providers.push(providerResult)
   }
 
-  // Step 5: Save version in editors-config
-  await editorsConfig.saveConfig(VERSION, installer.getInstallPath())
+  // Step 3: Save version in editors-config
+  await editorsConfig.saveConfig(VERSION, installer.getInstallPath(), selection.provider)
 
-  // Step 6: Migrate existing projects to add cliVersion
+  // Step 4: Migrate existing projects to add cliVersion
   await migrateProjectsCliVersion()
 
-  // Show results
-  showResults(results)
+  // Show results for all providers
+  for (const providerResult of results.providers) {
+    showResults(providerResult, Providers[providerResult.provider])
+  }
 
   return results
 }
@@ -130,6 +201,100 @@ export async function run(): Promise<SetupResults> {
 // Default export for CommonJS require
 export default { run }
 
+/**
+ * Install the p.toml router for Gemini CLI
+ */
+async function installGeminiRouter(): Promise<boolean> {
+  try {
+    const geminiCommandsDir = path.join(os.homedir(), '.gemini', 'commands')
+    const routerSource = path.join(getPackageRoot(), 'templates', 'commands', 'p.toml')
+    const routerDest = path.join(geminiCommandsDir, 'p.toml')
+
+    // Ensure commands directory exists
+    fs.mkdirSync(geminiCommandsDir, { recursive: true })
+
+    // Copy router
+    if (fs.existsSync(routerSource)) {
+      fs.copyFileSync(routerSource, routerDest)
+      return true
+    }
+    return false
+  } catch (error) {
+    console.error(`Gemini router warning: ${(error as Error).message}`)
+    return false
+  }
+}
+
+/**
+ * Install or update global GEMINI.md configuration
+ */
+async function installGeminiGlobalConfig(): Promise<{ success: boolean; action: string | null }> {
+  try {
+    const geminiDir = path.join(os.homedir(), '.gemini')
+    const globalConfigPath = path.join(geminiDir, 'GEMINI.md')
+    const templatePath = path.join(getPackageRoot(), 'templates', 'global', 'GEMINI.md')
+
+    // Ensure ~/.gemini directory exists
+    fs.mkdirSync(geminiDir, { recursive: true })
+
+    // Read template content
+    const templateContent = fs.readFileSync(templatePath, 'utf-8')
+
+    // Check if global config already exists
+    let existingContent = ''
+    let fileExists = false
+
+    try {
+      existingContent = fs.readFileSync(globalConfigPath, 'utf-8')
+      fileExists = true
+    } catch (error) {
+      if (isNotFoundError(error)) {
+        fileExists = false
+      } else {
+        throw error
+      }
+    }
+
+    if (!fileExists) {
+      // Create new file with full template
+      fs.writeFileSync(globalConfigPath, templateContent, 'utf-8')
+      return { success: true, action: 'created' }
+    }
+
+    // File exists - perform intelligent merge
+    const startMarker = '<!-- prjct:start - DO NOT REMOVE THIS MARKER -->'
+    const endMarker = '<!-- prjct:end - DO NOT REMOVE THIS MARKER -->'
+
+    const hasMarkers = existingContent.includes(startMarker) && existingContent.includes(endMarker)
+
+    if (!hasMarkers) {
+      // No markers - append prjct section at the end
+      const updatedContent = existingContent + '\n\n' + templateContent
+      fs.writeFileSync(globalConfigPath, updatedContent, 'utf-8')
+      return { success: true, action: 'appended' }
+    }
+
+    // Markers exist - replace content between markers
+    const beforeMarker = existingContent.substring(0, existingContent.indexOf(startMarker))
+    const afterMarker = existingContent.substring(
+      existingContent.indexOf(endMarker) + endMarker.length
+    )
+
+    // Extract prjct section from template
+    const prjctSection = templateContent.substring(
+      templateContent.indexOf(startMarker),
+      templateContent.indexOf(endMarker) + endMarker.length
+    )
+
+    const updatedContent = beforeMarker + prjctSection + afterMarker
+    fs.writeFileSync(globalConfigPath, updatedContent, 'utf-8')
+    return { success: true, action: 'updated' }
+  } catch (error) {
+    console.error(`Gemini config warning: ${(error as Error).message}`)
+    return { success: false, action: null }
+  }
+}
+
 /**
  * Migrate existing projects to add cliVersion field
  * This clears the status line warning after npm update
@@ -415,15 +580,15 @@ function ensureStatusLineSymlink(linkPath: string, targetPath: string): void {
 }
 
 /**
- * Show setup results
+ * Show setup results for a single provider
  */
-function showResults(results: SetupResults): void {
+function showResults(results: ProviderSetupResult, provider: AIProviderConfig): void {
   console.log('')
 
-  if (results.claudeInstalled) {
-    console.log(`   ${GREEN}✓${NC} Claude Code CLI installed`)
+  if (results.cliInstalled) {
+    console.log(`   ${GREEN}✓${NC} ${provider.displayName} CLI installed`)
   } else {
-    console.log(`   ${GREEN}✓${NC} Claude Code CLI found`)
+    console.log(`   ${GREEN}✓${NC} ${provider.displayName} CLI found`)
   }
 
   const totalCommands = results.commandsAdded + results.commandsUpdated
@@ -437,11 +602,11 @@ function showResults(results: SetupResults): void {
   }
 
   if (results.configAction === 'created') {
-    console.log(`   ${GREEN}✓${NC} Global config created`)
+    console.log(`   ${GREEN}✓${NC} Global config created (${provider.contextFile})`)
   } else if (results.configAction === 'updated') {
-    console.log(`   ${GREEN}✓${NC} Global config updated`)
+    console.log(`   ${GREEN}✓${NC} Global config updated (${provider.contextFile})`)
   } else if (results.configAction === 'appended') {
-    console.log(`   ${GREEN}✓${NC} Global config merged`)
+    console.log(`   ${GREEN}✓${NC} Global config merged (${provider.contextFile})`)
   }
 
   console.log('')

package/core/services/skill-service.ts

@@ -6,10 +6,14 @@
  *
  * Skill sources (in priority order):
  * 1. Project: .prjct/skills/*.md
- * 2. Global: ~/.prjct-cli/skills/*.md
- * 3. Built-in: templates/skills/*.md
+ * 2. Provider: ~/.claude/skills/* or ~/.gemini/skills/* (SKILL.md format)
+ * 3. Global: ~/.prjct-cli/skills/*.md
+ * 4. Built-in: templates/skills/*.md
  *
- * @version 1.0.0
+ * Note: Claude Code and Gemini CLI use identical SKILL.md format,
+ * so skills are compatible between both providers.
+ *
+ * @version 1.1.0
  */
 
 import fs from 'fs/promises'
@@ -17,6 +21,7 @@ import path from 'path'
 import { glob } from 'glob'
 
 import type { SkillMetadata, Skill, SkillSearchResult } from '../types'
+import type { AIProviderName } from '../types/provider'
 
 /**
  * Parse YAML-like frontmatter from markdown
@@ -57,9 +62,17 @@ function parseFrontmatter(content: string): { metadata: Record<string, unknown>;
 
 /**
  * Convert filename to skill ID
+ * For SKILL.md files, uses the parent directory name
  */
 function fileToSkillId(filePath: string): string {
   const basename = path.basename(filePath, '.md')
+
+  // For SKILL.md files (provider format), use parent directory name
+  if (basename.toUpperCase() === 'SKILL') {
+    const dirName = path.basename(path.dirname(filePath))
+    return dirName.toLowerCase().replace(/[^a-z0-9]+/g, '-')
+  }
+
   return basename.toLowerCase().replace(/[^a-z0-9]+/g, '-')
 }
 
@@ -70,16 +83,27 @@ class SkillService {
   /**
    * Get all skill directories in order of priority
    */
-  private getSkillDirs(projectPath?: string): Array<{ dir: string; source: Skill['source'] }> {
+  private getSkillDirs(projectPath?: string, provider?: AIProviderName): Array<{ dir: string; source: Skill['source']; isProviderSkill?: boolean }> {
     const homeDir = process.env.HOME || process.env.USERPROFILE || '~'
-    const dirs: Array<{ dir: string; source: Skill['source'] }> = []
+    const dirs: Array<{ dir: string; source: Skill['source']; isProviderSkill?: boolean }> = []
 
     // Project skills (highest priority)
     if (projectPath) {
       dirs.push({ dir: path.join(projectPath, '.prjct', 'skills'), source: 'project' })
     }
 
-    // Global skills
+    // Provider skills (Claude or Gemini)
+    // Both use SKILL.md format, so skills are compatible
+    if (provider) {
+      const providerDir = provider === 'gemini' ? '.gemini' : '.claude'
+      dirs.push({ dir: path.join(homeDir, providerDir, 'skills'), source: 'global', isProviderSkill: true })
+    } else {
+      // Check both providers if no specific one is set
+      dirs.push({ dir: path.join(homeDir, '.claude', 'skills'), source: 'global', isProviderSkill: true })
+      dirs.push({ dir: path.join(homeDir, '.gemini', 'skills'), source: 'global', isProviderSkill: true })
+    }
+
+    // prjct global skills
     dirs.push({ dir: path.join(homeDir, '.prjct-cli', 'skills'), source: 'global' })
 
     // Built-in skills (lowest priority)
@@ -123,19 +147,31 @@ class SkillService {
   /**
    * Load all skills from all sources
    */
-  async loadSkills(projectPath?: string): Promise<void> {
+  async loadSkills(projectPath?: string, provider?: AIProviderName): Promise<void> {
     this.skills.clear()
-    const dirs = this.getSkillDirs(projectPath)
+    const dirs = this.getSkillDirs(projectPath, provider)
 
-    for (const { dir, source } of dirs) {
+    for (const { dir, source, isProviderSkill } of dirs) {
       try {
-        const files = await glob('*.md', { cwd: dir, absolute: true })
-
-        for (const file of files) {
-          const skill = await this.loadSkill(file, source)
-          if (skill && !this.skills.has(skill.id)) {
-            // Don't override higher priority skills
-            this.skills.set(skill.id, skill)
+        if (isProviderSkill) {
+          // Provider skills use SKILL.md in subdirectories
+          // e.g., ~/.claude/skills/my-skill/SKILL.md
+          const skillDirs = await glob('*/SKILL.md', { cwd: dir, absolute: true })
+          for (const file of skillDirs) {
+            const skill = await this.loadSkill(file, source)
+            if (skill && !this.skills.has(skill.id)) {
+              this.skills.set(skill.id, skill)
+            }
+          }
+        } else {
+          // Regular .md files in directory
+          const files = await glob('*.md', { cwd: dir, absolute: true })
+          for (const file of files) {
+            const skill = await this.loadSkill(file, source)
+            if (skill && !this.skills.has(skill.id)) {
+              // Don't override higher priority skills
+              this.skills.set(skill.id, skill)
+            }
           }
         }
       } catch (_error) {

package/core/types/index.ts

@@ -405,3 +405,15 @@ export type {
   SSEManager,
   SSEEventType,
 } from './server'
+
+// =============================================================================
+// Provider Types (AI CLI abstraction)
+// =============================================================================
+export type {
+  AIProviderName,
+  CommandFormat,
+  AIProviderConfig,
+  ProviderDetectionResult,
+  ProviderSelectionResult,
+  ProviderBranding,
+} from './provider'

package/core/types/provider.ts

@@ -0,0 +1,110 @@
+/**
+ * AI Provider Types
+ *
+ * Abstractions for supporting multiple AI CLI agents (Claude Code, Gemini CLI).
+ * Both agents share similar architectures, making compatibility achievable.
+ *
+ * Key discovery: Skills use identical SKILL.md format for both providers.
+ *
+ * @see https://geminicli.com/docs/cli/gemini-md/
+ * @see https://geminicli.com/docs/cli/skills/
+ */
+
+/**
+ * Supported AI provider names
+ */
+export type AIProviderName = 'claude' | 'gemini'
+
+/**
+ * Command format for each provider
+ * - Claude: Markdown files (.md)
+ * - Gemini: TOML files (.toml)
+ */
+export type CommandFormat = 'md' | 'toml'
+
+/**
+ * AI Provider configuration
+ * Defines paths and formats for each AI CLI agent
+ */
+export interface AIProviderConfig {
+  /** Provider identifier */
+  name: AIProviderName
+
+  /** Display name for UI/logs */
+  displayName: string
+
+  /** CLI command name (e.g., 'claude', 'gemini') */
+  cliCommand: string
+
+  /** Global config directory (e.g., ~/.claude, ~/.gemini) */
+  configDir: string
+
+  /** Context file name (CLAUDE.md or GEMINI.md) */
+  contextFile: string
+
+  /** Skills directory (e.g., ~/.claude/skills, ~/.gemini/skills) */
+  skillsDir: string
+
+  /** Commands directory relative to project (e.g., .claude/commands, .gemini/commands) */
+  commandsDir: string
+
+  /** Command file format */
+  commandFormat: CommandFormat
+
+  /** Settings file name (settings.json for both) */
+  settingsFile: string
+
+  /** Project settings file (e.g., settings.local.json, settings.json) */
+  projectSettingsFile: string
+
+  /** Ignore file name (.claudeignore, .geminiignore) */
+  ignoreFile: string
+
+  /** URL for provider website */
+  websiteUrl: string
+
+  /** URL for provider documentation */
+  docsUrl: string
+}
+
+/**
+ * Provider detection result
+ */
+export interface ProviderDetectionResult {
+  /** Whether the provider CLI is installed */
+  installed: boolean
+
+  /** Provider version if installed */
+  version?: string
+
+  /** Path to the CLI executable */
+  path?: string
+}
+
+/**
+ * Result of provider selection during setup
+ */
+export interface ProviderSelectionResult {
+  /** Selected provider */
+  provider: AIProviderName
+
+  /** Whether user was prompted to choose (both installed) */
+  userSelected: boolean
+
+  /** Detection details */
+  detection: {
+    claude: ProviderDetectionResult
+    gemini: ProviderDetectionResult
+  }
+}
+
+/**
+ * Provider-aware branding configuration
+ */
+export interface ProviderBranding {
+  /** Commit footer text */
+  commitFooter: string
+
+  /** Short signature */
+  signature: string
+}

package/core/utils/branding.ts

@@ -1,9 +1,13 @@
 /**
  * Branding Configuration for prjct-cli
- * Single source of truth for all branding across CLI and Claude Code
+ * Single source of truth for all branding across CLI and AI agents
+ *
+ * Supports multiple AI providers (Claude Code, Gemini CLI)
  */
 
 import chalk from 'chalk'
+import type { AIProviderName } from '../types/provider'
+import { getProviderBranding, Providers } from '../infrastructure/ai-provider'
 
 const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏']
 const SPINNER_SPEED = 80
@@ -30,6 +34,9 @@ interface Branding {
     website: string
     docs: string
   }
+  // Provider-aware methods
+  getCommitFooter: (provider?: AIProviderName) => string
+  getSignature: (provider?: AIProviderName) => string
 }
 
 const branding: Branding = {
@@ -52,13 +59,13 @@ const branding: Branding = {
       chalk.cyan('⚡') + ' ' + chalk.cyan('prjct') + ' ' + chalk.cyan(SPINNER_FRAMES[frame % 10]) + ' ' + chalk.dim(msg || '')
   },
 
-  // Template/Claude (plain text)
+  // Template (plain text)
   template: {
     header: '⚡ prjct',
     footer: '⚡ prjct'
   },
 
-  // Git commit footer
+  // Default Git commit footer (Claude - for backward compatibility)
   commitFooter: `🤖 Generated with [p/](https://www.prjct.app/)
 Designed for [Claude](https://www.anthropic.com/claude)`,
 
@@ -66,6 +73,16 @@ Designed for [Claude](https://www.anthropic.com/claude)`,
   urls: {
     website: 'https://prjct.app',
     docs: 'https://prjct.app/docs'
+  },
+
+  // Provider-aware commit footer
+  getCommitFooter: (provider: AIProviderName = 'claude') => {
+    return getProviderBranding(provider).commitFooter
+  },
+
+  // Provider-aware signature
+  getSignature: (provider: AIProviderName = 'claude') => {
+    return getProviderBranding(provider).signature
   }
 }