Add conflict resolution diff UI and app branding

scripts/README.md

@@ -1,4 +1,4 @@
-# MD Hub Secure - Development Scripts
+# Cairnquire - Development Scripts
 
 This directory contains helper scripts for monitoring development progress.
 

scripts/install-monitor.sh

@@ -1,16 +1,16 @@
 #!/bin/bash
-# MD Hub Secure - Install Monitor
+# Cairnquire - Install Monitor
 # Sets up the progress monitor to run in the background
 
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_DIR="/Users/tim/developer/md-hub-secure"
+PROJECT_DIR="/Users/tim/developer/cairnquire"
 MONITOR_SCRIPT="$SCRIPT_DIR/monitor.sh"
 PID_FILE="$PROJECT_DIR/.monitor.pid"
 LOG_FILE="$PROJECT_DIR/monitor.log"
 
-echo "MD Hub Secure - Monitor Installation"
+echo "Cairnquire - Monitor Installation"
 echo "===================================="
 echo ""
 

scripts/monitor.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
-# MD Hub Secure - Progress Monitor
+# Cairnquire - Progress Monitor
 # Watches the project directory and updates docs/STATUS.md with progress
 # Exits if no filesystem changes detected between iterations
 
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_DIR="/Users/tim/developer/md-hub-secure"
+PROJECT_DIR="/Users/tim/developer/cairnquire"
 DOCS_DIR="$PROJECT_DIR/docs"
 STATUS_FILE="$DOCS_DIR/STATUS.md"
 HASH_FILE="$DOCS_DIR/.last_state_hash"
@@ -293,7 +293,7 @@ EOF
 
 ---
 
-*This report auto-generated by MD Hub Secure progress monitor.*  
+*This report auto-generated by Cairnquire progress monitor.*  
 *Next update in ~10 minutes or when filesystem changes detected.*
 EOF
 
@@ -302,7 +302,7 @@ EOF
 
 # Main monitoring loop
 main() {
-    log "Starting MD Hub Secure progress monitor..."
+    log "Starting Cairnquire progress monitor..."
     log "Project: $PROJECT_DIR"
     log "Watching for filesystem changes every 10 minutes"
     log "Press Ctrl+C to stop, or wait for auto-exit on inactivity"

scripts/status.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
-# MD Hub Secure - Quick status check
+# Cairnquire - Quick status check
 
-STATUS_FILE="/Users/tim/developer/md-hub-secure/docs/STATUS.md"
-PID_FILE="/Users/tim/developer/md-hub-secure/.monitor.pid"
+STATUS_FILE="/Users/tim/developer/cairnquire/docs/STATUS.md"
+PID_FILE="/Users/tim/developer/cairnquire/.monitor.pid"
 
 echo ""
 if [[ -f "$PID_FILE" ]]; then