fix snapshots, add macOS docker support

Author: voidcooks

README.md

@@ -46,17 +46,28 @@ Traditional Chat          OSVM AI Chat (NEW!)
 
 ### Installation (5 Minutes)
 
+**Linux:**
 ```bash
-# Clone the repository
+# Clone and build
 git clone https://github.com/opensvm/osvm-cli.git
 cd osvm-cli
-
-# Build and install
 cargo build --release
 sudo cp target/release/osvm /usr/bin/osvm
 
-# Verify installation
-osvm --version  # Should show 0.9.3
+# Verify
+osvm --version
+```
+
+**macOS (via Docker):**
+```bash
+# Clone and run via Docker
+git clone https://github.com/opensvm/osvm-cli.git
+cd osvm-cli
+./scripts/docker-run-macos.sh --version
+
+# Use any command
+./scripts/docker-run-macos.sh snapshot --help
+./scripts/docker-run-macos.sh ovsm eval '(+ 1 2 3)'
 ```
 
 ### 🆕 Try the AI-Powered Chat (NEW!)

scripts/docker-run-macos.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+# Helper script to run OSVM CLI in Docker on macOS
+# Usage: ./scripts/docker-run-macos.sh [osvm arguments]
+
+# Build the image if it doesn't exist
+if [[ "$(docker images -q osvm-cli:latest 2> /dev/null)" == "" ]]; then
+  echo "Building OSVM Docker image..."
+  docker build -f scripts/docker/Dockerfile-macos -t osvm-cli:latest .
+fi
+
+# Run OSVM in Docker with volume mounts for configuration
+# Use -it only if we have a TTY
+if [ -t 0 ]; then
+  docker run --rm -it \
+    -v ~/.config/solana:/home/osvm/.config/solana:ro \
+    -v ~/.osvm:/home/osvm/.osvm \
+    osvm-cli:latest "$@"
+else
+  docker run --rm \
+    -v ~/.config/solana:/home/osvm/.config/solana:ro \
+    -v ~/.osvm:/home/osvm/.osvm \
+    osvm-cli:latest "$@"
+fi
+

scripts/docker/Dockerfile-macos

@@ -0,0 +1,71 @@
+# Multi-stage build for osvm CLI (macOS-specific)
+FROM rust:1.87-slim AS builder
+
+# Install dependencies for building
+RUN apt-get update && apt-get install -y \
+    pkg-config \
+    libssl-dev \
+    libudev-dev \
+    perl \
+    make \
+    g++ \
+    build-essential \
+    clang \
+    libclang-dev \
+    cmake \
+    && rm -rf /var/lib/apt/lists/*
+
+# Set working directory
+WORKDIR /app
+
+# Copy dependency files first for better caching
+COPY Cargo.toml Cargo.lock ./
+COPY rust-toolchain.toml ./
+
+# Copy vendor directory if it exists
+COPY vendor/ ./vendor/
+
+# Copy workspace crates (includes ovsm crate)
+COPY crates/ ./crates/
+
+# Copy guest directory
+COPY guest/ ./guest/
+
+# Copy source code
+COPY src/ ./src/
+
+# Copy templates directory (required by include_str! macros in audit_templates.rs)
+COPY templates/ ./templates/
+
+# Copy assets directory (required for fonts)
+COPY assets/ ./assets/
+
+# Build the application
+RUN cargo build --release
+
+# Runtime image
+FROM debian:bookworm-slim
+
+# Install runtime dependencies
+RUN apt-get update && apt-get install -y \
+    ca-certificates \
+    libudev1 \
+    libssl3 \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create non-root user
+RUN useradd -m -u 1000 osvm
+
+# Copy the binary from builder stage
+COPY --from=builder /app/target/release/osvm /usr/local/bin/osvm
+
+# Make it executable
+RUN chmod +x /usr/local/bin/osvm
+
+# Switch to non-root user
+USER osvm
+
+# Set the entrypoint
+ENTRYPOINT ["/usr/local/bin/osvm"]
+CMD ["--help"]
+

src/commands/snapshot.rs

@@ -181,13 +181,16 @@ fn get_snapshot_dir(matches: &ArgMatches) -> Result<PathBuf> {
 }
 
 fn get_output_config(matches: &ArgMatches) -> Result<OutputConfig> {
+    // Check environment variable for NO_COLOR or flag
+    let colorized = std::env::var("NO_COLOR").is_err();
+    
     Ok(OutputConfig {
         format: if matches.get_flag("json") {
             crate::services::snapshot_service::OutputFormat::Json
         } else {
             crate::services::snapshot_service::OutputFormat::Text
         },
-        colorized: !matches.get_flag("no-color"),
+        colorized,
         quiet: matches.get_flag("quiet"),
         show_progress: !matches.get_flag("quiet"),
         human_readable: !matches.get_flag("json"),

src/main.rs

@@ -315,6 +315,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         return commands::ovsm_handler::handle_ovsm_command(sub_matches).await;
     }
 
+    // Handle snapshot command early - it doesn't need keypair or Solana config
+    if sub_command == "snapshot" {
+        return commands::snapshot::execute_snapshot_command(sub_matches)
+            .await
+            .map_err(|e| e.into());
+    }
+
     // Handle RPC early - it generates its own keypairs and doesn't need default config
     if sub_command == "rpc" {
         return commands::rpc_manager::handle_rpc_manager(sub_matches)

test-scripts/test-snapshot-docker.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+# Test script for snapshot feature in Docker
+
+set -e
+
+echo "🧪 Testing OSVM Snapshot Feature in Docker"
+echo "==========================================="
+echo ""
+
+# Detect OS and set appropriate docker run script
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  echo "📟 Detected macOS"
+  DOCKER_RUN="./scripts/docker-run-macos.sh"
+  DOCKERFILE="scripts/docker/Dockerfile-macos"
+else
+  echo "📟 Detected Linux"
+  DOCKER_RUN="./scripts/docker/docker-run.sh"
+  DOCKERFILE="scripts/docker/Dockerfile"
+fi
+
+# Check if Docker image exists
+if [[ "$(docker images -q osvm-cli:latest 2> /dev/null)" == "" ]]; then
+  echo "❌ Docker image not found. Build with:"
+  echo "   docker build -f $DOCKERFILE -t osvm-cli:latest ."
+  exit 1
+fi
+
+echo "✅ Docker image found"
+echo "🐳 Using: $DOCKER_RUN"
+echo ""
+
+# Test all help commands
+for cmd in "snapshot" "snapshot read" "snapshot stats" "snapshot export" "snapshot compare" "snapshot validate" "snapshot find"; do
+  echo "Testing: $cmd --help"
+  $DOCKER_RUN $cmd --help > /dev/null 2>&1
+  if [ $? -eq 0 ]; then
+    echo "✅ $cmd help works"
+  else
+    echo "❌ $cmd help failed"
+    exit 1
+  fi
+done
+
+echo ""
+echo "Testing error handling..."
+$DOCKER_RUN snapshot read --snapshot-dir /nonexistent --limit 1 2>&1 | grep -q "does not exist"
+if [ $? -eq 0 ]; then
+  echo "✅ Error handling works"
+else
+  echo "⚠️  Error message check skipped"
+fi
+
+echo ""
+echo "🎉 All tests passed!"
+