s9n-devops-agent 1.3.1 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s9n-devops-agent",
-  "version": "1.3.1",
+  "version": "1.3.4",
   "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/house-rules-manager.js

@@ -16,6 +16,7 @@ import path from 'path';
 import crypto from 'crypto';
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
+import { execSync } from 'child_process';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -112,15 +113,63 @@ To prevent conflicts with other agents editing the same files, you MUST follow t
 
 class HouseRulesManager {
   constructor(projectRoot) {
-    this.projectRoot = projectRoot || process.cwd();
+    const cwd = projectRoot || process.cwd();
+    
+    // If we're running from within a DevOpsAgent directory, we need to find the parent project
+    if (cwd.includes('/DevOpsAgent') || cwd.includes('/CS_DevOpsAgent')) {
+      // Parse the path to find where the DevOpsAgent directory is
+      const pathParts = cwd.split(path.sep);
+      
+      // Find the index of DevOpsAgent or CS_DevOpsAgent
+      let targetIndex = -1;
+      for (let i = pathParts.length - 1; i >= 0; i--) {
+        if (pathParts[i] === 'CS_DevOpsAgent' || pathParts[i] === 'DevOpsAgent') {
+          targetIndex = i;
+          break;
+        }
+      }
+      
+      // If found, use the parent directory as the project root
+      if (targetIndex > 0) {
+        // Check if the parent directory is 'Scripts_Dev' or similar subdirectory
+        // If so, go up one more level to reach the actual project root
+        let parentIndex = targetIndex;
+        if (targetIndex > 1 && (pathParts[targetIndex - 1] === 'Scripts_Dev' || 
+                                pathParts[targetIndex - 1] === 'scripts' || 
+                                pathParts[targetIndex - 1] === 'tools')) {
+          parentIndex = targetIndex - 1;
+        }
+        this.projectRoot = pathParts.slice(0, parentIndex).join(path.sep);
+      } else {
+        // Fallback: try to use git to find the parent repo
+        try {
+          const gitRoot = execSync('git rev-parse --show-toplevel', { cwd, encoding: 'utf8' }).trim();
+          // Only use git root if it's not a DevOpsAgent directory
+          if (!gitRoot.includes('/DevOpsAgent') && !gitRoot.includes('/CS_DevOpsAgent')) {
+            this.projectRoot = gitRoot;
+          } else {
+            // Use parent of cwd
+            this.projectRoot = path.dirname(path.dirname(cwd));
+          }
+        } catch (err) {
+          // Default to parent of parent directory
+          this.projectRoot = path.dirname(path.dirname(cwd));
+        }
+      }
+    } else {
+      this.projectRoot = cwd;
+    }
+    
     this.houseRulesPath = null;
     this.findHouseRulesFile();
   }
 
   /**
    * Find existing house rules file
+   * Searches across the repository, excluding the DevOps agent directories
    */
   findHouseRulesFile() {
+    // First try the standard locations
     const possiblePaths = [
       'houserules.md',
       'HOUSERULES.md',
@@ -132,11 +181,81 @@ class HouseRulesManager {
     for (const relativePath of possiblePaths) {
       const fullPath = path.join(this.projectRoot, relativePath);
       if (fs.existsSync(fullPath)) {
+        // NEVER use house rules from within DevOpsAgent directories
+        if (fullPath.includes('/DevOpsAgent/') || fullPath.includes('/CS_DevOpsAgent/')) {
+          continue;
+        }
+        
         this.houseRulesPath = fullPath;
+        // Only log if not running as CLI
+        if (!process.argv[1]?.endsWith('house-rules-manager.js')) {
+          console.log(`Found house rules at: ${fullPath}`);
+        }
         return fullPath;
       }
     }
 
+    // If not found in standard locations, search the repository
+    // excluding DevOps agent directories
+    const foundPath = this.searchForHouseRules(this.projectRoot);
+    if (foundPath) {
+      this.houseRulesPath = foundPath;
+      // Only log if not running as CLI
+      if (!process.argv[1]?.endsWith('house-rules-manager.js')) {
+        console.log(`Found house rules at: ${foundPath}`);
+      }
+      return foundPath;
+    }
+
+    return null;
+  }
+
+  /**
+   * Recursively search for house rules files
+   * @param {string} dir Directory to search
+   * @param {number} depth Current depth (to prevent infinite recursion)
+   * @returns {string|null} Path to house rules file or null
+   */
+  searchForHouseRules(dir, depth = 0) {
+    // Limit search depth to prevent excessive recursion
+    if (depth > 5) return null;
+
+    try {
+      const files = fs.readdirSync(dir);
+      
+      for (const file of files) {
+        const filePath = path.join(dir, file);
+        const stat = fs.statSync(filePath);
+        
+        // Check if it's a house rules file
+        if (stat.isFile() && /^houserules\.md$/i.test(file)) {
+          // Skip if it's in a DevOps agent directory
+          if (!filePath.includes('DevOpsAgent') && 
+              !filePath.includes('CS_DevOpsAgent') &&
+              !filePath.includes('node_modules') &&
+              !filePath.includes('.git')) {
+            return filePath;
+          }
+        }
+        
+        // Recursively search subdirectories
+        if (stat.isDirectory() && 
+            !file.startsWith('.') && 
+            file !== 'node_modules' && 
+            file !== 'DevOpsAgent' &&
+            file !== 'CS_DevOpsAgent' &&
+            file !== '.git') {
+          const found = this.searchForHouseRules(filePath, depth + 1);
+          if (found) return found;
+        }
+      }
+    } catch (err) {
+      // Ignore permission errors and continue searching
+      if (err.code !== 'EACCES' && err.code !== 'EPERM') {
+        console.error(`Error searching ${dir}:`, err.message);
+      }
+    }
+    
     return null;
   }
 
@@ -306,8 +425,24 @@ ${endMarker}`;
 
     // Create backup if requested
     if (backupExisting) {
-      const backupPath = `${this.houseRulesPath}.backup.${Date.now()}`;
+      // Create backup in DevopsAgent_Backups folder
+      const backupDir = path.join(this.projectRoot, 'DevopsAgent_Backups');
+      if (!fs.existsSync(backupDir)) {
+        fs.mkdirSync(backupDir, { recursive: true });
+        // Ensure backup folder is in gitignore
+        this.ensureBackupInGitignore();
+      }
+      
+      const timestamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, -5);
+      const backupFileName = `houserules_backup_${timestamp}.md`;
+      const backupPath = path.join(backupDir, backupFileName);
+      
       fs.copyFileSync(this.houseRulesPath, backupPath);
+      
+      // Only log if not running as CLI
+      if (!process.argv[1]?.endsWith('house-rules-manager.js')) {
+        console.log(`Backup created: ${backupPath}`);
+      }
     }
 
     // Build new content
@@ -367,6 +502,33 @@ ${endMarker}`;
     };
   }
 
+  /**
+   * Ensure backup folder is in gitignore
+   */
+  ensureBackupInGitignore() {
+    const gitignorePath = path.join(this.projectRoot, '.gitignore');
+    const backupPattern = 'DevopsAgent_Backups/';
+    
+    try {
+      if (fs.existsSync(gitignorePath)) {
+        const content = fs.readFileSync(gitignorePath, 'utf8');
+        
+        // Check if pattern already exists
+        if (!content.includes(backupPattern)) {
+          // Add to gitignore
+          const updatedContent = content.trimEnd() + '\n\n# DevOps Agent backup files\n' + backupPattern + '\n';
+          fs.writeFileSync(gitignorePath, updatedContent);
+        }
+      } else {
+        // Create gitignore with the pattern
+        const content = '# DevOps Agent backup files\n' + backupPattern + '\n';
+        fs.writeFileSync(gitignorePath, content);
+      }
+    } catch (err) {
+      // Silently fail - not critical if gitignore can't be updated
+    }
+  }
+
   /**
    * Get status of house rules
    */
@@ -422,22 +584,27 @@ ${endMarker}`;
 export default HouseRulesManager;
 
 // CLI interface when run directly
-if (import.meta.url === `file://${process.argv[1]}`) {
+// Check if this is the main module being run
+const isMainModule = import.meta.url === `file://${process.argv[1]}` || 
+                     process.argv[1]?.endsWith('house-rules-manager.js');
+
+if (isMainModule) {
   const manager = new HouseRulesManager();
   const command = process.argv[2];
 
   switch (command) {
     case 'status':
-      console.log('House Rules Status:', JSON.stringify(manager.getStatus(), null, 2));
+      // Output only the JSON for the bash script to parse
+      console.log(JSON.stringify(manager.getStatus()));
       break;
       
     case 'update':
       manager.updateHouseRules().then(result => {
-        console.log('Update Result:', JSON.stringify(result, null, 2));
+        console.log(JSON.stringify(result));
       });
       break;
       
     default:
       console.log('Usage: node house-rules-manager.js [status|update]');
   }
-}
+}

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');
@@ -711,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,
@@ -753,7 +797,7 @@ class SessionCoordinator {
         branchName,
         lockFile,
         instructionsFile,
-        instructions: instructions.plaintext
+        task
       };
       
     } catch (error) {
@@ -763,7 +807,7 @@ class SessionCoordinator {
   }
 
   /**
-   * Generate instructions for Claude/Cline
+   * Generate instructions for the coding agent
    */
   generateClaudeInstructions(sessionData) {
     const { sessionId, worktreePath, branchName, task } = sessionData;
@@ -812,7 +856,7 @@ INSTRUCTIONS:
 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 Claude/Cline
+## Instructions for Your Coding Agent
 
 ### Step 1: Navigate to Your Worktree
 \`\`\`bash
@@ -874,11 +918,15 @@ 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`);
+    // Get the parent repository root (where the session was started from)
+    const parentRepoRoot = process.cwd();
+    const houseRulesPath = path.join(parentRepoRoot, 'houserules.md');
+    
+    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();
     
@@ -888,11 +936,13 @@ The DevOps agent will automatically:
     console.log(`- Working Directory: ${instructions.worktreePath}`);
     console.log(`- Task: ${task || 'development'}`);
     console.log(``);
+    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(`1. Read and follow the house rules: cat "${houseRulesPath}"`);
     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(`FILE COORDINATION PROTOCOL (from house rules at ${houseRulesPath}):`);
     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`);
@@ -902,13 +952,17 @@ The DevOps agent will automatically:
     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 for the latest protocols!`);
+    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}`);
   }
 
@@ -1070,11 +1124,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
     };
   }
 
@@ -1223,11 +1277,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/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:"
@@ -154,7 +160,7 @@ create_new_session() {
     echo -e "${YELLOW}Creating session for: ${task_name}${NC}"
     
     # Run the session coordinator to create AND START the session
-    cd "$SCRIPT_DIR"
+    # Keep current directory to ensure session is created for the right repo
     node "$SRC_DIR/session-coordinator.js" create-and-start --task "$task_name" --agent "$agent_type"
 }
 
@@ -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
@@ -228,7 +234,7 @@ select_session() {
         echo -e "${YELLOW}═══════════════════════════════════════════════════════════${NC}"
         
         # Start the agent for this session
-        cd "$SCRIPT_DIR"
+        # Keep current directory to ensure agent runs in the right repo
         node "$SRC_DIR/session-coordinator.js" start "$session_id"
         return 0
     else
@@ -299,22 +305,46 @@ setup_house_rules() {
     local HOUSERULES_PATH=""
     local HOUSERULES_FOUND=false
     
-    if [[ -f "$ROOT/houserules.md" ]]; then
-        HOUSERULES_PATH="$ROOT/houserules.md"
-        HOUSERULES_FOUND=true
-        echo -e "${GREEN}✓${NC} Found existing house rules at: houserules.md"
-    elif [[ -f "$ROOT/HOUSERULES.md" ]]; then
-        HOUSERULES_PATH="$ROOT/HOUSERULES.md"
-        HOUSERULES_FOUND=true
-        echo -e "${GREEN}✓${NC} Found existing house rules at: HOUSERULES.md"
-    elif [[ -f "$ROOT/.github/HOUSERULES.md" ]]; then
-        HOUSERULES_PATH="$ROOT/.github/HOUSERULES.md"
-        HOUSERULES_FOUND=true
-        echo -e "${GREEN}✓${NC} Found existing house rules at: .github/HOUSERULES.md"
-    elif [[ -f "$ROOT/docs/houserules.md" ]]; then
-        HOUSERULES_PATH="$ROOT/docs/houserules.md"
+    # 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
-        echo -e "${GREEN}✓${NC} Found existing house rules at: docs/houserules.md"
+        # 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
@@ -358,7 +388,8 @@ setup_house_rules() {
     
     # Run the actual setup inline (simplified version)
     if [[ -f "$SCRIPT_DIR/scripts/setup-file-coordination.sh" ]]; then
-        bash "$SCRIPT_DIR/scripts/setup-file-coordination.sh"
+        # 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"
@@ -399,7 +430,7 @@ main() {
     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