s9n-devops-agent 1.4.9 → 1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s9n-devops-agent",
-  "version": "1.4.9",
+  "version": "1.5.1",
   "description": "CS_DevOpsAgent - Intelligent Git Automation System with multi-agent support and session management",
   "type": "module",
   "main": "src/cs-devops-agent-worker.js",

package/src/session-coordinator.js

@@ -879,7 +879,7 @@ class SessionCoordinator {
     // Check for Docker configuration and ask about restart preference
     let dockerConfig = null;
     
-    // Check if user has already set "Never ask" preference
+    // Check if user has already set "Never ask" preference (ONCE, at the top)
     const projectSettings = this.loadProjectSettings();
     if (projectSettings.dockerConfig && projectSettings.dockerConfig.neverAsk === true) {
       // User selected 'Never' - skip Docker configuration entirely
@@ -888,6 +888,7 @@ class SessionCoordinator {
       const dockerInfo = hasDockerConfiguration(process.cwd());
       
       if (dockerInfo.hasCompose || dockerInfo.hasDockerfile) {
+        // Docker detected - show what we found and ask about restart preferences
         console.log(`\n${CONFIG.colors.yellow}Docker Configuration Detected${CONFIG.colors.reset}`);
         
         if (dockerInfo.hasCompose) {
@@ -901,36 +902,49 @@ class SessionCoordinator {
           console.log(`${CONFIG.colors.dim}Found Dockerfile${CONFIG.colors.reset}`);
         }
         
+        // promptForDockerConfig already handles Y/N/A/Never options
         dockerConfig = await this.promptForDockerConfig();
+      } else if (projectSettings.dockerConfig && projectSettings.dockerConfig.alwaysEnabled) {
+        // Use saved configuration even if Docker not auto-detected
+        console.log(`\n${CONFIG.colors.dim}Using saved Docker configuration${CONFIG.colors.reset}`);
+        dockerConfig = projectSettings.dockerConfig;
       } else {
-        // No Docker configuration found - check saved preference first
-        // CRITICAL: Check neverAsk before any prompting
-        if (projectSettings.dockerConfig && projectSettings.dockerConfig.neverAsk === true) {
-          // User selected 'Never' - skip Docker configuration entirely
+        // No Docker detected and no saved preference - ask user
+        const rl = readline.createInterface({
+          input: process.stdin,
+          output: process.stdout
+        });
+        
+        console.log(`\n${CONFIG.colors.yellow}No Docker Configuration Found${CONFIG.colors.reset}`);
+        console.log(`${CONFIG.colors.dim}I couldn't find any docker-compose files in:${CONFIG.colors.reset}`);
+        console.log(`${CONFIG.colors.dim}  • Project directory${CONFIG.colors.reset}`);
+        console.log(`${CONFIG.colors.dim}  • Parent directory${CONFIG.colors.reset}`);
+        console.log(`${CONFIG.colors.dim}  • Parent/Infrastructure or parent/infrastructure${CONFIG.colors.reset}`);
+        console.log();
+        console.log(`${CONFIG.colors.bright}Options:${CONFIG.colors.reset}`);
+        console.log(`  ${CONFIG.colors.green}Y${CONFIG.colors.reset}) Yes - I have a Docker setup to configure`);
+        console.log(`  ${CONFIG.colors.red}N${CONFIG.colors.reset}) No - Skip for this session`);
+        console.log(`  ${CONFIG.colors.magenta}Never${CONFIG.colors.reset}) Never ask again (permanently disable)`);
+        
+        const answer = await new Promise((resolve) => {
+          rl.question(`\nDo you have a Docker setup? (Y/N/Never) [N]: `, (ans) => {
+            resolve(ans.trim().toLowerCase());
+          });
+        });
+        
+        // Handle 'Never' option
+        if (answer === 'never' || answer === 'nev') {
+          rl.close();
+          projectSettings.dockerConfig = {
+            enabled: false,
+            neverAsk: true
+          };
+          this.saveProjectSettings(projectSettings);
+          console.log(`${CONFIG.colors.dim}Docker configuration disabled permanently. Edit local_deploy/project-settings.json to change.${CONFIG.colors.reset}`);
           dockerConfig = { enabled: false, neverAsk: true };
-        } else if (projectSettings.dockerConfig && projectSettings.dockerConfig.alwaysEnabled) {
-          // Use saved configuration even if Docker not auto-detected
-          console.log(`\n${CONFIG.colors.dim}Using saved Docker configuration${CONFIG.colors.reset}`);
-          dockerConfig = projectSettings.dockerConfig;
         } else {
-          // Prompt user
-          const rl = readline.createInterface({
-            input: process.stdin,
-            output: process.stdout
-          });
-          
-          console.log(`\n${CONFIG.colors.yellow}No Docker Configuration Found${CONFIG.colors.reset}`);
-          console.log(`${CONFIG.colors.dim}I couldn't find any docker-compose files in:${CONFIG.colors.reset}`);
-          console.log(`${CONFIG.colors.dim}  • Project directory${CONFIG.colors.reset}`);
-          console.log(`${CONFIG.colors.dim}  • Parent directory${CONFIG.colors.reset}`);
-          console.log(`${CONFIG.colors.dim}  • Parent/Infrastructure or parent/infrastructure${CONFIG.colors.reset}`);
-          
-          const hasDocker = await new Promise((resolve) => {
-            rl.question(`\nDo you have a Docker setup you'd like to configure? (y/N): `, (answer) => {
-              resolve(answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes');
-            });
-          });
-          
+          const hasDocker = answer === 'y' || answer === 'yes';
+        
           if (hasDocker) {
             const dockerPath = await new Promise((resolve) => {
               rl.question(`\nEnter the full path to your docker-compose file: `, (answer) => {
@@ -1551,20 +1565,14 @@ The DevOps agent is monitoring this worktree for changes.
     
     console.log(`\n${CONFIG.colors.yellow}Starting agent for session ${session.sessionId}...${CONFIG.colors.reset}`);
     
-    // Start the agent first
+    // Start the agent
     await this.startAgent(session.sessionId);
     
     // Wait for agent to initialize and show its interactive commands
     await new Promise(resolve => setTimeout(resolve, 3000));
     
-    // Now display the instructions AFTER the agent is running
-    console.log('\n'.repeat(2)); // Add some spacing
-    // Create instructions object with worktreePath for display
-    const instructionsForDisplay = {
-      worktreePath: session.worktreePath,
-      sessionId: session.sessionId
-    };
-    this.displayInstructions(instructionsForDisplay, session.sessionId, options.task || 'development');
+    // Instructions were already displayed by createSession() - no need to display again
+    // This prevents duplicate copy-paste instructions
     
     return session;
   }

package/start-devops-session.sh

@@ -41,7 +41,7 @@ show_copyright() {
     echo "======================================================================"
     echo
     echo "  CS_DevOpsAgent - Intelligent Git Automation System"
-    echo "  Version 1.4.9 | Build 20251009.1"
+    echo "  Version 1.5.1 | Build 20251009.3"
     echo "  "
     echo "  Copyright (c) 2024 SecondBrain Labs"
     echo "  Author: Sachin Dev Duggal"
@@ -62,36 +62,8 @@ show_header() {
     echo
 }
 
-# Function to display session instructions
-display_instructions() {
-    local session_id="$1"
-    local worktree_path="$2"
-    local branch_name="$3"
-    local task="$4"
-    
-    echo
-    echo -e "${BG_GREEN}${BOLD} Instructions for Your Coding Agent ${NC}"
-    echo
-    echo -e "${YELLOW}══════════════════════════════════════════════════════════════${NC}"
-    echo -e "${BOLD}COPY AND PASTE THIS ENTIRE BLOCK INTO YOUR CODING AGENT BEFORE YOUR PROMPT:${NC}"
-    echo -e "${YELLOW}──────────────────────────────────────────────────────────────${NC}"
-    echo
-    echo "I'm working in a DevOps-managed session with the following setup:"
-    echo "- Session ID: ${session_id}"
-    echo "- Working Directory: ${worktree_path}"
-    echo "- Task: ${task}"
-    echo ""
-    echo "Please switch to this directory before making any changes:"
-    echo "cd \"${worktree_path}\""
-    echo ""
-    echo "Write commit messages to: .devops-commit-${session_id}.msg"
-    echo "The DevOps agent will automatically commit and push changes."
-    echo
-    echo -e "${YELLOW}══════════════════════════════════════════════════════════════${NC}"
-    echo
-    echo -e "${GREEN}✓ DevOps agent will monitor for changes${NC}"
-    echo
-}
+# NOTE: display_instructions function removed - session coordinator handles this now
+# to prevent duplicate copy-paste instructions
 
 # Function to list existing sessions
 list_sessions() {