apt-ostree/find-working-branch.sh

#!/bin/bash

echo "=== Finding Branch with Today's Working Daemon ==="

# Function to check if this branch has today's work
check_todays_work() {
    local branch=$1
    echo "Checking branch: $branch"
    
    # Check for key files that indicate today's work
    if [ -f "src/oci.rs" ]; then
        echo "  ✅ Has OCI integration (src/oci.rs)"
    else
        echo "  ❌ Missing OCI integration"
        return 1
    fi
    
    if grep -q "bubblewrap" src/package_manager.rs 2>/dev/null; then
        echo "  ✅ Has bubblewrap integration"
    else
        echo "  ❌ Missing bubblewrap integration"
        return 1
    fi
    
    if grep -q "daemon" src/bin/simple-cli.rs 2>/dev/null; then
        echo "  ✅ Has daemon mode commands"
    else
        echo "  ❌ Missing daemon mode commands"
        return 1
    fi
    
    # Test daemon functionality
    echo "  Testing daemon..."
    cargo build --release --bin apt-ostree > /dev/null 2>&1
    if [ $? -ne 0 ]; then
        echo "  ❌ Build failed"
        return 1
    fi
    
    sudo cp target/release/apt-ostree /usr/bin/apt-ostree
    
    # Kill existing daemon
    sudo pkill -f apt-ostreed 2>/dev/null || true
    sleep 2
    
    # Start daemon
    sudo /usr/libexec/apt-ostreed > /dev/null 2>&1 &
    DAEMON_PID=$!
    sleep 3
    
    # Test ping
    PING_RESULT=$(apt-ostree daemon-ping 2>&1)
    if [ $? -eq 0 ]; then
        echo "  ✅ Daemon working: $PING_RESULT"
        sudo kill $DAEMON_PID 2>/dev/null || true
        return 0
    else
        echo "  ❌ Daemon not working: $PING_RESULT"
        sudo kill $DAEMON_PID 2>/dev/null || true
        return 1
    fi
}

# Get current branch
CURRENT_BRANCH=$(git branch --show-current)
echo "Current branch: $CURRENT_BRANCH"

# Check current branch first
echo ""
echo "1. Checking current branch..."
if check_todays_work "$CURRENT_BRANCH"; then
    echo ""
    echo "🎉 Current branch has today's working daemon!"
    echo "You're all set!"
    exit 0
else
    echo "Current branch does not have today's work"
fi

# Check other branches
echo ""
echo "2. Checking other branches..."

# Check main branch
if git show-ref --verify --quiet refs/heads/main && [ "$CURRENT_BRANCH" != "main" ]; then
    echo ""
    echo "Checking main branch..."
    git checkout main
    if check_todays_work "main"; then
        echo ""
        echo "🎉 Main branch has today's working daemon!"
        echo "You can stay on main or merge it back to $CURRENT_BRANCH"
        echo ""
        echo "To merge back:"
        echo "  git checkout $CURRENT_BRANCH"
        echo "  git merge main"
        exit 0
    fi
    git checkout $CURRENT_BRANCH
fi

# Check master branch
if git show-ref --verify --quiet refs/heads/master && [ "$CURRENT_BRANCH" != "master" ]; then
    echo ""
    echo "Checking master branch..."
    git checkout master
    if check_todays_work "master"; then
        echo ""
        echo "🎉 Master branch has today's working daemon!"
        echo "You can stay on master or merge it back to $CURRENT_BRANCH"
        echo ""
        echo "To merge back:"
        echo "  git checkout $CURRENT_BRANCH"
        echo "  git merge master"
        exit 0
    fi
    git checkout $CURRENT_BRANCH
fi

# Check for stashes
echo ""
echo "3. Checking for stashed changes..."
if git stash list | grep -q .; then
    echo "Found stashes:"
    git stash list
    echo ""
    echo "You might have today's work stashed. To apply:"
    echo "  git stash pop"
else
    echo "No stashes found"
fi

echo ""
echo "❌ No branch has today's working daemon"
echo ""
echo "Options:"
echo "1. Check git reflog for recent commits: git reflog"
echo "2. Look for uncommitted changes: git status"
echo "3. Check if work is in a different repository"
echo "4. Recreate the fixes (we have the knowledge now)"