s9n-devops-agent 2.0.18-dev.1 → 2.0.18-dev.12

package/src/setup-cs-devops-agent.js

@@ -28,6 +28,7 @@ import { execSync } from 'child_process';
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
 import { credentialsManager } from './credentials-manager.js';
+import { SessionCoordinator } from './session-coordinator.js';
 import {
   colors,
   status,
@@ -41,6 +42,7 @@ import {
   error as errorMsg,
   confirm,
   prompt as uiPrompt,
+  choose,
   progressStep,
   drawSection
 } from './ui-utils.js';
@@ -149,20 +151,165 @@ This structure is compatible with the DevOps Agent's automation tools.
   return missingFolders;
 }
 
-function checkContractsExist(projectRoot) {
-  const contractsDir = path.join(projectRoot, 'House_Rules_Contracts');
-  if (!fs.existsSync(contractsDir)) return false;
-  
-  const requiredContracts = [
-    'FEATURES_CONTRACT.md',
-    'API_CONTRACT.md',
-    'DATABASE_SCHEMA_CONTRACT.md',
-    'SQL_CONTRACT.json',
-    'THIRD_PARTY_INTEGRATIONS.md',
-    'INFRA_CONTRACT.md'
-  ];
-  
-  return requiredContracts.every(file => fs.existsSync(path.join(contractsDir, file)));
+async function checkContractsExist(projectRoot) {
+  // Search recursively for contract folders and files
+  try {
+    const requiredContracts = [
+      'FEATURES_CONTRACT.md',
+      'API_CONTRACT.md',
+      'DATABASE_SCHEMA_CONTRACT.md',
+      'SQL_CONTRACT.json',
+      'THIRD_PARTY_INTEGRATIONS.md',
+      'INFRA_CONTRACT.md'
+    ];
+
+    // Map to hold found files for each type
+    const contractMap = {};
+    requiredContracts.forEach(c => contractMap[c] = []);
+
+    // Find all files that look like contracts
+    // We look for files containing "CONTRACT" in the name, excluding typical ignores
+    // Use -iname for case-insensitive matching
+    const findCommand = `find "${projectRoot}" -type f \\( -iname "*CONTRACT*.md" -o -iname "*CONTRACT*.json" \\) -not -path "*/node_modules/*" -not -path "*/.git/*" -not -path "*/local_deploy/*"`;
+    
+    let files = [];
+    try {
+        const output = execSync(findCommand, { encoding: 'utf8' }).trim();
+        files = output.split('\n').filter(Boolean);
+    } catch (e) {
+        // find might fail if no matches or other issues, just treat as empty
+    }
+
+    // Categorize found files
+    for (const file of files) {
+        const basename = path.basename(file).toUpperCase();
+        
+        // Skip files in the target directory itself (House_Rules_Contracts) to avoid self-merging if we run this multiple times
+        // actually we SHOULD include them to see if we have them, but valid if we are merging duplicates from elsewhere
+        
+        let matched = false;
+        
+        if (basename.includes('FEATURE')) contractMap['FEATURES_CONTRACT.md'].push(file);
+        else if (basename.includes('API')) contractMap['API_CONTRACT.md'].push(file);
+        else if (basename.includes('DATABASE') || basename.includes('SCHEMA')) contractMap['DATABASE_SCHEMA_CONTRACT.md'].push(file);
+        else if (basename.includes('SQL')) contractMap['SQL_CONTRACT.json'].push(file);
+        else if (basename.includes('INFRA')) contractMap['INFRA_CONTRACT.md'].push(file);
+        else if (basename.includes('THIRD') || basename.includes('INTEGRATION')) contractMap['THIRD_PARTY_INTEGRATIONS.md'].push(file);
+        else {
+             // Fallback or ignore
+        }
+    }
+
+    const targetDir = path.join(projectRoot, 'House_Rules_Contracts');
+    let hasChanges = false;
+
+    // Process each contract type
+    let scatteredCount = 0;
+    let centralCount = 0;
+    let missingCount = 0;
+    
+    // Print summary header
+    console.log(`\n${colors.bright}Contract Search Results:${colors.reset}`);
+    
+    for (const [type, foundFiles] of Object.entries(contractMap)) {
+        // Filter out unique paths (resolve them)
+        const uniqueFiles = [...new Set(foundFiles.map(f => path.resolve(f)))];
+        const isCentral = fs.existsSync(path.join(targetDir, type));
+        
+        let statusIcon = '';
+        let statusText = '';
+        
+        if (isCentral) {
+            statusIcon = colors.green + '✓' + colors.reset;
+            statusText = colors.green + 'Present (Central)' + colors.reset;
+            centralCount++;
+        } else if (uniqueFiles.length > 0) {
+            statusIcon = colors.yellow + '⚠️' + colors.reset;
+            statusText = colors.yellow + `Found ${uniqueFiles.length} scattered file(s)` + colors.reset;
+            scatteredCount++;
+        } else {
+            statusIcon = colors.red + '✗' + colors.reset;
+            statusText = colors.red + 'Missing' + colors.reset;
+            missingCount++;
+        }
+        
+        console.log(` ${statusIcon} ${type.padEnd(30)} : ${statusText}`);
+        
+        if (uniqueFiles.length > 0 && !isCentral) {
+             // Show locations for scattered files
+             uniqueFiles.forEach(f => console.log(`    ${colors.dim}- ${path.relative(projectRoot, f)}${colors.reset}`));
+             
+             const shouldMerge = await confirm(`   Merge/Copy ${uniqueFiles.length} file(s) to House_Rules_Contracts/${type}?`, true);
+             
+             if (shouldMerge) {
+                 ensureDirectoryExists(targetDir);
+                 const targetPath = path.join(targetDir, type);
+                 
+                 let mergedContent = '';
+                 // Handle JSON vs MD
+                 if (type.endsWith('.json')) {
+                     // For JSON, we try to merge arrays/objects or just list them
+                     const mergedJson = [];
+                     for (const file of uniqueFiles) {
+                         try {
+                             const content = JSON.parse(fs.readFileSync(file, 'utf8'));
+                             mergedJson.push({ source: path.relative(projectRoot, file), content });
+                         } catch (e) {
+                             log.warn(`Skipping invalid JSON in ${path.basename(file)}`);
+                         }
+                     }
+                     mergedContent = JSON.stringify(mergedJson, null, 2);
+                 } else {
+                     // Markdown
+                     mergedContent = `# Merged ${type}\n\nGenerated on ${new Date().toISOString()}\n\n`;
+                     for (const file of uniqueFiles) {
+                         const content = fs.readFileSync(file, 'utf8');
+                         mergedContent += `\n<!-- SOURCE: ${path.relative(projectRoot, file)} -->\n`;
+                         mergedContent += `## Source: ${path.basename(file)}\n(Path: ${path.relative(projectRoot, file)})\n\n`;
+                         mergedContent += `${content}\n\n---\n`;
+                     }
+                 }
+                 
+                 fs.writeFileSync(targetPath, mergedContent);
+                 log.success(`   Merged into ${path.relative(projectRoot, targetPath)}`);
+                 hasChanges = true;
+                 centralCount++; // Now it's central
+                 scatteredCount--;
+             }
+        }
+    }
+
+    console.log(); // Spacing
+
+    // Final check logic
+    const result = {
+        missingCount,
+        scatteredCount,
+        centralCount,
+        valid: missingCount === 0
+    };
+
+    if (missingCount === 0) {
+        if (hasChanges) log.success('Contracts consolidated and verified.');
+        else log.info('All required contracts are present.');
+        return result;
+    }
+    
+    if (scatteredCount > 0) {
+        log.warn(`${scatteredCount} contract types exist but are not centralized.`);
+        log.warn('We recommend merging them, but you can proceed without it.');
+    }
+    
+    if (missingCount > 0) {
+        log.warn(`${missingCount} contract types are completely missing.`);
+    }
+    
+    return result;
+    
+  } catch (error) {
+    log.warn(`Error searching for contracts: ${error.message}`);
+    return { missingCount: 1, scatteredCount: 0, valid: false }; // Fallback
+  }
 }
 
 async function generateContracts(projectRoot) {
@@ -834,30 +981,50 @@ async function setupEnvFile(projectRoot) {
     log.info('Creating .env file');
   }
   
-  // Check for OPENAI_API_KEY
+  // Check if OPENAI_API_KEY is already present in memory (from credentials.json)
+  const existingKey = credentialsManager.getGroqApiKey();
+  
+  // Check for OPENAI_API_KEY in .env content
   if (!envContent.includes('OPENAI_API_KEY=')) {
-    console.log();
-    explain(`
-${colors.bright}Groq API Key Setup${colors.reset}
-The contract automation features use Groq LLM (via OpenAI compatibility).
-You can enter your API key now, or set it later in the .env file.
-    `);
-    
-    const apiKey = await prompt('Enter Groq API Key (leave empty to skip)');
-    
-    if (apiKey) {
+    if (existingKey) {
+      log.info('Found existing Groq API Key in credentials store.');
       const newLine = envContent.endsWith('\n') || envContent === '' ? '' : '\n';
-      envContent += `${newLine}# Groq API Key for Contract Automation\nOPENAI_API_KEY=${apiKey}\n`;
+      envContent += `${newLine}# Groq API Key for Contract Automation\nOPENAI_API_KEY=${existingKey}\n`;
       fs.writeFileSync(envPath, envContent);
-      log.success('Added OPENAI_API_KEY to .env');
+      log.success('Restored OPENAI_API_KEY to .env');
     } else {
-      log.warn('Skipped Groq API Key. Contract automation features may not work.');
-      if (!fs.existsSync(envPath)) {
-        fs.writeFileSync(envPath, '# Environment Variables\n');
+      console.log();
+      explain(`
+${colors.bright}Groq API Key Setup${colors.reset}
+The contract automation features use Groq LLM (via OpenAI compatibility).
+You can enter your API key now, or set it later in the .env file.
+      `);
+      
+      const apiKey = await prompt('Enter Groq API Key (leave empty to skip)');
+      
+      if (apiKey) {
+        const newLine = envContent.endsWith('\n') || envContent === '' ? '' : '\n';
+        envContent += `${newLine}# Groq API Key for Contract Automation\nOPENAI_API_KEY=${apiKey}\n`;
+        fs.writeFileSync(envPath, envContent);
+        
+        // Also save to credentials manager for persistence across updates
+        credentialsManager.setGroqApiKey(apiKey);
+        
+        log.success('Added OPENAI_API_KEY to .env');
+      } else {
+        log.warn('Skipped Groq API Key. Contract automation features may not work.');
+        if (!fs.existsSync(envPath)) {
+          fs.writeFileSync(envPath, '# Environment Variables\n');
+        }
       }
     }
   } else {
     log.info('OPENAI_API_KEY is already configured in .env');
+    // Ensure it's backed up in credentials manager if it exists in .env
+    const match = envContent.match(/OPENAI_API_KEY=(.+)/);
+    if (match && match[1] && !existingKey) {
+        credentialsManager.setGroqApiKey(match[1].trim());
+    }
   }
 }
 
@@ -950,17 +1117,15 @@ ${colors.dim}This takes about 2 minutes.${colors.reset}
   const projectRoot = providedRoot ? path.resolve(providedRoot) : findProjectRoot();
   log.info(`Project root: ${projectRoot}`);
   
-  // Ensure ScriptCS_DevOpsAgent directory exists
-  // const scriptsDir = path.join(projectRoot, 'ScriptCS_DevOpsAgent');
-  // if (!fs.existsSync(scriptsDir)) {
-  //   log.warn('ScriptCS_DevOpsAgent folder not found. Assuming global install or custom setup.');
-  // }
+  // Initialize coordinator to access settings
+  const coordinator = new SessionCoordinator();
+  const currentSettings = coordinator.loadSettings();
   
   // Get developer initials
   console.log();
   sectionTitle('Developer Identification');
   
-  let initials = providedInitials;
+  let initials = providedInitials || currentSettings.developerInitials;
   
   if (!initials) {
     explain(`
@@ -995,6 +1160,7 @@ ${colors.bright}How:${colors.reset} Creates branches like dev_abc_2025-10-31
   sectionTitle('Primary AI Assistant');
   
   let agentName = providedAgent;
+  const defaultAgent = currentSettings.preferences?.primaryAgent || 'Claude';
   
   if (!agentName) {
     explain(`
@@ -1003,16 +1169,52 @@ ${colors.bright}Why:${colors.reset} Customizes file names (e.g., .warp-commit-ms
     `);
     
     if (skipPrompts) {
-        agentName = 'Claude'; // Default if skipping prompts
+        agentName = defaultAgent; // Default if skipping prompts
     } else {
-        agentName = await prompt('Primary AI Assistant? [Claude]');
-        agentName = agentName.trim() || 'Claude';
+        agentName = await prompt(`Primary AI Assistant? [${defaultAgent}]`, defaultAgent);
+        agentName = agentName.trim() || defaultAgent;
     }
   }
   
   success(`Using assistant: ${colors.cyan}${agentName}${colors.reset}`);
   console.log();
   
+  // Ask to save settings if changed or not saved
+  if (!skipPrompts && (initials !== currentSettings.developerInitials || agentName !== currentSettings.preferences?.primaryAgent)) {
+      console.log();
+      sectionTitle('Save Preferences');
+      explain(`
+${colors.bright}Save these settings for future sessions?${colors.reset}
+• ${colors.bright}Global:${colors.reset} Saves to ~/.devops-agent/settings.json (applies to all projects)
+• ${colors.bright}Project:${colors.reset} Saves to local_deploy/project-settings.json (this project only)
+      `);
+      
+      const saveChoice = await choose('Where should we save these settings?', [
+          'Global (User Profile)',
+          'Project (Local Only)',
+          'Do not save'
+      ], { defaultChoice: '1' });
+      
+      if (saveChoice === 0) {
+          // Global
+          const globalSettings = coordinator.loadGlobalSettings();
+          globalSettings.developerInitials = initials;
+          globalSettings.preferences = globalSettings.preferences || {};
+          globalSettings.preferences.primaryAgent = agentName;
+          globalSettings.configured = true;
+          coordinator.saveGlobalSettings(globalSettings);
+          log.success('Settings saved globally.');
+      } else if (saveChoice === 1) {
+          // Project
+          const projectSettings = coordinator.loadProjectSettings();
+          projectSettings.preferences = projectSettings.preferences || {};
+          projectSettings.developerInitials = initials; // Allow project overrides
+          projectSettings.preferences.primaryAgent = agentName;
+          coordinator.saveProjectSettings(projectSettings);
+          log.success('Settings saved to project.');
+      }
+  }
+  
   // Groq API Key Setup
   sectionTitle('Groq API Key (Contract Automation)');
   
@@ -1093,16 +1295,23 @@ ${colors.bright}Security:${colors.reset} Stored locally in ${colors.yellow}local
     }
 
     // Check for contracts
-    if (!checkContractsExist(projectRoot)) {
+    const contractStatus = await checkContractsExist(projectRoot);
+    
+    if (contractStatus.missingCount > 0) {
       log.header();
       log.title('📜 Contract Files Missing');
       
+      console.log(`${colors.red}Found ${contractStatus.missingCount} missing contract types.${colors.reset}`);
+      if (contractStatus.scatteredCount > 0) {
+        console.log(`${colors.yellow}Note: ${contractStatus.scatteredCount} contract types were found but are scattered/unmerged.${colors.reset}`);
+      }
+      
       if (!skipPrompts) {
           explain(`
 ${colors.bright}Contract System:${colors.reset}
 This project uses a Contract System to coordinate multiple AI agents.
-It seems like this is a fresh setup or contracts are missing.
-We can scan your codebase and generate them now.
+Since required contracts are missing, we should generate them to ensure
+all agents understand the project structure and rules.
           `);
       }
       
@@ -1110,6 +1319,10 @@ We can scan your codebase and generate them now.
       if (shouldGenerate) {
         await generateContracts(projectRoot);
       }
+    } else if (contractStatus.scatteredCount > 0) {
+      // All present, but some scattered. The checkContractsExist function already asked to merge.
+      // We don't need to do anything else here.
+      log.info('All contracts present (some were found in scattered locations).');
     }
 
     // Run setup steps
@@ -1130,6 +1343,49 @@ We can scan your codebase and generate them now.
             log.success('Created .env file');
         }
     }
+
+    // Initialize SessionCoordinator for versioning and house rules setup
+    // const coordinator = new SessionCoordinator(); // Already initialized at top
+    
+    // Ensure House Rules are set up
+    if (!skipPrompts) {
+        log.header();
+        log.title('🏠 House Rules Setup');
+        await coordinator.ensureHouseRulesSetup();
+    } else {
+        // In non-interactive mode, ensure defaults if missing
+        // ensureHouseRulesSetup has internal logic, but we might want to skip the prompt
+        // Since we can't easily force defaults without modifying coordinator, we'll skip for now
+        // or we could check if it exists and warn
+        if (!fs.existsSync(path.join(projectRoot, 'houserules.md'))) {
+             log.warn('House rules missing. Run setup interactively to configure folder structure.');
+        }
+    }
+    
+    // Check/Setup versioning strategy
+    if (!skipPrompts) {
+        const settings = coordinator.loadProjectSettings();
+        if (!settings.versioningStrategy?.configured) {
+             log.header();
+             log.title('📅 Project Versioning Strategy');
+             await coordinator.ensureProjectSetup();
+        } else {
+             // Optional reconfigure
+             log.info('Versioning strategy is already configured.');
+             const reconfigure = await confirm('Do you want to reconfigure versioning?', false);
+             if (reconfigure) {
+                 await coordinator.ensureProjectSetup({ force: true });
+             }
+        }
+    } else {
+         // In non-interactive mode, we only ensure if missing (and hope it doesn't block or has defaults)
+         // Actually promptForStartingVersion is interactive-only, so we skip if missing in non-interactive
+         // or we could force defaults. For now, we skip to avoid hanging.
+         const settings = coordinator.loadProjectSettings();
+         if (!settings.versioningStrategy?.configured) {
+             log.warn('Skipping versioning setup (interactive-only). Run setup without --yes to configure.');
+         }
+    }
     
     // Clean up DevOpsAgent files to avoid duplicates
     cleanupDevOpsAgentFiles(projectRoot, agentName);

package/src/ui-utils.js

@@ -478,7 +478,7 @@ export function showWelcome(version = '2.0.0') {
  */
 export function showCopyright() {
   console.log();
-  console.log(`${colors.dim}Copyright © 2024 SecondBrain Labs. All rights reserved.${colors.reset}`);
+  console.log(`${colors.dim}Copyright © 2025 SeKondBrain AI Labs Limited. All rights reserved.${colors.reset}`);
   console.log(`${colors.dim}Licensed under the MIT License${colors.reset}`);
   console.log();
 }

package/start-devops-session.sh

@@ -50,7 +50,7 @@ show_copyright() {
     echo "  CS_DevOpsAgent - Intelligent Git Automation System"
     echo "  Version 1.7.2 | Build 20251010.03"
     echo "  "
-    echo "  Copyright (c) 2024 SecondBrain Labs"
+    echo "  Copyright (c) 2025 SeKondBrain AI Labs Limited"
     echo "  Author: Sachin Dev Duggal"
     echo "  "
     echo "  Licensed under the MIT License"
@@ -394,32 +394,9 @@ main() {
     echo -e "${DIM}💡 New to DevOps Agent? Run: s9n-devops-agent tutorial${NC}"
     echo
     
-    # Main selection loop
-    while true; do
-        if select_session; then
-            # After agent exits, ask if they want to continue or exit
-            echo
-            echo -e "${YELLOW}═══════════════════════════════════════════════════════════${NC}"
-            echo -e "${BOLD}Agent has stopped.${NC}"
-            echo -e "${YELLOW}═══════════════════════════════════════════════════════════${NC}"
-            echo
-            echo -e "Would you like to:"
-            echo -e "  ${BOLD}1)${NC} Select another session"
-            echo -e "  ${BOLD}2)${NC} Exit the session manager"
-            echo
-            echo -n "Your choice [1/2]: "
-            read continue_choice
-            
-            if [[ "$continue_choice" == "2" ]]; then
-                echo
-                echo -e "${GREEN}Goodbye! Thank you for using DevOps Session Manager.${NC}"
-                exit 0
-            fi
-            echo
-            echo -e "${BLUE}Returning to session selection...${NC}"
-            echo
-        fi
-    done
+    # Run Kora (Smart Assistant)
+    # This replaces the old menu system with the unified chat interface
+    node "$SRC_DIR/agent-chat.js" "$@"
 }
 
 # Handle Ctrl+C gracefully