@iservu-inc/adf-cli 0.4.31 → 0.4.33

package/CHANGELOG.md

@@ -5,6 +5,91 @@ All notable changes to `@iservu-inc/adf-cli` 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).
 
+## [0.4.33] - 2025-10-04
+
+### ✨ Feature: Show Active Provider and Model
+
+**Added: Active Configuration Display**
+- **Problem:** All configured providers showed ✓ checkmark, impossible to know which is currently active
+- **Solution:** Track and display currently active provider and model
+
+**New Display:**
+```
+★ Currently Active: OpenAI GPT - o3
+
+? Select AI provider:
+> Anthropic Claude
+  OpenAI GPT ✓ Configured ★ Active
+  Google Gemini ✓ Configured
+  OpenRouter (Multi-Model) ✓ Configured
+```
+
+**Implementation:**
+- New env variables: `ADF_CURRENT_PROVIDER`, `ADF_CURRENT_MODEL`
+- Saved automatically after successful AI configuration
+- Displayed at top of configuration screen
+- ★ Active indicator in provider list
+- Organized .env file with sections
+
+**Code Changes:**
+- ai-config.js:262-280 - Load and display current config
+- ai-config.js:285-303 - Add ★ Active indicator to choices
+- ai-config.js:476-478 - Save current selection
+- ai-config.js:141-180 - Enhanced .env file formatting
+
+**Enhanced .env File:**
+```env
+# AI Provider Configuration for adf-cli
+# DO NOT commit this file to version control
+
+# Currently Active Provider and Model
+# (Set automatically when you configure AI provider)
+ADF_CURRENT_PROVIDER="openai"
+ADF_CURRENT_MODEL="o3"
+
+# API Keys for Each Provider
+OPENAI_API_KEY="sk-..."
+GOOGLE_API_KEY="..."
+```
+
+---
+
+## [0.4.32] - 2025-10-04
+
+### ✨ Improved: Smarter .adf Directory Detection
+
+**Enhanced: Content-Based Initialization Check**
+- **Problem:** `adf init` prompted to overwrite even when `.adf` only contained `.env` file
+- **Solution:** Now checks for meaningful content before prompting
+
+**New Behavior:**
+- `.adf` with only `.env` file → Continues silently ✓
+- `.adf` with session files → Prompts to overwrite ⚠️
+- Empty `.adf` → Creates structure ✓
+
+**Implementation:**
+- New `hasMeaningfulContent()` function (init.js:167-204)
+- Checks for sessions/, outputs/, progress files
+- Ignores `.env`, `.gitignore`, hidden files
+- Only prompts when actual work would be lost
+
+**User Experience:**
+```
+# Before v0.4.32 (annoying)
+.adf directory already exists. Overwrite? (y/N)
+
+# After v0.4.32 (smart)
+✓ Using existing .adf directory
+```
+
+**Confirmed: .gitignore Protection Working**
+- v0.4.30 added automatic root `.gitignore` creation
+- Entry: `.adf/.env` (protects API keys)
+- Created at project root, not in `.adf/`
+- Non-destructive: only adds if missing
+
+---
+
 ## [0.4.31] - 2025-10-04
 
 ### 🐛 Fix: OpenAI o-series Model Support (o3, o3-mini, o3-pro)

package/lib/ai/ai-config.js

@@ -143,13 +143,32 @@ async function saveToEnvFile(envPath, key, value) {
   env[key] = value;
 
   const lines = [
-    '# AI Provider API Keys for adf-cli',
+    '# AI Provider Configuration for adf-cli',
     '# DO NOT commit this file to version control',
-    ''
+    '',
+    '# Currently Active Provider and Model',
+    '# (Set automatically when you configure AI provider)'
   ];
 
+  // Add current provider/model first
+  const currentKeys = ['ADF_CURRENT_PROVIDER', 'ADF_CURRENT_MODEL'];
+  currentKeys.forEach(k => {
+    if (env[k]) {
+      lines.push(`${k}="${env[k]}"`);
+    }
+  });
+
+  // Add separator if we have current config
+  if (env['ADF_CURRENT_PROVIDER'] || env['ADF_CURRENT_MODEL']) {
+    lines.push('');
+    lines.push('# API Keys for Each Provider');
+  }
+
+  // Add all other keys (API keys)
   for (const [k, v] of Object.entries(env)) {
-    lines.push(`${k}="${v}"`);
+    if (!currentKeys.includes(k)) {
+      lines.push(`${k}="${v}"`);
+    }
   }
 
   await fs.ensureDir(path.dirname(envPath));
@@ -259,6 +278,10 @@ async function configureAIProvider(projectPath = process.cwd()) {
     }
   }
 
+  // Get currently active provider and model
+  const currentProvider = process.env.ADF_CURRENT_PROVIDER || existingEnv.ADF_CURRENT_PROVIDER;
+  const currentModel = process.env.ADF_CURRENT_MODEL || existingEnv.ADF_CURRENT_MODEL;
+
   if (availableProviders.length > 0) {
     console.log(chalk.green('✓ Detected API keys for:'));
     availableProviders.forEach(p => {
@@ -267,25 +290,33 @@ async function configureAIProvider(projectPath = process.cwd()) {
     console.log('');
   }
 
+  // Show current active configuration if exists
+  if (currentProvider && currentModel) {
+    const currentProviderObj = AI_PROVIDERS[currentProvider.toUpperCase()];
+    if (currentProviderObj) {
+      console.log(chalk.cyan(`★ Currently Active: ${currentProviderObj.name} - ${currentModel}\n`));
+    }
+  }
+
   // Provider selection
   const providerChoices = [
     {
-      name: `${AI_PROVIDERS.ANTHROPIC.name} ${availableProviders.find(p => p.id === 'anthropic') ? chalk.green('✓ Configured') : ''}`,
+      name: `${AI_PROVIDERS.ANTHROPIC.name} ${availableProviders.find(p => p.id === 'anthropic') ? chalk.green('✓ Configured') : ''} ${currentProvider === 'anthropic' ? chalk.cyan('★ Active') : ''}`,
       value: 'anthropic',
       short: 'Anthropic'
     },
     {
-      name: `${AI_PROVIDERS.OPENAI.name} ${availableProviders.find(p => p.id === 'openai') ? chalk.green('✓ Configured') : ''}`,
+      name: `${AI_PROVIDERS.OPENAI.name} ${availableProviders.find(p => p.id === 'openai') ? chalk.green('✓ Configured') : ''} ${currentProvider === 'openai' ? chalk.cyan('★ Active') : ''}`,
       value: 'openai',
       short: 'OpenAI'
     },
     {
-      name: `${AI_PROVIDERS.GOOGLE.name} ${availableProviders.find(p => p.id === 'google') ? chalk.green('✓ Configured') : ''}`,
+      name: `${AI_PROVIDERS.GOOGLE.name} ${availableProviders.find(p => p.id === 'google') ? chalk.green('✓ Configured') : ''} ${currentProvider === 'google' ? chalk.cyan('★ Active') : ''}`,
       value: 'google',
       short: 'Google'
     },
     {
-      name: `${AI_PROVIDERS.OPENROUTER.name} ${availableProviders.find(p => p.id === 'openrouter') ? chalk.green('✓ Configured') : ''}`,
+      name: `${AI_PROVIDERS.OPENROUTER.name} ${availableProviders.find(p => p.id === 'openrouter') ? chalk.green('✓ Configured') : ''} ${currentProvider === 'openrouter' ? chalk.cyan('★ Active') : ''}`,
       value: 'openrouter',
       short: 'OpenRouter'
     }
@@ -461,6 +492,10 @@ async function configureAIProvider(projectPath = process.cwd()) {
 
   console.log(chalk.gray('\n' + '━'.repeat(60)) + '\n');
 
+  // Save current provider and model selection to .env for future reference
+  await saveToEnvFile(envPath, 'ADF_CURRENT_PROVIDER', selectedProvider.id);
+  await saveToEnvFile(envPath, 'ADF_CURRENT_MODEL', config.model);
+
   return config;
 }
 

package/lib/commands/init.js

@@ -61,23 +61,31 @@ async function init(options) {
     return;
   }
 
-  // Check if already initialized
+  // Check if already initialized with actual content
   if (await fs.pathExists(adfDir)) {
-    const { overwrite } = await inquirer.prompt([
-      {
-        type: 'confirm',
-        name: 'overwrite',
-        message: chalk.yellow('.adf directory already exists. Overwrite?'),
-        default: false
+    // Check for meaningful content (not just .env file)
+    const hasContent = await hasMeaningfulContent(adfDir);
+
+    if (hasContent) {
+      const { overwrite } = await inquirer.prompt([
+        {
+          type: 'confirm',
+          name: 'overwrite',
+          message: chalk.yellow('.adf directory already exists with sessions. Overwrite?'),
+          default: false
+        }
+      ]);
+
+      if (!overwrite) {
+        console.log(chalk.yellow('\n✋ Initialization cancelled.\n'));
+        return;
       }
-    ]);
 
-    if (!overwrite) {
-      console.log(chalk.yellow('\n✋ Initialization cancelled.\n'));
-      return;
+      await fs.remove(adfDir);
+    } else {
+      // Only .env file exists - safe to continue without prompting
+      console.log(chalk.gray('✓ Using existing .adf directory\n'));
     }
-
-    await fs.remove(adfDir);
   }
 
   // Detect project type
@@ -151,4 +159,48 @@ async function init(options) {
   console.log(chalk.green.bold('\n✅ All done! Happy coding! 🚀\n'));
 }
 
+/**
+ * Check if .adf directory has meaningful content
+ * Returns true if there are session files, progress files, or outputs
+ * Returns false if only .env or empty
+ */
+async function hasMeaningfulContent(adfDir) {
+  try {
+    const contents = await fs.readdir(adfDir);
+
+    // Filter out .env and other config files that don't represent sessions
+    const meaningfulFiles = contents.filter(item => {
+      return item !== '.env' &&
+             item !== '.gitignore' &&
+             !item.startsWith('.');
+    });
+
+    if (meaningfulFiles.length === 0) {
+      return false;
+    }
+
+    // Check for session directories or files
+    for (const item of meaningfulFiles) {
+      const itemPath = path.join(adfDir, item);
+      const stats = await fs.stat(itemPath);
+
+      if (stats.isDirectory()) {
+        // Check if directory has files (sessions/, outputs/, etc.)
+        const dirContents = await fs.readdir(itemPath);
+        if (dirContents.length > 0) {
+          return true;
+        }
+      } else if (stats.isFile()) {
+        // Any non-config file indicates content
+        return true;
+      }
+    }
+
+    return false;
+  } catch (error) {
+    // If error reading, assume no content
+    return false;
+  }
+}
+
 module.exports = init;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iservu-inc/adf-cli",
-  "version": "0.4.31",
+  "version": "0.4.33",
   "description": "CLI tool for AgentDevFramework - AI-assisted development framework with multi-provider AI support",
   "main": "index.js",
   "bin": {