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

package/src/utils/trace.ts

@@ -1,70 +0,0 @@
-import { out } from "./output.js";
-
-/**
- * Global tracing state
- */
-let tracingEnabled = false;
-
-/**
- * Enable or disable tracing
- */
-export function setTracingEnabled(enabled: boolean): void {
-  tracingEnabled = enabled;
-}
-
-/**
- * Check if tracing is enabled
- */
-export function isTracingEnabled(): boolean {
-  return tracingEnabled;
-}
-
-/**
- * Trace a span of work by outputting to console
- * Works for both sync and async functions
- * Only outputs if tracing is enabled
- *
- * Usage:
- *   await span("operation", async () => { ... })
- *   span("operation", () => { ... })
- */
-export function span<T>(
-  name: string,
-  fn: () => T | Promise<T>
-): T | Promise<T> {
-  if (!tracingEnabled) {
-    return fn();
-  }
-
-  const start = performance.now();
-  const result = fn();
-
-  // Check if it's a promise (async)
-  if (result instanceof Promise) {
-    return result.then((value) => {
-      const duration = performance.now() - start;
-      out.taskLine(`${name} (${formatDuration(duration)})`, true);
-      return value;
-    }) as T;
-  }
-
-  // Sync case
-  const duration = performance.now() - start;
-  out.taskLine(`${name} (${formatDuration(duration)})`, true);
-  return result;
-}
-
-/**
- * Format duration for display
- */
-function formatDuration(ms: number): string {
-  if (ms < 1) {
-    return `${ms.toFixed(2)}ms`;
-  } else if (ms < 1000) {
-    return `${Math.round(ms)}ms`;
-  } else if (ms < 2000) {
-    return `${(ms / 1000).toFixed(2)}s`;
-  } else {
-    return `${(ms / 1000).toFixed(1)}s`;
-  }
-}

package/test/integration/README.md

@@ -1,328 +0,0 @@
-# Integration Tests
-
-This directory contains comprehensive integration tests for the pushwork sync tool.
-
-## Quick Start
-
-From the project root directory:
-
-```bash
-# Run all tests with the test runner
-./test/run-tests.sh
-
-# Run specific test suites
-./test/run-tests.sh clone     # Clone functionality tests
-./test/run-tests.sh conflict  # CRDT conflict resolution tests
-./test/run-tests.sh full      # Full integration tests
-./test/run-tests.sh unit      # Unit tests
-```
-
-## Test Scripts
-
-### 1. Test Runner (`../run-tests.sh`)
-
-Main entry point for running all tests. Provides:
-
-- Dependency checking
-- Multiple test suite options
-- Consistent output formatting
-- Error handling
-
-### 2. Full Integration Test (`full-integration-test.sh`)
-
-Comprehensive test suite covering all major functionality:
-
-**Features Tested:**
-
-- ✅ Help commands for all CLI commands
-- ✅ Init with default and custom sync servers
-- ✅ Clone with default and custom sync servers
-- ✅ Status, diff, commit, and sync operations
-- ✅ Error handling and parameter validation
-- ✅ File operations (create, modify, delete)
-- ✅ Bidirectional sync scenarios
-
-**Test Sections:**
-
-1. Help Commands - Verify all --help options work
-2. Init Functionality - Test directory initialization
-3. Status Functionality - Test status reporting
-4. Commit Functionality - Test local commits
-5. Sync Functionality - Test sync operations
-6. Diff Functionality - Test change detection
-7. Clone Functionality - Test cloning repositories
-8. Bidirectional Sync - Test multi-directory sync
-9. File Operations - Test various file types and operations
-
-### 3. Clone Test (`clone-test.sh`)
-
-Focused test suite specifically for clone functionality:
-
-**Features Tested:**
-
-- ✅ Clone with default sync server settings
-- ✅ Clone with custom sync server and storage ID
-- ✅ Parameter validation (sync server options must be used together)
-- ✅ Force overwrite functionality
-- ✅ Configuration verification in cloned repositories
-- ✅ Error handling for invalid scenarios
-- ✅ Status and diff operations in cloned directories
-
-**Test Sections:**
-
-1. Clone Functionality - All clone scenarios
-2. Cloned Directory Status - Operations in cloned repos
-3. Configuration Comparison - Verify settings propagation
-
-### 4. CRDT Conflict Resolution Test (`conflict-resolution-test.sh`)
-
-Specialized test demonstrating pushwork's excellent CRDT-based conflict resolution capabilities:
-
-**Features Tested:**
-
-- ✅ Create repository with initial document
-- ✅ Clone repository to second location
-- ✅ Make simultaneous conflicting edits on both sides
-- ✅ Verify CRDT text merging preserves ALL changes
-- ✅ Validate that no data is lost during conflicts
-- ✅ Confirm true collaborative editing capabilities
-
-**Test Scenario:**
-
-1. Alice creates a document with baseline content
-2. Bob clones Alice's repository
-3. Both users make different additions to the same file simultaneously
-4. Alice syncs her changes first
-5. Bob syncs his changes (CRDT merging occurs)
-6. Final sync rounds ensure eventual consistency
-7. **Result**: Bob's repository contains BOTH Alice's AND Bob's changes
-8. **Demonstrates**: True CRDT collaborative editing without data loss
-
-**Key Findings:**
-
-- ✅ Pushwork uses character-level CRDT text merging
-- ✅ Both users' contributions are preserved automatically
-- ✅ No manual conflict resolution required
-- ✅ Immediate convergence to consistent state
-- ✅ Sync timing issue has been resolved
-- Repositories eventually converge to consistent state
-
-## Test Configuration
-
-### Required Dependencies
-
-- **Node.js** - For running pushwork CLI
-- **npm** - For building the project
-
-### Optional Dependencies
-
-- **jq** - For advanced JSON parsing in configuration tests (tests will be skipped if not available)
-
-Install jq (optional):
-
-```bash
-# macOS
-brew install jq
-
-# Ubuntu/Debian
-sudo apt-get install jq
-
-# Other platforms
-# See: https://stedolan.github.io/jq/download/
-```
-
-### Test Environment
-
-- Tests run in isolated temporary directories
-- Automatic cleanup on completion
-- No modification of project files
-- Safe to run multiple times
-
-### Test Parameters
-
-```bash
-# Default test configuration
-TEST_DIR="/tmp/pushwork-*-test"
-CUSTOM_SYNC_SERVER="ws://localhost:3030"
-CUSTOM_STORAGE_ID="1d89eba7-f7a4-4e8e-80f2-5f4e2406f507"
-```
-
-## Understanding Test Output
-
-### Log Levels
-
-- 🔵 **[INFO]** - General information
-- 🟡 **[TEST]** - Test being executed
-- 🟢 **[PASS]** - Test passed
-- 🔴 **[FAIL]** - Test failed
-- 🟡 **[WARN]** - Warning (non-critical)
-
-### Test Results
-
-Each test script provides a summary:
-
-```
-======================================
-Test Results Summary
-======================================
-Tests Run:    45
-Tests Passed: 43
-Tests Failed: 2
-```
-
-## Running Individual Tests
-
-### Full Integration Test
-
-```bash
-./test/integration/full-integration-test.sh
-```
-
-### Clone Test
-
-```bash
-./test/integration/clone-test.sh
-```
-
-### With Verbose Output
-
-```bash
-# Remove `> /dev/null 2>&1` redirections in scripts for verbose output
-# Or modify the log functions to always show output
-```
-
-## Test Coverage
-
-### ✅ Covered Functionality
-
-- All CLI commands and help output
-- Directory initialization (init)
-- Repository cloning (clone) - **NEW**
-- Sync operations (sync, status, diff, commit)
-- Parameter validation
-- Error handling for common scenarios
-- File operations and change detection
-- Configuration management
-- Custom sync server support - **NEW**
-
-### ⚠️ Known Limitations
-
-- Network sync requires actual connectivity
-- Some tests skip when dependencies missing (jq)
-- Limited testing of concurrent operations
-- Performance testing not included
-
-## Troubleshooting
-
-### Common Issues
-
-**"jq: command not found"**
-
-```bash
-# Install jq (see dependencies section above)
-brew install jq  # macOS
-```
-
-**"Permission denied"**
-
-```bash
-# Make scripts executable
-chmod +x test/integration/*.sh
-chmod +x test/run-tests.sh
-```
-
-**"Not in project directory"**
-
-```bash
-# Run from project root where package.json exists
-cd /path/to/pushwork
-./test/run-tests.sh
-```
-
-**Tests failing unexpectedly**
-
-```bash
-# Check if project builds
-npm run build
-
-# Check if CLI works
-node dist/cli.js --help
-```
-
-### Debug Mode
-
-To see more detailed output, modify the test scripts to remove output redirection:
-
-```bash
-# Change this:
-if $PUSHWORK_CMD init . > /dev/null 2>&1; then
-
-# To this:
-if $PUSHWORK_CMD init .; then
-```
-
-## Adding New Tests
-
-### Test Script Template
-
-```bash
-#!/bin/bash
-set -e
-
-# Test configuration
-TEST_DIR="/tmp/my-test"
-PUSHWORK_CMD="node $(pwd)/dist/cli.js"
-
-# Colors and logging functions
-RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[1;33m'
-BLUE='\033[0;34m'; NC='\033[0m'
-
-log_info() { echo -e "${BLUE}[INFO]${NC} $1"; }
-log_success() { echo -e "${GREEN}[PASS]${NC} $1"; }
-log_error() { echo -e "${RED}[FAIL]${NC} $1"; }
-log_test() { echo -e "${YELLOW}[TEST]${NC} $1"; }
-
-# Cleanup
-cleanup() { rm -rf "$TEST_DIR"; }
-trap cleanup EXIT
-
-# Test logic here
-setup_test_environment
-run_tests
-```
-
-### Guidelines
-
-1. Use consistent naming patterns
-2. Include both positive and negative test cases
-3. Test error conditions thoroughly
-4. Provide clear test descriptions
-5. Clean up resources properly
-6. Use the established logging format
-
-## Integration with CI/CD
-
-These tests are designed to be run in automated environments:
-
-```bash
-# In your CI pipeline
-./test/run-tests.sh full
-```
-
-Exit codes:
-
-- `0` - All tests passed
-- `1` - Some tests failed
-- Non-zero - Setup or dependency errors
-
-## Contributing
-
-When adding new features to pushwork:
-
-1. **Add integration tests** for new CLI commands
-2. **Update existing tests** if command behavior changes
-3. **Test error scenarios** - not just happy paths
-4. **Document test coverage** in this README
-5. **Verify tests pass** before submitting PRs
-
-The integration tests serve as both testing and documentation for how the CLI should behave.

package/test/integration/clone-test.sh

@@ -1,310 +0,0 @@
-#!/bin/bash
-
-# Focused Clone Functionality Test for Pushwork
-# Tests the clone command with various sync server configurations
-
-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-clone-test"
-PUSHWORK_CMD="node $(pwd)/dist/cli.js"
-CUSTOM_SYNC_SERVER="ws://localhost:3030"
-CUSTOM_STORAGE_ID="1d89eba7-f7a4-4e8e-80f2-5f4e2406f507"
-
-# Helper functions
-log_info() {
-    echo -e "${BLUE}[INFO]${NC} $1"
-}
-
-log_success() {
-    echo -e "${GREEN}[PASS]${NC} $1"
-}
-
-log_error() {
-    echo -e "${RED}[FAIL]${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 clone test environment..."
-    
-    # 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 a test repository to clone from
-create_test_repo() {
-    log_info "Creating test repository..."
-    
-    mkdir source-repo
-    cd source-repo
-    
-    # Add some test files
-    echo "Hello from source repo" > hello.txt
-    echo "# Test Repository" > README.md
-    mkdir -p docs
-    echo "Documentation content" > docs/guide.md
-    
-    # Initialize with default settings
-    $PUSHWORK_CMD init .
-    
-    cd ..
-    
-    log_success "Test repository created"
-}
-
-# Test clone functionality
-test_clone_functionality() {
-    log_info "=== Testing Clone Functionality ==="
-    
-    cd source-repo
-    
-    # Get the root URL from the repository
-    if [ -f .pushwork/snapshot.json ]; then
-        ROOT_URL=$($PUSHWORK_CMD url .)
-        
-        if [ -n "$ROOT_URL" ]; then
-            cd ..
-            
-            log_test "Clone with default settings"
-            if $PUSHWORK_CMD clone "$ROOT_URL" clone-default; then
-                log_success "Clone with default settings"
-                
-                # Verify cloned content
-                if [ -f clone-default/hello.txt ] && [ -f clone-default/README.md ]; then
-                    log_success "Cloned files are present"
-                else
-                    log_error "Cloned files are missing"
-                fi
-                
-                # Check configuration
-                if [ -f clone-default/.pushwork/config.json ]; then
-                    if grep -q "wss://sync3.automerge.org" clone-default/.pushwork/config.json; then
-                        log_success "Default sync server in config"
-                    else
-                        log_error "Default sync server not found in config"
-                    fi
-                fi
-            else
-                log_error "Clone with default settings failed"
-            fi
-            
-            log_test "Clone with custom sync server"
-            if $PUSHWORK_CMD clone "$ROOT_URL" clone-custom --sync-server "$CUSTOM_SYNC_SERVER" --sync-server-storage-id "$CUSTOM_STORAGE_ID"; then
-                log_success "Clone with custom sync server"
-                
-                # Verify custom configuration
-                if [ -f clone-custom/.pushwork/config.json ]; then
-                    if grep -q "$CUSTOM_SYNC_SERVER" clone-custom/.pushwork/config.json; then
-                        log_success "Custom sync server in config"
-                    else
-                        log_error "Custom sync server not found in config"
-                    fi
-                    
-                    if grep -q "$CUSTOM_STORAGE_ID" clone-custom/.pushwork/config.json; then
-                        log_success "Custom storage ID in config"
-                    else
-                        log_error "Custom storage ID not found in config"
-                    fi
-                fi
-            else
-                log_error "Clone with custom sync server failed"
-            fi
-            
-            # Test error cases
-            log_test "Clone with incomplete sync server options"
-            
-            # Only sync server (should fail)
-            if $PUSHWORK_CMD clone "$ROOT_URL" clone-fail1 --sync-server "$CUSTOM_SYNC_SERVER" 2>/dev/null; then
-                log_error "Clone with only sync-server should have failed"
-            else
-                log_success "Clone correctly failed with only sync-server"
-            fi
-            
-            # Only storage ID (should fail)
-            if $PUSHWORK_CMD clone "$ROOT_URL" clone-fail2 --sync-server-storage-id "$CUSTOM_STORAGE_ID" 2>/dev/null; then
-                log_error "Clone with only storage-id should have failed"
-            else
-                log_success "Clone correctly failed with only storage-id"
-            fi
-            
-            # Test force overwrite
-            mkdir -p existing-dir
-            echo "existing content" > existing-dir/existing.txt
-            
-            log_test "Clone to non-empty directory without force"
-            if $PUSHWORK_CMD clone "$ROOT_URL" existing-dir 2>/dev/null; then
-                log_error "Clone to non-empty directory should have failed"
-            else
-                log_success "Clone correctly failed for non-empty directory"
-            fi
-            
-            log_test "Clone to non-empty directory with force"
-            if $PUSHWORK_CMD clone "$ROOT_URL" existing-dir --force; then
-                log_success "Clone with force succeeded"
-                
-                # Check that original files were replaced
-                if [ -f existing-dir/hello.txt ]; then
-                    log_success "Force clone replaced existing content"
-                else
-                    log_error "Force clone did not replace content properly"
-                fi
-            else
-                log_error "Clone with force failed"
-            fi
-            
-        else
-            log_error "No valid root URL found"
-        fi
-    else
-        log_error "Snapshot missing - repository not properly initialized"
-    fi
-    
-    cd ..
-}
-
-# Test status commands in cloned directories
-test_cloned_directory_status() {
-    log_info "=== Testing Status in Cloned Directories ==="
-    
-    if [ -d clone-default ]; then
-        cd clone-default
-        
-        log_test "Status in cloned directory"
-        if $PUSHWORK_CMD status; then
-            log_success "Status command works in cloned directory"
-        else
-            log_error "Status command failed in cloned directory"
-        fi
-        
-        # Make some changes and test
-        echo "Modified in clone" >> hello.txt
-        echo "New file in clone" > new-file.txt
-        
-        log_test "Status after changes in clone"
-        if $PUSHWORK_CMD status; then
-            log_success "Status shows changes in clone"
-        else
-            log_error "Status failed to show changes"
-        fi
-        
-        log_test "Diff in cloned directory"
-        if $PUSHWORK_CMD diff --name-only; then
-            log_success "Diff command works in cloned directory"
-        else
-            log_error "Diff command failed in cloned directory"
-        fi
-        
-        cd ..
-    else
-        log_error "Clone directory not available for status testing"
-    fi
-}
-
-# Compare configurations between source and cloned repos
-compare_configurations() {
-    log_info "=== Comparing Configurations ==="
-    
-    if [ -f source-repo/.pushwork/config.json ] && [ -f clone-default/.pushwork/config.json ]; then
-        log_test "Comparing default clone configuration"
-        
-        if command -v jq &> /dev/null; then
-            SOURCE_SYNC_SERVER=$(jq -r '.sync_server' source-repo/.pushwork/config.json 2>/dev/null || echo "")
-            CLONE_SYNC_SERVER=$(jq -r '.sync_server' clone-default/.pushwork/config.json 2>/dev/null || echo "")
-            
-            if [ "$SOURCE_SYNC_SERVER" = "$CLONE_SYNC_SERVER" ]; then
-                log_success "Sync server matches between source and clone"
-            else
-                log_error "Sync server differs: source=[$SOURCE_SYNC_SERVER] clone=[$CLONE_SYNC_SERVER]"
-            fi
-        else
-            log_success "Sync server comparison (jq not available)"
-        fi
-    fi
-    
-    if [ -f clone-custom/.pushwork/config.json ]; then
-        log_test "Verifying custom clone configuration"
-        
-        if command -v jq &> /dev/null; then
-            CUSTOM_CLONE_SERVER=$(jq -r '.sync_server' clone-custom/.pushwork/config.json 2>/dev/null || echo "")
-            CUSTOM_CLONE_STORAGE=$(jq -r '.sync_server_storage_id' clone-custom/.pushwork/config.json 2>/dev/null || echo "")
-            
-            if [ "$CUSTOM_CLONE_SERVER" = "$CUSTOM_SYNC_SERVER" ]; then
-                log_success "Custom sync server correctly set in clone"
-            else
-                log_error "Custom sync server incorrect: expected=[$CUSTOM_SYNC_SERVER] actual=[$CUSTOM_CLONE_SERVER]"
-            fi
-            
-            if [ "$CUSTOM_CLONE_STORAGE" = "$CUSTOM_STORAGE_ID" ]; then
-                log_success "Custom storage ID correctly set in clone"
-            else
-                log_error "Custom storage ID incorrect: expected=[$CUSTOM_STORAGE_ID] actual=[$CUSTOM_CLONE_STORAGE]"
-            fi
-        else
-            log_success "Custom configuration verification (jq not available)"
-        fi
-    fi
-}
-
-# Main test execution
-main() {
-    echo "======================================"
-    echo "Pushwork Clone Functionality Test"
-    echo "======================================"
-    
-    # Trap cleanup on exit
-    trap cleanup EXIT
-    
-    # Setup
-    setup
-    
-    # Create test repository
-    create_test_repo
-    
-    # Run clone tests
-    test_clone_functionality
-    test_cloned_directory_status
-    compare_configurations
-    
-    echo ""
-    echo "======================================"
-    echo "Clone Test Complete"
-    echo "======================================"
-    
-    log_success "All clone functionality tests completed!"
-}
-
-# Check dependencies
-if ! command -v jq &> /dev/null; then
-    log_warning "jq is not installed - some configuration tests will be skipped"
-    echo "To install jq: brew install jq (macOS) or apt-get install jq (Ubuntu)"
-    echo ""
-fi
-
-# Run the tests
-main "$@"