configs-all 1.0.0

package/scripts/sync/pull-configs.ps1

@@ -0,0 +1,33 @@
+# PowerShell wrapper for pull-configs.zsh (Windows)
+# Runs the zsh pull script via WSL and filters noisy WSL mount warnings.
+#
+# Mac remains the source of truth for Cursor settings/MCP; the zsh script
+# skips pulling those on Windows.
+
+$ErrorActionPreference = "SilentlyContinue"
+
+$configPath = "/mnt/c/Users/wolfe/Dropbox/mikpc/dev/configs"
+
+$job = Start-Job -ScriptBlock {
+    param($path)
+    wsl bash -lc "export HOME=/mnt/c/Users/wolfe; cd $path && zsh scripts/sync/pull-configs.zsh" 2>&1
+} -ArgumentList $configPath
+
+$job | Wait-Job | Out-Null
+$output = $job | Receive-Job
+Remove-Job $job
+
+$hasOutput = $false
+foreach ($line in $output) {
+    if ($line -and ($line.ToString() -notmatch "Failed to mount") -and ($line.ToString() -notmatch "^wsl:")) {
+        Write-Host $line
+        $hasOutput = $true
+    }
+}
+
+if (-not $hasOutput) {
+    Write-Host "[INFO] Pull configs script completed (no output)"
+}
+
+exit 0
+

package/scripts/sync/pull-configs.zsh

@@ -0,0 +1,278 @@
+#!/bin/zsh
+
+# Unified Configuration Pull Script
+# Pulls configurations from system locations to repo with validation
+
+# set -euo pipefail
+
+# Source common functions
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+source "${SCRIPT_DIR}/config-common.zsh"
+
+# Additional pull-specific functions
+pull_zsh_theme() {
+    # Only pull theme on Mac (Homebrew) or if powerlevel10k is installed elsewhere
+    if [[ "$IS_MAC" == "true" ]] && command -v brew >/dev/null 2>&1; then
+        local theme_src
+        theme_src="$(brew --prefix)/share/powerlevel10k/powerlevel10k.zsh-theme"
+        local theme_dest="${CONFIG_DIR}/shell/zsh/powerlevel10k.zsh-theme"
+
+        copy_if_exists "$theme_src" "$theme_dest" ""
+    elif [[ -f "${HOME}/.oh-my-zsh/custom/themes/powerlevel10k/powerlevel10k.zsh-theme" ]]; then
+        # Try Oh My Zsh location
+        local theme_src="${HOME}/.oh-my-zsh/custom/themes/powerlevel10k/powerlevel10k.zsh-theme"
+        local theme_dest="${CONFIG_DIR}/shell/zsh/powerlevel10k.zsh-theme"
+        copy_if_exists "$theme_src" "$theme_dest" ""
+    else
+        warn "powerlevel10k theme not found; skipping theme pull"
+    fi
+}
+
+pull_extensions() {
+    local editor="$1"
+    local editor_dir
+    local extensions_file
+
+    case "$editor" in
+        "cursor")
+            editor_dir="${CONFIG_DIR}/ide/cursor"
+            extensions_file="${editor_dir}/extensions.txt"
+            ;;
+        "vscode"|"insiders")
+            editor_dir="${CONFIG_DIR}/ide/vscode/${editor}"
+            extensions_file="${editor_dir}/extensions.txt"
+            ;;
+        *)
+            editor_dir="${CONFIG_DIR}/ide/vscode/${editor}"
+            extensions_file="${editor_dir}/extensions.txt"
+            ;;
+    esac
+
+    ensure_dir "$editor_dir"
+
+    case "$editor" in
+        "vscode")
+            if command -v code >/dev/null 2>&1; then
+                if code --list-extensions > "$extensions_file" 2>/dev/null; then
+                    success "Pulled VS Code extensions → $extensions_file"
+                else
+                    warn "Failed to list VS Code extensions"
+                fi
+            else
+                warn "'code' CLI not found; skipping VS Code extensions list"
+            fi
+            ;;
+        "insiders")
+            if command -v code-insiders >/dev/null 2>&1; then
+                if code-insiders --list-extensions > "$extensions_file" 2>/dev/null; then
+                    success "Pulled VS Code Insiders extensions → $extensions_file"
+                else
+                    warn "Failed to list VS Code Insiders extensions"
+                fi
+            else
+                warn "'code-insiders' CLI not found; skipping VS Code Insiders extensions list"
+            fi
+            ;;
+        "cursor")
+            # Prefer Cursor CLI if available (returns canonical extension IDs)
+            if command -v cursor >/dev/null 2>&1; then
+                if cursor --list-extensions 2>/dev/null | sed -E 's/^trimmed=//' | sed '/^[[:space:]]*$/d' | sort -u > "$extensions_file"; then
+                    success "Pulled Cursor extensions → $extensions_file"
+                    return 0
+                fi
+                warn "Failed to list Cursor extensions via CLI; falling back to filesystem scan"
+            fi
+
+            # Handle Cursor extensions (robust method)
+            # Try different paths based on platform
+            local cursor_ext_dir=""
+            if [[ "$IS_WINDOWS" == "true" ]] && [[ -d "/mnt/c/Users/${WINDOWS_USER:-$USER}/.cursor/extensions" ]]; then
+                cursor_ext_dir="/mnt/c/Users/${WINDOWS_USER:-$USER}/.cursor/extensions"
+            elif [[ -d "${HOME}/.cursor/extensions" ]]; then
+                cursor_ext_dir="${HOME}/.cursor/extensions"
+            elif [[ "$IS_MAC" == "true" ]] && [[ -d "${HOME}/Library/Application Support/Cursor/User/extensions" ]]; then
+                cursor_ext_dir="${HOME}/Library/Application Support/Cursor/User/extensions"
+            fi
+
+            if [[ -n "$cursor_ext_dir" ]] && [[ -d "$cursor_ext_dir" ]]; then
+                local tmpfile
+                tmpfile="$(mktemp)"
+                {
+                    for d in "${cursor_ext_dir}"/*; do
+                        [[ -d "$d" ]] || continue
+                        local name="${d##*/}"
+                        [[ "$name" == ".obsolete" || "$name" == "extensions.json" ]] && continue
+                        # Trim trailing version/platform suffixes from folder names
+                        local trimmed
+                        trimmed="$(printf '%s' "$name" | sed -E 's/^-?trimmed=//; s/-[0-9][0-9.]*.*$//')"
+                        printf '%s\n' "$trimmed"
+                    done
+                } | sort -u > "$tmpfile"
+                mv "$tmpfile" "$extensions_file"
+                success "Pulled Cursor extensions → $extensions_file"
+            else
+                warn "Cursor extensions directory not found; skipping list"
+            fi
+            ;;
+    esac
+}
+
+pull_mcp_servers() {
+    # Extract mcpServers from ~/.claude.json back to repo
+    local source="${HOME}/.claude.json"
+    local dest="${CONFIG_DIR}/claude/mcp-servers.json"
+
+    if [[ ! -f "$source" ]]; then
+        warn "~/.claude.json not found; skipping MCP servers pull"
+        return
+    fi
+    if ! command -v jq >/dev/null 2>&1; then
+        warn "jq not available; skipping MCP servers pull"
+        return
+    fi
+
+    # Extract mcpServers key
+    local servers
+    servers=$(jq '.mcpServers // empty' "$source" 2>/dev/null)
+    if [[ -z "$servers" ]] || [[ "$servers" == "null" ]]; then
+        warn "No mcpServers found in ~/.claude.json; skipping pull"
+        return
+    fi
+
+    # Replace CONFIG_DIR with __CONFIG_DIR__ placeholder for portability
+    servers=$(echo "$servers" | sed "s|${CONFIG_DIR}|__CONFIG_DIR__|g")
+
+    # If a host-specific MCP file exists, split those servers out
+    local host_mcp_dest="${CONFIG_DIR}/claude/mcp-servers.${HOST}.json"
+    if [[ -f "$host_mcp_dest" ]]; then
+        local host_keys
+        host_keys=$(jq -r 'keys[]' "$host_mcp_dest" 2>/dev/null)
+        if [[ -n "$host_keys" ]]; then
+            # Extract host-specific servers and update host file
+            local host_servers
+            host_servers=$(echo "$servers" | jq --argjson keys "$(echo "$host_keys" | jq -R -s 'split("\n") | map(select(. != ""))')" '[.] | .[0] | to_entries | map(select(.key as $k | $keys | index($k))) | from_entries')
+            if [[ -n "$host_servers" ]] && [[ "$host_servers" != "{}" ]]; then
+                echo "$host_servers" | jq '.' > "$host_mcp_dest"
+                info "Pulled host-specific MCP servers → mcp-servers.${HOST}.json"
+            fi
+            # Remove host-specific servers from shared file
+            servers=$(echo "$servers" | jq --argjson keys "$(echo "$host_keys" | jq -R -s 'split("\n") | map(select(. != ""))')" 'to_entries | map(select(.key as $k | $keys | index($k) | not)) | from_entries')
+        fi
+    fi
+
+    ensure_dir "$(dirname "$dest")"
+    echo "$servers" | jq '.' > "$dest"
+    success "Pulled MCP servers: ~/.claude.json → $dest"
+}
+
+pull_claude_dirs() {
+    # Sync Claude Code commands, templates, and scripts directories (system → repo)
+    local claude_dirs=("commands" "templates" "scripts")
+    for dir_name in "${claude_dirs[@]}"; do
+        local src_dir="${HOME}/.claude/${dir_name}"
+        local dest_dir="${CONFIG_DIR}/claude/${dir_name}"
+        if [[ -d "$src_dir" ]]; then
+            ensure_dir "$dest_dir"
+            # Sync all files from system to repo (md, ps1, sh, etc.)
+            for src_file in "${src_dir}"/*(N.); do
+                local basename="${src_file##*/}"
+                cp "$src_file" "${dest_dir}/${basename}"
+            done
+            success "Pulled Claude ${dir_name}: ${src_dir} → ${dest_dir}"
+        else
+            warn "Claude ${dir_name} directory not found on system: ${src_dir}"
+        fi
+    done
+}
+
+main() {
+    info "Pulling configs into: ${CONFIG_DIR} (host: ${HOST})"
+
+    # Process all configuration files
+    while IFS= read -r config_file; do
+        local dest_path
+        local validation_func
+
+        dest_path="$(get_dest_path "$config_file")"
+        validation_func="$(get_validation_func "$config_file")"
+
+        # Skip if destination path is empty (e.g., Mac-only configs on Windows)
+        if [[ -z "$dest_path" ]]; then
+            continue
+        fi
+
+        # Windows: skip pulling transformed configs that are push-only
+        # (Cursor mcp.json gets transformed Mac→Windows on push, pulling it back would overwrite the Mac format)
+        if [[ "$IS_WINDOWS" == "true" ]]; then
+            case "$config_file" in
+                "ide/cursor/mcp.json")
+                    info "Skipping pull for $config_file on Windows (transformed on push, pull would lose Mac format)"
+                    continue
+                    ;;
+            esac
+        fi
+
+        # Special handling for git config
+        if [[ "$config_file" == "git/config/$(get_git_config)" ]]; then
+            # Ensure git config directory exists
+            ensure_dir "${CONFIG_DIR}/git/config"
+            copy_if_exists "$dest_path" "${CONFIG_DIR}/${config_file}" "$validation_func"
+        # Special handling for MCP config (transform on Windows)
+        elif [[ "$config_file" == "ide/cursor/mcp.json" ]]; then
+            ensure_dir "${CONFIG_DIR}/ide/cursor"
+            if [[ "$IS_WINDOWS" == "true" ]] && [[ -n "$dest_path" ]] && [[ -f "$dest_path" ]]; then
+                # Transform Windows format back to Mac format
+                local temp_file
+                temp_file="$(mktemp)"
+                transform_mcp_windows_to_mac "$dest_path" "$temp_file"
+                if [[ -n "$validation_func" ]] && ! "$validation_func" "$temp_file"; then
+                    error "Validation failed for transformed MCP config, skipping copy"
+                    rm -f "$temp_file"
+                else
+                    cp "$temp_file" "${CONFIG_DIR}/${config_file}"
+                    rm -f "$temp_file"
+                    success "Pulled (transformed): $dest_path → ${config_file}"
+                fi
+            elif [[ "$IS_MAC" == "true" ]] && [[ -n "$dest_path" ]]; then
+                # On Mac, copy directly
+                copy_if_exists "$dest_path" "${CONFIG_DIR}/${config_file}" "$validation_func"
+            fi
+        # Special handling for Docker MCP configs
+        elif [[ "$config_file" == docker/mcp/* ]]; then
+            # Ensure docker/mcp directory structure exists in repo
+            ensure_dir "${CONFIG_DIR}/docker/mcp/catalogs"
+            copy_if_exists "$dest_path" "${CONFIG_DIR}/${config_file}" "$validation_func"
+        # Special handling for Docker CLI configs
+        elif [[ "$config_file" == docker/cli/* ]]; then
+            # Ensure docker/cli directory exists in repo
+            ensure_dir "${CONFIG_DIR}/docker/cli"
+            copy_if_exists "$dest_path" "${CONFIG_DIR}/${config_file}" "$validation_func"
+        # Special handling for Claude Code configs
+        elif [[ "$config_file" == claude/* ]]; then
+            ensure_dir "$(dirname "${CONFIG_DIR}/${config_file}")"
+            copy_if_exists "$dest_path" "${CONFIG_DIR}/${config_file}" "$validation_func"
+        else
+            copy_if_exists "$dest_path" "${CONFIG_DIR}/${config_file}" "$validation_func"
+        fi
+    done < <(get_all_configs)
+
+    # Handle Claude Code directory-based configs (commands/ and templates/)
+    pull_claude_dirs
+
+    # Sync MCP server definitions from ~/.claude.json to repo
+    pull_mcp_servers
+
+    # Handle special cases
+    pull_zsh_theme
+
+    # Handle extensions lists
+    pull_extensions "vscode"
+    pull_extensions "insiders"
+    pull_extensions "cursor"
+
+    success "Configuration pull completed successfully!"
+    info "Host: $HOST | Git config: $(get_git_config)"
+}
+
+# Run main function
+main "$@"

package/scripts/sync/push-configs.ps1

@@ -0,0 +1,91 @@
+# PowerShell wrapper for push-configs.zsh
+# Suppresses WSL T: drive mount warning
+
+$ErrorActionPreference = "SilentlyContinue"
+$configPath = "/mnt/c/Users/wolfe/Dropbox/mikpc/dev/configs"
+
+# Run the script and capture all output
+$allOutput = @()
+$job = Start-Job -ScriptBlock {
+    param($path)
+    wsl bash -c "export HOME=/mnt/c/Users/wolfe; cd $path && zsh scripts/sync/push-configs.zsh" 2>&1
+} -ArgumentList $configPath
+
+$job | Wait-Job | Out-Null
+$output = $job | Receive-Job
+Remove-Job $job
+
+# Filter out mount warnings and display output
+$hasOutput = $false
+foreach ($line in $output) {
+    if ($line -and $line.ToString() -notmatch "Failed to mount" -and $line.ToString() -notmatch "^wsl:") {
+        Write-Host $line
+        $hasOutput = $true
+    }
+}
+
+if (-not $hasOutput) {
+    Write-Host "[INFO] Push configs script completed (no output - configs may already be up to date)"
+}
+
+# Sync Cursor extensions on Windows to match repo list (Mac is source of truth)
+try {
+    $repoRoot = Resolve-Path (Join-Path $PSScriptRoot "..\\..") | Select-Object -ExpandProperty Path
+    $extFile = Join-Path $repoRoot "ide\\cursor\\extensions.txt"
+    if (Test-Path $extFile) {
+        $desiredRaw = Get-Content $extFile | ForEach-Object { $_.Trim() } | Where-Object { $_ -and ($_ -notmatch '^#') }
+
+        # Normalize IDs:
+        # - strip "trimmed=" prefix from old lists
+        # - strip any "-<version>..." suffix from folder-derived entries (e.g. -2.0.12-universal, -2026.34.0-darwin-arm64)
+        $desired = $desiredRaw | ForEach-Object {
+            $ext = $_ -replace '^trimmed=', ''
+            $ext = $ext -replace '-\d.*$', ''
+            if ($ext) { $ext }
+        } | Sort-Object -Unique
+
+        $installed = @()
+        try { $installed = cursor --list-extensions 2>$null } catch {}
+
+        $installedCount = 0
+        $skippedCount = 0
+        $failed = @()
+
+        foreach ($ext in $desired) {
+            if ($installed -contains $ext) { $skippedCount++; continue }
+            cursor --install-extension $ext 2>$null | Out-Null
+            if ($LASTEXITCODE -ne 0) {
+                $failed += $ext
+                continue
+            }
+            $installedCount++
+        }
+
+        # Recompute what's still missing after attempted installs
+        $installed = @()
+        try { $installed = cursor --list-extensions 2>$null } catch {}
+        $missing = @($desired | Where-Object { $installed -notcontains $_ })
+
+        if ($failed.Count -gt 0) {
+            Write-Host "[WARN] Cursor extensions failed to install: $($failed.Count)"
+            if ($failed.Count -le 20) {
+                $failed | ForEach-Object { Write-Host ("[WARN] - " + $_) }
+            }
+        }
+        Write-Host "[INFO] Cursor extensions sync completed (installed=$installedCount, already=$skippedCount, missing=$($missing.Count))"
+    } else {
+        Write-Host "[WARN] Cursor extensions list not found: $extFile"
+    }
+} catch {
+    Write-Host "[WARN] Cursor extensions sync failed: $_"
+}
+
+# Script completed - mount warning is suppressed
+# Exit code handling: if script produced output, assume success unless error messages present
+if ($hasOutput) {
+    $hasErrors = $output | Where-Object { $_ -match "\[ERROR\]" }
+    if ($hasErrors) {
+        exit 1
+    }
+}
+exit 0