pushwork 2.0.0-a.sub.1 → 2.0.0-preview.2

package/test/integration/conflict-resolution-test.sh

@@ -1,309 +0,0 @@
-#!/bin/bash
-
-# Conflict Resolution Test for Pushwork
-# Tests CRDT text merging where both changes are preserved
-
-set -e
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-NC='\033[0m'
-
-# Test configuration
-TEST_DIR="/tmp/pushwork-conflict-test"
-PUSHWORK_CMD="node $(pwd)/dist/cli.js"
-
-# Helper functions
-log_info() {
-    echo -e "${BLUE}[INFO]${NC} $1"
-}
-
-log_success() {
-    echo -e "${GREEN}[SUCCESS]${NC} $1"
-}
-
-log_error() {
-    echo -e "${RED}[ERROR]${NC} $1"
-}
-
-log_test() {
-    echo -e "${YELLOW}[TEST]${NC} $1"
-}
-
-# Cleanup function
-cleanup() {
-    log_info "Cleaning up test directory..."
-    rm -rf "$TEST_DIR"
-}
-
-# Setup function
-setup() {
-    log_info "Setting up conflict resolution test..."
-    
-    # Build the project
-    log_info "Building pushwork..."
-    npm run build
-    
-    # Clean up and create test directory
-    rm -rf "$TEST_DIR"
-    mkdir -p "$TEST_DIR"
-    cd "$TEST_DIR"
-    
-    log_info "Test directory: $TEST_DIR"
-}
-
-# Create initial repository with a test file
-create_initial_repo() {
-    log_info "=== Creating Initial Repository ==="
-    
-    mkdir alice-repo
-    cd alice-repo
-    
-    # Create a simple test file
-    cat > document.txt << EOF
-Original content
-This is the baseline version.
-EOF
-    
-    log_test "Initializing Alice's repository"
-    $PUSHWORK_CMD init .
-    
-    cd ..
-    log_success "Alice's repository created"
-}
-
-# Clone the repository
-clone_repository() {
-    log_info "=== Cloning Repository ==="
-    
-    cd alice-repo
-    ROOT_URL=$($PUSHWORK_CMD url .)
-    cd ..
-    
-    log_test "Cloning repository for Bob"
-    $PUSHWORK_CMD clone "$ROOT_URL" bob-repo
-    
-    log_success "Repository cloned successfully"
-    
-    # Verify initial content is identical
-    if cmp -s alice-repo/document.txt bob-repo/document.txt; then
-        log_success "Initial content is identical"
-    else
-        log_error "Initial content differs between repositories"
-        exit 1
-    fi
-}
-
-# Make conflicting edits
-make_conflicting_edits() {
-    log_info "=== Making Conflicting Edits ==="
-    
-    # Alice's changes
-    log_test "Alice adds her content"
-    cd alice-repo
-    cat >> document.txt << EOF
-Alice's addition: New feature implementation
-Alice's note: This adds user authentication
-EOF
-    
-    log_info "Alice's document:"
-    cat document.txt
-    echo ""
-    cd ..
-    
-    # Bob's changes
-    log_test "Bob adds different content"
-    cd bob-repo
-    cat >> document.txt << EOF
-Bob's addition: Performance optimization
-Bob's note: This improves response time
-EOF
-    
-    log_info "Bob's document:"
-    cat document.txt
-    echo ""
-    cd ..
-}
-
-# Test conflict resolution
-test_conflict_resolution() {
-    log_info "=== Testing CRDT Conflict Resolution ==="
-    
-    # Alice syncs first
-    log_test "Alice syncs first"
-    cd alice-repo
-    $PUSHWORK_CMD sync
-    log_success "Alice's changes synced"
-    cd ..
-    
-    # Bob syncs (this will merge with Alice's changes)
-    log_test "Bob syncs (CRDT merging will occur)"
-    cd bob-repo
-    $PUSHWORK_CMD sync
-    log_success "Bob's sync completed"
-    cd ..
-    
-    # Multiple sync rounds needed for full CRDT convergence
-    log_test "Alice syncs again to get Bob's changes"
-    cd alice-repo
-    $PUSHWORK_CMD sync
-    cd ..
-    
-    log_test "Bob syncs to pull merged result"
-    cd bob-repo
-    $PUSHWORK_CMD sync
-    cd ..
-    
-    log_test "Alice syncs final time for convergence"
-    cd alice-repo
-    $PUSHWORK_CMD sync
-    cd ..
-    
-    log_test "Bob syncs final time to ensure consistency"
-    cd bob-repo
-    $PUSHWORK_CMD sync
-    cd ..
-    
-    log_success "All sync operations completed - CRDT convergence achieved"
-}
-
-# Verify conflict resolution results
-verify_resolution_results() {
-    log_info "=== Verifying CRDT Merge Results ==="
-    
-    # Check what Alice has
-    log_test "Alice's final content:"
-    ALICE_CONTENT=$(cat alice-repo/document.txt)
-    cat alice-repo/document.txt
-    echo ""
-    
-    # Check what Bob has
-    log_test "Bob's final content:"
-    BOB_CONTENT=$(cat bob-repo/document.txt)
-    cat bob-repo/document.txt
-    echo ""
-    
-    # Verify both users' changes are preserved somewhere
-    BOTH_ALICE_AND_BOB_PRESERVED=false
-    
-    # Check if at least one repository has both Alice's and Bob's changes
-    if (echo "$ALICE_CONTENT" | grep -q "Alice's addition" && echo "$ALICE_CONTENT" | grep -q "Bob's addition") || \
-       (echo "$BOB_CONTENT" | grep -q "Alice's addition" && echo "$BOB_CONTENT" | grep -q "Bob's addition"); then
-        BOTH_ALICE_AND_BOB_PRESERVED=true
-        log_success "✅ Both Alice's and Bob's changes are preserved via CRDT merging"
-    fi
-    
-    # Check if repositories eventually converge to the same state
-    if cmp -s alice-repo/document.txt bob-repo/document.txt; then
-        log_success "✅ Both repositories have converged to identical content"
-        if [ "$BOTH_ALICE_AND_BOB_PRESERVED" = true ]; then
-            log_success "✅ Perfect CRDT behavior: Both changes preserved and repositories consistent"
-        fi
-    else
-        log_error "❌ Repositories still have different content after multiple sync rounds"
-        echo "This indicates a sync propagation bug in pushwork"
-        echo ""
-        echo "Alice's content:"
-        cat alice-repo/document.txt
-        echo ""
-        echo "Bob's content:"
-        cat bob-repo/document.txt
-        echo ""
-        
-        # Check if at least one has both changes
-        if [ "$BOTH_ALICE_AND_BOB_PRESERVED" = true ]; then
-            log_info "✅ CRDT merging is working (both changes preserved somewhere)"
-            log_info "❌ But sync propagation is incomplete - this is a bug to fix"
-        else
-            log_error "❌ Critical: Changes may have been lost completely"
-            exit 1
-        fi
-    fi
-    
-    # Detailed verification
-    if echo "$ALICE_CONTENT" | grep -q "Alice's addition" || echo "$BOB_CONTENT" | grep -q "Alice's addition"; then
-        log_success "✅ Alice's changes preserved"
-    else
-        log_error "❌ Alice's changes lost"
-        exit 1
-    fi
-    
-    if echo "$ALICE_CONTENT" | grep -q "Bob's addition" || echo "$BOB_CONTENT" | grep -q "Bob's addition"; then
-        log_success "✅ Bob's changes preserved"
-    else
-        log_error "❌ Bob's changes lost"
-        exit 1
-    fi
-}
-
-# Show final results
-show_results() {
-    log_info "=== Final Results ==="
-    
-    echo ""
-    echo "Alice's final document:"
-    echo "=============================="
-    cat alice-repo/document.txt
-    echo "=============================="
-    echo ""
-    
-    echo "Bob's final document:"
-    echo "=============================="
-    cat bob-repo/document.txt
-    echo "=============================="
-    
-    log_success "✅ CRDT conflict resolution test completed successfully!"
-    echo ""
-    echo "Key findings:"
-    echo "• Pushwork uses CRDT-based conflict resolution ✅"
-    echo "• Both users' changes are preserved through merging ✅"
-    echo "• No data loss occurs during conflicts ✅"
-    echo "• Text content is merged at the character level ✅"
-    echo "• Sync timing issue has been FIXED ✅"
-    echo ""
-    echo "Technical details:"
-    echo "• Fresh remote state detection after network sync ✅"
-    echo "• Proper CRDT merge propagation ✅"
-    echo "• Immediate convergence to consistent state ✅"
-    echo "• Both repositories end up identical ✅"
-    echo ""
-    echo "This demonstrates excellent collaborative editing capabilities!"
-}
-
-# Main test execution
-main() {
-    echo "=========================================="
-    echo "Pushwork CRDT Conflict Resolution Test"
-    echo "=========================================="
-    echo ""
-    echo "This test validates that:"
-    echo "1. Multiple users can edit the same file simultaneously"
-    echo "2. Conflicts are resolved through CRDT merging"
-    echo "3. Both users' changes are preserved"
-    echo "4. No data loss occurs during conflict resolution"
-    echo "5. Repositories eventually reach consistent state"
-    echo ""
-    
-    # Trap cleanup on exit
-    trap cleanup EXIT
-    
-    # Run the test
-    setup
-    create_initial_repo
-    clone_repository
-    make_conflicting_edits
-    test_conflict_resolution
-    verify_resolution_results
-    show_results
-    
-    echo ""
-    echo "=========================================="
-    echo "🎉 CRDT Conflict Resolution Test PASSED! 🎉"
-    echo "=========================================="
-}
-
-# Run the test
-main "$@" 

package/test/integration/debug-both-nested.sh

@@ -1,74 +0,0 @@
-#!/bin/bash
-set -e
-
-# Get absolute path to pushwork CLI
-PUSHWORK_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
-PUSHWORK_CLI="$PUSHWORK_ROOT/dist/cli.js"
-
-echo "=== Creating test repos ==="
-TESTDIR=$(mktemp -d)
-REPO_A="$TESTDIR/repo-a"
-REPO_B="$TESTDIR/repo-b"
-mkdir -p "$REPO_A" "$REPO_B"
-
-echo "=== Initializing repo A with a file ==="
-echo "initial" > "$REPO_A/initial.txt"
-cd "$REPO_A"
-node "$PUSHWORK_CLI" init .
-
-echo ""
-echo "=== Cloning to repo B ==="
-ROOT_URL=$(node "$PUSHWORK_CLI" url)
-echo "Root URL: $ROOT_URL"
-cd "$TESTDIR"
-node "$PUSHWORK_CLI" clone "$ROOT_URL" "$REPO_B"
-
-echo ""
-echo "=== On A: Try to editAndRename non-existent file ==="
-# This should be a no-op since tmjaz/namelye.txt doesn't exist
-echo "(This is a no-op since source doesn't exist)"
-
-echo ""
-echo "=== On B: Create file in 2-level nested subdirectory ==="
-mkdir -p "$REPO_B/rlpjug/ewsv"
-echo "" > "$REPO_B/rlpjug/ewsv/sneked.txt"
-
-echo ""
-echo "=== Sync round 1: A ==="
-cd "$REPO_A"
-node "$PUSHWORK_CLI" sync
-
-echo ""
-echo "=== Sync round 1: B ==="
-cd "$REPO_B"
-node "$PUSHWORK_CLI" sync
-
-echo ""
-echo "=== Sync round 2: A ==="
-cd "$REPO_A"
-node "$PUSHWORK_CLI" sync
-
-echo ""
-echo "=== Sync round 2: B ==="
-cd "$REPO_B"
-node "$PUSHWORK_CLI" sync
-
-echo ""
-echo "=== Verification ==="
-echo "Files in A:"
-find "$REPO_A" -type f \( -name "*.txt" -o -name "*.md" \) | grep -v "\.pushwork" | sed "s|$REPO_A/||" | sort
-
-echo ""
-echo "Files in B:"
-find "$REPO_B" -type f \( -name "*.txt" -o -name "*.md" \) | grep -v "\.pushwork" | sed "s|$REPO_B/||" | sort
-
-echo ""
-if [ -f "$REPO_A/rlpjug/ewsv/sneked.txt" ]; then
-  echo "✅ SUCCESS: B's nested file synced to A"
-else
-  echo "❌ FAILURE: B's nested file did NOT sync to A"
-fi
-
-echo ""
-echo "Test directory: $TESTDIR"
-

package/test/integration/debug-concurrent-nested.sh

@@ -1,87 +0,0 @@
-#!/bin/bash
-set -e
-
-# Get absolute path to pushwork CLI
-PUSHWORK_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
-PUSHWORK_CLI="$PUSHWORK_ROOT/dist/cli.js"
-
-echo "=== Creating test repos ==="
-TESTDIR=$(mktemp -d)
-REPO_A="$TESTDIR/repo-a"
-REPO_B="$TESTDIR/repo-b"
-mkdir -p "$REPO_A" "$REPO_B"
-
-echo "=== Initializing repo A with a file ==="
-echo "initial" > "$REPO_A/initial.txt"
-cd "$REPO_A"
-node "$PUSHWORK_CLI" init .
-
-echo ""
-echo "=== Cloning to repo B ==="
-ROOT_URL=$(node "$PUSHWORK_CLI" url)
-echo "Root URL: $ROOT_URL"
-cd "$TESTDIR"
-node "$PUSHWORK_CLI" clone "$ROOT_URL" "$REPO_B"
-
-echo ""
-echo "=== On A: Create file in nested directory dirA/subA ==="
-mkdir -p "$REPO_A/dirA/subA"
-echo "from A" > "$REPO_A/dirA/subA/fileA.txt"
-
-echo ""
-echo "=== On B: Create file in different nested directory dirB/subB ==="
-mkdir -p "$REPO_B/dirB/subB"
-echo "from B" > "$REPO_B/dirB/subB/fileB.txt"
-
-echo ""
-echo "=== Sync round 1: A (push A's nested file) ==="
-cd "$REPO_A"
-node "$PUSHWORK_CLI" sync
-
-echo ""
-echo "=== Sync round 1: B (push B's nested file, pull A's) ==="
-cd "$REPO_B"
-node "$PUSHWORK_CLI" sync
-
-echo ""
-echo "=== Sync round 2: A (pull B's nested file) ==="
-cd "$REPO_A"
-node "$PUSHWORK_CLI" sync
-
-echo ""
-echo "=== Sync round 2: B (confirm) ==="
-cd "$REPO_B"
-node "$PUSHWORK_CLI" sync
-
-echo ""
-echo "=== Verification ==="
-echo "Files in A:"
-find "$REPO_A" -type f \( -name "*.txt" -o -name "*.md" \) | grep -v "\.pushwork" | sed "s|$REPO_A/||" | sort
-
-echo ""
-echo "Files in B:"
-find "$REPO_B" -type f \( -name "*.txt" -o -name "*.md" \) | grep -v "\.pushwork" | sed "s|$REPO_B/||" | sort
-
-echo ""
-echo "Checking convergence:"
-A_HAS_A=$([ -f "$REPO_A/dirA/subA/fileA.txt" ] && echo YES || echo NO)
-A_HAS_B=$([ -f "$REPO_A/dirB/subB/fileB.txt" ] && echo YES || echo NO)
-B_HAS_A=$([ -f "$REPO_B/dirA/subA/fileA.txt" ] && echo YES || echo NO)
-B_HAS_B=$([ -f "$REPO_B/dirB/subB/fileB.txt" ] && echo YES || echo NO)
-
-echo "  A has its own file (dirA/subA/fileA.txt): $A_HAS_A"
-echo "  A has B's file (dirB/subB/fileB.txt): $A_HAS_B"
-echo "  B has A's file (dirA/subA/fileA.txt): $B_HAS_A"
-echo "  B has its own file (dirB/subB/fileB.txt): $B_HAS_B"
-
-if [ "$A_HAS_A" = "YES" ] && [ "$A_HAS_B" = "YES" ] && [ "$B_HAS_A" = "YES" ] && [ "$B_HAS_B" = "YES" ]; then
-  echo ""
-  echo "✅ SUCCESS: Both nested files synced correctly!"
-else
-  echo ""
-  echo "❌ FAILURE: Not all files synced"
-fi
-
-echo ""
-echo "Test directory: $TESTDIR"
-

package/test/integration/debug-nested.sh

@@ -1,73 +0,0 @@
-#!/bin/bash
-set -e
-
-# Get absolute path to pushwork CLI
-PUSHWORK_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
-PUSHWORK_CLI="$PUSHWORK_ROOT/dist/cli.js"
-
-echo "=== Creating test repos ==="
-TESTDIR=$(mktemp -d)
-REPO_A="$TESTDIR/repo-a"
-REPO_B="$TESTDIR/repo-b"
-mkdir -p "$REPO_A" "$REPO_B"
-
-echo "=== Initializing repo A with a file ==="
-echo "initial" > "$REPO_A/initial.txt"
-cd "$REPO_A"
-node "$PUSHWORK_CLI" init .
-
-echo ""
-echo "=== Cloning to repo B ==="
-ROOT_URL=$(node "$PUSHWORK_CLI" url)
-echo "Root URL: $ROOT_URL"
-cd "$TESTDIR"
-node "$PUSHWORK_CLI" clone "$ROOT_URL" "$REPO_B"
-
-echo ""
-echo "=== On B: Create file in 2-level nested subdirectory ==="
-mkdir -p "$REPO_B/rlpjug/ewsv"
-echo "" > "$REPO_B/rlpjug/ewsv/sneked.txt"
-
-echo ""
-echo "=== Sync round 1: A (no changes) ==="
-cd "$REPO_A"
-node "$PUSHWORK_CLI" sync
-
-echo ""
-echo "=== Sync round 1: B (push new nested file) ==="
-cd "$REPO_B"
-node "$PUSHWORK_CLI" sync
-
-echo ""
-echo "=== Sync round 2: A (pull B's changes) ==="
-cd "$REPO_A"
-node "$PUSHWORK_CLI" sync
-
-echo ""
-echo "=== Sync round 2: B (confirm) ==="
-cd "$REPO_B"
-node "$PUSHWORK_CLI" sync
-
-echo ""
-echo "=== Verification ==="
-echo "Files in A:"
-find "$REPO_A" -type f \( -name "*.txt" -o -name "*.md" \) | grep -v "\.pushwork" | sed "s|$REPO_A/||" | sort
-
-echo ""
-echo "Files in B:"
-find "$REPO_B" -type f \( -name "*.txt" -o -name "*.md" \) | grep -v "\.pushwork" | sed "s|$REPO_B/||" | sort
-
-echo ""
-if [ -f "$REPO_A/rlpjug/ewsv/sneked.txt" ]; then
-  echo "✅ SUCCESS: Nested file synced to A"
-else
-  echo "❌ FAILURE: Nested file did NOT sync to A"
-  echo ""
-  echo "Let's check if directories exist:"
-  echo "A has rlpjug dir: $([ -d "$REPO_A/rlpjug" ] && echo YES || echo NO)"
-  echo "A has rlpjug/ewsv dir: $([ -d "$REPO_A/rlpjug/ewsv" ] && echo YES || echo NO)"
-fi
-
-echo ""
-echo "Test directory: $TESTDIR"
-