s9n-devops-agent 1.2.1 → 1.3.3

package/src/session-coordinator.js

@@ -81,6 +81,14 @@ class SessionCoordinator {
 
   getRepoRoot() {
     try {
+      // Check if we're in a submodule
+      const superproject = execSync('git rev-parse --show-superproject-working-tree', { encoding: 'utf8' }).trim();
+      if (superproject) {
+        // We're in a submodule, use the parent repository root
+        console.log(`${CONFIG.colors.dim}Running from submodule, using parent repository: ${superproject}${CONFIG.colors.reset}`);
+        return superproject;
+      }
+      // Not in a submodule, use current repository root
       return execSync('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();
     } catch (error) {
       console.error('Error: Not in a git repository');
@@ -461,7 +469,13 @@ class SessionCoordinator {
     });
     
     console.log(`\n${CONFIG.colors.yellow}═══ Auto-merge Configuration ═══${CONFIG.colors.reset}`);
-    console.log(`${CONFIG.colors.dim}(Automatically merge today's work into a target branch)${CONFIG.colors.reset}`);
+    console.log(`${CONFIG.colors.dim}Automatically merge your daily work branches into a target branch.${CONFIG.colors.reset}`);
+    console.log();
+    console.log(`${CONFIG.colors.bright}How it works:${CONFIG.colors.reset}`);
+    console.log(`  • The agent creates dated branches (e.g., ${CONFIG.colors.blue}agent_dev_2025-10-01${CONFIG.colors.reset})`);
+    console.log(`  • At the end of each day, your work is automatically merged`);
+    console.log(`  • This keeps your target branch (main/develop) up to date`);
+    console.log(`  • Prevents accumulation of stale feature branches`);
     
     // Ask if they want auto-merge
     const autoMerge = await new Promise((resolve) => {
@@ -705,11 +719,47 @@ class SessionCoordinator {
     const branchName = `${agentType}/${devInitials}/${sessionId}/${task.replace(/\s+/g, '-')}`;
     
     try {
+      // Detect if we're in a submodule and get the parent repository
+      let repoRoot = process.cwd();
+      let isSubmodule = false;
+      let parentRemote = null;
+      
+      try {
+        // Check if we're in a submodule
+        execSync('git rev-parse --show-superproject-working-tree', { stdio: 'pipe' });
+        const superproject = execSync('git rev-parse --show-superproject-working-tree', { encoding: 'utf8' }).trim();
+        
+        if (superproject) {
+          isSubmodule = true;
+          // Get the parent repository's remote
+          parentRemote = execSync(`git -C "${superproject}" remote get-url origin`, { encoding: 'utf8' }).trim();
+          console.log(`\n${CONFIG.colors.yellow}Detected submodule - will configure worktree for parent repository${CONFIG.colors.reset}`);
+          console.log(`${CONFIG.colors.dim}Parent repository: ${superproject}${CONFIG.colors.reset}`);
+          console.log(`${CONFIG.colors.dim}Parent remote: ${parentRemote}${CONFIG.colors.reset}`);
+        }
+      } catch (e) {
+        // Not a submodule, continue normally
+      }
+      
       // Create worktree
       console.log(`\n${CONFIG.colors.yellow}Creating worktree...${CONFIG.colors.reset}`);
       execSync(`git worktree add -b ${branchName} "${worktreePath}" HEAD`, { stdio: 'pipe' });
       console.log(`${CONFIG.colors.green}✓${CONFIG.colors.reset} Worktree created at: ${worktreePath}`);
       
+      // If we're in a submodule, set up the correct remote for the worktree
+      if (isSubmodule && parentRemote) {
+        console.log(`${CONFIG.colors.yellow}Configuring worktree to use parent repository remote...${CONFIG.colors.reset}`);
+        // Remove the default origin that points to the submodule
+        try {
+          execSync(`git -C "${worktreePath}" remote remove origin`, { stdio: 'pipe' });
+        } catch (e) {
+          // Origin might not exist, continue
+        }
+        // Add the parent repository as origin
+        execSync(`git -C "${worktreePath}" remote add origin ${parentRemote}`, { stdio: 'pipe' });
+        console.log(`${CONFIG.colors.green}✓${CONFIG.colors.reset} Worktree configured to push to parent repository`);
+      }
+      
       // Create session lock
       const lockData = {
         sessionId,
@@ -747,7 +797,7 @@ class SessionCoordinator {
         branchName,
         lockFile,
         instructionsFile,
-        instructions: instructions.plaintext
+        task
       };
       
     } catch (error) {
@@ -757,7 +807,7 @@ class SessionCoordinator {
   }
 
   /**
-   * Generate instructions for Claude/Cline
+   * Generate instructions for the coding agent
    */
   generateClaudeInstructions(sessionData) {
     const { sessionId, worktreePath, branchName, task } = sessionData;
@@ -784,7 +834,29 @@ INSTRUCTIONS:
 - **Worktree Path:** \`${worktreePath}\`
 - **Branch:** \`${branchName}\`
 
-## Instructions for Claude/Cline
+## 🚨 CRITICAL: File Coordination Protocol
+
+**BEFORE editing any files, you MUST:**
+
+1. **Declare your intent** by creating:
+   \`\`\`json
+   // File: .file-coordination/active-edits/<agent>-${sessionId}.json
+   {
+     "agent": "<your-name>",
+     "session": "${sessionId}",
+     "files": ["list", "files", "to", "edit"],
+     "operation": "edit",
+     "reason": "${task}",
+     "declaredAt": "<ISO-8601-timestamp>",
+     "estimatedDuration": 300
+   }
+   \`\`\`
+
+2. **Check for conflicts** - read all files in \`.file-coordination/active-edits/\`
+3. **Only proceed if no conflicts** - wait or choose different files if blocked
+4. **Release files when done** - delete your declaration after edits
+
+## Instructions for Your Coding Agent
 
 ### Step 1: Navigate to Your Worktree
 \`\`\`bash
@@ -797,18 +869,25 @@ git branch --show-current
 # Should output: ${branchName}
 \`\`\`
 
-### Step 3: Work on Your Task
+### Step 3: Declare Files Before Editing
+Create your declaration in \`.file-coordination/active-edits/\`
+
+### Step 4: Work on Your Task
 Make changes for: **${task}**
 
-### Step 4: Commit Your Changes
+### Step 5: Commit Your Changes
 Write your commit message to the session-specific file:
 \`\`\`bash
 echo "feat: your commit message here" > .devops-commit-${sessionId}.msg
 \`\`\`
 
-### Step 5: Automatic Processing
+### Step 6: Release Your File Locks
+Delete your declaration from \`.file-coordination/active-edits/\`
+
+### Step 7: Automatic Processing
 The DevOps agent will automatically:
 - Detect your changes
+- Check for coordination conflicts
 - Read your commit message
 - Commit and push to the remote repository
 - Clear the message file
@@ -839,11 +918,11 @@ The DevOps agent will automatically:
    * Display instructions in a user-friendly format
    */
   displayInstructions(instructions, sessionId, task) {
-    console.log(`\n${CONFIG.colors.bgGreen}${CONFIG.colors.bright} Instructions for Claude/Cline ${CONFIG.colors.reset}\n`);
+    console.log(`\n${CONFIG.colors.bgGreen}${CONFIG.colors.bright} Instructions for Your Coding Agent ${CONFIG.colors.reset}\n`);
     
     // Clean separator
     console.log(`${CONFIG.colors.yellow}══════════════════════════════════════════════════════════════${CONFIG.colors.reset}`);
-    console.log(`${CONFIG.colors.bright}COPY AND PASTE THIS ENTIRE BLOCK INTO CLAUDE BEFORE YOUR PROMPT:${CONFIG.colors.reset}`);
+    console.log(`${CONFIG.colors.bright}COPY AND PASTE THIS ENTIRE BLOCK INTO YOUR CODING AGENT BEFORE YOUR PROMPT:${CONFIG.colors.reset}`);
     console.log(`${CONFIG.colors.yellow}──────────────────────────────────────────────────────────────${CONFIG.colors.reset}`);
     console.log();
     
@@ -853,17 +932,33 @@ The DevOps agent will automatically:
     console.log(`- Working Directory: ${instructions.worktreePath}`);
     console.log(`- Task: ${task || 'development'}`);
     console.log(``);
-    console.log(`Please switch to this directory before making any changes:`);
-    console.log(`cd "${instructions.worktreePath}"`);
+    console.log(`⚠️  IMPORTANT: DO NOT start working yet! Wait for the user's specific instructions.`);
+    console.log(``);
+    console.log(`CRITICAL FIRST STEP:`);
+    console.log(`1. Read and follow the house rules: cat "${instructions.worktreePath}/houserules.md"`);
+    console.log(`2. Switch to the working directory: cd "${instructions.worktreePath}"`);
+    console.log(``);
+    console.log(`FILE COORDINATION PROTOCOL (from house rules at ${instructions.worktreePath}/houserules.md):`);
+    console.log(`Before editing ANY files, you MUST:`);
+    console.log(`- Declare your intent in .file-coordination/active-edits/<agent>-${sessionId}.json`);
+    console.log(`- Check for conflicts with other agents`);
+    console.log(`- Only edit files you've declared`);
+    console.log(`- Release files when done`);
     console.log(``);
     console.log(`Write commit messages to: .devops-commit-${sessionId}.msg`);
     console.log(`The DevOps agent will automatically commit and push changes.`);
+    console.log(``);
+    console.log(`Remember: ALWAYS check house rules first, then WAIT for user instructions!`);
     console.log();
     
     console.log(`${CONFIG.colors.yellow}══════════════════════════════════════════════════════════════${CONFIG.colors.reset}`);
+    console.log();
+    
+    // Pause before continuing
+    console.log(`${CONFIG.colors.dim}Press Enter to start the DevOps agent monitoring...${CONFIG.colors.reset}`);
     
     // Status info
-    console.log(`\n${CONFIG.colors.green}✓ DevOps agent is starting...${CONFIG.colors.reset}`);
+    console.log(`${CONFIG.colors.green}✓ DevOps agent is starting...${CONFIG.colors.reset}`);
     console.log(`${CONFIG.colors.dim}Full instructions saved to: ${CONFIG.instructionsDir}/${sessionId}.md${CONFIG.colors.reset}`);
   }
 
@@ -1025,11 +1120,11 @@ The DevOps agent is monitoring this worktree for changes.
     fs.writeFileSync(lockFile, JSON.stringify(session, null, 2));
     
     const instructions = this.generateClaudeInstructions(session);
-    this.displayInstructions(instructions, session.sessionId, session.task);
+    // Don't display instructions here - they'll be shown after agent starts
     
     return {
       ...session,
-      instructions: instructions.plaintext
+      instructions: instructions
     };
   }
 
@@ -1178,11 +1273,21 @@ The DevOps agent is monitoring this worktree for changes.
     
     console.log(`\n${CONFIG.colors.yellow}Starting agent for session ${session.sessionId}...${CONFIG.colors.reset}`);
     
-    // Wait a moment for user to see instructions
-    await new Promise(resolve => setTimeout(resolve, 2000));
-    
+    // Start the agent first
     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');
+    
     return session;
   }
   

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

@@ -735,7 +735,8 @@ export AC_MSG_MIN_BYTES="20"
 export AC_DEBOUNCE_MS="1500"
 export AC_MSG_DEBOUNCE_MS="3000"
 export AC_CLEAR_MSG_WHEN="push"
-export AC_ROLLOVER_PROMPT="true"
+# Daily rollover is automatic - no prompting needed
+export AC_ROLLOVER_PROMPT="false"
 export AC_DEBUG="false"
 
 # Check for debug flag
@@ -784,7 +785,8 @@ AC_MSG_DEBOUNCE_MS=3000
 
 # Behavior
 AC_CLEAR_MSG_WHEN=push
-AC_ROLLOVER_PROMPT=true
+# Daily rollover is automatic
+AC_ROLLOVER_PROMPT=false
 AC_DEBUG=false
 `;
   
@@ -826,7 +828,7 @@ function printInstructions(initials) {
   log.title('🎯 Daily Workflow:');
   console.log('');
   console.log(`• Your daily branches will be: ${colors.bright}dev_${initials}_YYYY-MM-DD${colors.reset}`);
-  console.log('• The worker handles day rollover automatically');
+  console.log('• The worker automatically creates new daily branches at midnight');
   console.log('• Commits require valid conventional format (feat/fix/docs/etc)');
   console.log('• Message file is cleared after successful push');
   console.log('');

package/start-devops-session.sh

@@ -12,21 +12,27 @@
 #
 # ============================================================================
 
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;36m'
-MAGENTA='\033[0;35m'
-BOLD='\033[1m'
-DIM='\033[2m'
-NC='\033[0m' # No Color
-BG_BLUE='\033[44m'
-BG_GREEN='\033[42m'
-BG_YELLOW='\033[43m'
+# Colors for output (using printf for better compatibility)
+RED=$'\033[0;31m'
+GREEN=$'\033[0;32m'
+YELLOW=$'\033[1;33m'
+BLUE=$'\033[0;36m'
+MAGENTA=$'\033[0;35m'
+BOLD=$'\033[1m'
+DIM=$'\033[2m'
+NC=$'\033[0m' # No Color
+BG_BLUE=$'\033[44m'
+BG_GREEN=$'\033[42m'
+BG_YELLOW=$'\033[43m'
 
-# Get the directory where this script is located
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+# Get the directory where this script is located (compatible with both bash and zsh)
+if [[ -n "${BASH_SOURCE[0]}" ]]; then
+    # Running in bash
+    SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+else
+    # Running in zsh
+    SCRIPT_DIR="${0:A:h}"
+fi
 SRC_DIR="$SCRIPT_DIR/src"
 
 # Function to display copyright
@@ -64,10 +70,10 @@ display_instructions() {
     local task="$4"
     
     echo
-    echo -e "${BG_GREEN}${BOLD} Instructions for Claude/Cline ${NC}"
+    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 CLAUDE BEFORE YOUR PROMPT:${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:"
@@ -215,7 +221,7 @@ select_session() {
         echo
         echo -e "${GREEN}Using existing session: ${session_id}${NC}"
         
-        # Display instructions for Claude/Cline IMMEDIATELY after selection
+        # Display instructions for coding agent IMMEDIATELY after selection
         display_instructions "$session_id" "$worktree_path" "$branch_name" "$task"
         
         # Add a pause and visual separator before starting the agent
@@ -237,6 +243,167 @@ select_session() {
     fi
 }
 
+# Function to setup house rules and file coordination
+setup_house_rules() {
+    local ROOT="$1"
+    local COORD_DIR="$ROOT/.file-coordination"
+    
+    # Check if we need to update existing house rules (even if coordination is set up)
+    if [[ -f "$SCRIPT_DIR/src/house-rules-manager.js" ]]; then
+        # Check status of house rules
+        local STATUS=$(node "$SCRIPT_DIR/src/house-rules-manager.js" status 2>/dev/null || echo '{"needsUpdate": false, "exists": true}')
+        local NEEDS_UPDATE=$(echo "$STATUS" | grep -o '"needsUpdate"[[:space:]]*:[[:space:]]*true' || echo "")
+        local EXISTS=$(echo "$STATUS" | grep -o '"exists"[[:space:]]*:[[:space:]]*true' || echo "")
+        
+        # Check if house rules were deleted (coordination exists but house rules don't)
+        if [[ -d "$COORD_DIR" ]] && [[ -z "$EXISTS" ]]; then
+            echo -e "${YELLOW}⚠ House rules file appears to be missing!${NC}"
+            echo "The file coordination system is set up, but house rules are gone."
+            echo
+            echo -n "Recreate house rules? (Y/n): "
+            read RECREATE
+            if [[ "${RECREATE}" != "n" ]] && [[ "${RECREATE}" != "N" ]]; then
+                echo -e "${BLUE}Recreating house rules...${NC}"
+                node "$SCRIPT_DIR/src/house-rules-manager.js" update 2>/dev/null
+                echo -e "${GREEN}✓ House rules recreated!${NC}"
+                echo
+            fi
+        elif [[ -n "$NEEDS_UPDATE" ]]; then
+            echo -e "${YELLOW}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+            echo -e "${BOLD}House Rules Update Available${NC}"
+            echo -e "${YELLOW}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+            echo
+            echo "The DevOps Agent has updated house rules sections."
+            echo "Your custom rules will be preserved."
+            echo
+            echo -n "Update house rules now? (Y/n): "
+            read UPDATE_CHOICE
+            
+            if [[ "${UPDATE_CHOICE}" != "n" ]] && [[ "${UPDATE_CHOICE}" != "N" ]]; then
+                echo -e "${BLUE}Updating house rules...${NC}"
+                node "$SCRIPT_DIR/src/house-rules-manager.js" update
+                echo -e "${GREEN}✓ House rules updated!${NC}"
+                echo
+            fi
+        fi
+    fi
+    
+    # Check if coordination system is already set up
+    if [[ -d "$COORD_DIR" ]] && [[ -f "$ROOT/check-file-availability.sh" ]]; then
+        return 0  # Already set up
+    fi
+    
+    echo -e "${YELLOW}═══════════════════════════════════════════════════════════${NC}"
+    echo -e "${BOLD}First-time Setup: House Rules & File Coordination${NC}"
+    echo -e "${YELLOW}═══════════════════════════════════════════════════════════${NC}"
+    echo
+    echo "House rules help AI agents understand your project conventions and"
+    echo "prevent conflicts when multiple agents work on the same codebase."
+    echo
+    
+    # Check for existing house rules
+    local HOUSERULES_PATH=""
+    local HOUSERULES_FOUND=false
+    
+    # Function to search for house rules file
+    find_house_rules() {
+        local search_dir="$1"
+        local depth="${2:-0}"
+        
+        # Limit search depth
+        if [[ $depth -gt 5 ]]; then
+            return 1
+        fi
+        
+        # First check standard locations
+        for possible_path in "houserules.md" "HOUSERULES.md" ".github/HOUSERULES.md" "docs/houserules.md" "docs/HOUSERULES.md"; do
+            if [[ -f "$search_dir/$possible_path" ]]; then
+                echo "$search_dir/$possible_path"
+                return 0
+            fi
+        done
+        
+        # If not found, search recursively (excluding DevOps directories)
+        while IFS= read -r -d '' file; do
+            local rel_path="${file#$search_dir/}"
+            if [[ ! "$file" =~ "DevOpsAgent" ]] && 
+               [[ ! "$file" =~ "CS_DevOpsAgent" ]] && 
+               [[ ! "$file" =~ "node_modules" ]] && 
+               [[ ! "$file" =~ ".git" ]]; then
+                echo "$file"
+                return 0
+            fi
+        done < <(find "$search_dir" -maxdepth 3 -type f \( -iname "houserules.md" -o -iname "HOUSERULES.md" \) -print0 2>/dev/null)
+        
+        return 1
+    }
+    
+    # Search for house rules file
+    if FOUND_PATH=$(find_house_rules "$ROOT"); then
+        HOUSERULES_PATH="$FOUND_PATH"
+        HOUSERULES_FOUND=true
+        # Make path relative for display
+        local REL_PATH="${FOUND_PATH#$ROOT/}"
+        echo -e "${GREEN}✓${NC} Found existing house rules at: $REL_PATH"
+    else
+        echo "No existing house rules found."
+        echo
+        echo "Would you like to:"
+        echo "  ${BOLD}1)${NC} Create comprehensive house rules (recommended)"
+        echo "  ${BOLD}2)${NC} Specify path to existing house rules"
+        echo "  ${BOLD}3)${NC} Skip for now"
+        echo
+        echo -n "Your choice [1]: "
+        read CHOICE
+        
+        case "${CHOICE:-1}" in
+            1)
+                HOUSERULES_PATH="$ROOT/houserules.md"
+                HOUSERULES_FOUND=false
+                echo -e "${GREEN}✓${NC} Will create comprehensive house rules at: houserules.md"
+                ;;
+            2)
+                echo -n "Enter path to your house rules (relative to $ROOT): "
+                read CUSTOM_PATH
+                if [[ -f "$ROOT/$CUSTOM_PATH" ]]; then
+                    HOUSERULES_PATH="$ROOT/$CUSTOM_PATH"
+                    HOUSERULES_FOUND=true
+                    echo -e "${GREEN}✓${NC} Using house rules at: $CUSTOM_PATH"
+                else
+                    echo -e "${YELLOW}File not found. Creating new house rules at: houserules.md${NC}"
+                    HOUSERULES_PATH="$ROOT/houserules.md"
+                    HOUSERULES_FOUND=false
+                fi
+                ;;
+            3)
+                echo -e "${YELLOW}⚠ Skipping house rules setup${NC}"
+                echo "You can set them up later by running: ./scripts/setup-file-coordination.sh"
+                return 0
+                ;;
+        esac
+    fi
+    
+    echo
+    echo -e "${BLUE}Setting up file coordination system...${NC}"
+    
+    # Run the actual setup inline (simplified version)
+    if [[ -f "$SCRIPT_DIR/scripts/setup-file-coordination.sh" ]]; then
+        # Pass the house rules path we already found!
+        HOUSERULES_PATH="$HOUSERULES_PATH" bash "$SCRIPT_DIR/scripts/setup-file-coordination.sh"
+    else
+        # Inline setup if script doesn't exist
+        mkdir -p "$COORD_DIR/active-edits" "$COORD_DIR/completed-edits"
+        echo -e "${GREEN}✓${NC} File coordination directories created"
+    fi
+    
+    echo
+    echo -e "${GREEN}✓ Setup complete!${NC} AI agents will now follow house rules and coordinate file edits."
+    echo
+    echo -e "${DIM}Press Enter to continue...${NC}"
+    read -r
+    echo
+}
+
 # Main function
 main() {
     # Show copyright first
@@ -256,11 +423,14 @@ main() {
     REPO_ROOT=$(git rev-parse --show-toplevel)
     cd "$REPO_ROOT"
     
+    # Check and setup house rules on first run
+    setup_house_rules "$REPO_ROOT"
+    
     echo -e "${BOLD}Welcome to DevOps Agent Session Manager${NC}"
     echo
     echo "This tool will:"
     echo "  1. Help you create or select a session"
-    echo "  2. Generate instructions for Claude/Cline"
+    echo "  2. Generate instructions for your coding agent"
     echo "  3. Start the DevOps agent to monitor changes"
     echo