fix: Resolve merge conflicts + add session URL to WhatsApp

- Fix ralph.ts swarm-test command closure
- Resolve conflict markers in git-workflow-manager.ts
- Resolve conflict markers in ralph-stackmemory-bridge.ts
- Add Claude session URL to WhatsApp notification messages

Author: jonathanpeterwu

src/cli/commands/ralph.ts

@@ -890,11 +890,7 @@ export function createRalphCommand(): Command {
 
           const loopId = options.loopId || 'current';
           await ralphDebugger.startDebugSession(loopId, '.ralph');
-<<<<<<< HEAD
-          
-=======
 
->>>>>>> swarm/developer-implement-core-feature
           if (options.generateReport) {
             const report = await ralphDebugger.generateDebugReport(loopId);
             console.log(`📋 Debug report generated: ${report.exportPath}`);
@@ -914,7 +910,6 @@ export function createRalphCommand(): Command {
       });
     });
 
-<<<<<<< HEAD
   // Swarm testing and validation command
   ralph
     .command('swarm-test')
@@ -1114,7 +1109,8 @@ export function createRalphCommand(): Command {
           process.exit(1);
         }
       });
-=======
+    });
+
   // TUI command for real-time monitoring
   ralph
     .command('tui')
@@ -1168,7 +1164,6 @@ export function createRalphCommand(): Command {
         console.log('💡 Try: stackmemory ralph tui --simple');
         process.exit(1);
       }
->>>>>>> swarm/developer-implement-core-feature
     });
 
   return ralph;

src/integrations/ralph/bridge/ralph-stackmemory-bridge.ts

@@ -92,14 +92,12 @@ export class RalphStackMemoryBridge {
 
       this.state.currentSession = session;
 
-<<<<<<< HEAD
       // Initialize frame manager with database
       const dbAdapter = await this.getDatabaseAdapter();
       await dbAdapter.connect();
       const db = (dbAdapter as any).db; // Get the actual Database instance
       const projectId = path.basename(this.ralphDir);
       this.frameManager = new FrameManager(db, projectId, { skipContextBridge: true });
-=======
       // Initialize frame manager with session database if required
       if (this.requiresDatabase) {
         if (session.database && session.projectId) {
@@ -122,7 +120,6 @@ export class RalphStackMemoryBridge {
           'Running without StackMemory database (useStackMemory: false)'
         );
       }
->>>>>>> swarm/developer-implement-core-feature
 
       // Check for existing loop or create new
       if (options?.loopId) {

src/integrations/ralph/swarm/git-workflow-manager.ts

@@ -270,18 +270,15 @@ export class GitWorkflowManager {
 
   // Private helper methods
   private getCurrentBranch(): string {
-<<<<<<< HEAD
     try {
       return execSync('git rev-parse --abbrev-ref HEAD', { encoding: 'utf8' }).trim();
     } catch (error: unknown) {
       logger.warn('Failed to get current branch', error as Error);
       return 'main';
     }
-=======
     return execSync('git rev-parse --abbrev-ref HEAD', {
       encoding: 'utf8',
     }).trim();
->>>>>>> swarm/developer-implement-core-feature
   }
 
   private getMainBranch(): string {

templates/claude-hooks/notify-review-hook.js

@@ -277,6 +277,11 @@ function sendNotification(notification) {
     }
   }
 
+  // Add session link if available
+  if (notification.sessionId) {
+    message += `\n\nSession: https://claude.ai/share/${notification.sessionId}`;
+  }
+
   const postData = new URLSearchParams({
     From: numbers.from,
     To: numbers.to,
@@ -341,6 +346,7 @@ process.stdin.on('end', () => {
     const notification = shouldNotify(tool_name, tool_input, tool_output);
 
     if (notification) {
+      notification.sessionId = hookData.session_id;
       sendNotification(notification);
     }