openclacky 1.2.2 → 1.2.4

data/scripts/install_system_deps.sh

@@ -270,6 +270,76 @@ detect_network_region() {
 
 # ---[ @include lib/apt.sh ]---
 
+# Wait until apt/dpkg lock files are no longer held (e.g. by apt-daily on
+# freshly-booted WSL/Ubuntu). Uses flock(1) — the same mechanism apt uses —
+# rather than checking file existence (the lock files are always present;
+# advisory locks live in the kernel, not the filesystem).
+wait_apt_lock() {
+    [ "$DISTRO" = "ubuntu" ] || [ "$DISTRO" = "debian" ] || return 0
+
+    local locks=(
+        "/var/lib/dpkg/lock-frontend"
+        "/var/lib/dpkg/lock"
+        "/var/lib/apt/lists/lock"
+    )
+    local max_wait="${1:-120}"
+    local waited=0
+    local announced=false
+
+    while :; do
+        local busy=false
+        for f in "${locks[@]}"; do
+            [ -e "$f" ] || continue
+            if ! sudo flock -n "$f" -c true 2>/dev/null; then
+                busy=true
+                break
+            fi
+        done
+
+        [ "$busy" = false ] && break
+
+        if [ "$announced" = false ]; then
+            print_info "Waiting for system apt/dpkg to finish (up to ${max_wait}s)..."
+            announced=true
+        fi
+
+        if [ "$waited" -ge "$max_wait" ]; then
+            print_error "apt is still locked after ${max_wait}s."
+            print_info  "On WSL try: 'wsl --shutdown' from PowerShell, then rerun the installer."
+            return 1
+        fi
+
+        sleep 3
+        waited=$((waited + 3))
+    done
+
+    [ "$announced" = true ] && print_success "apt lock released"
+    return 0
+}
+
+# Run an apt-get subcommand with lock-wait + transient-failure retry.
+# Usage: apt_get_run update [-qq]
+#        apt_get_run install -y pkg1 pkg2
+apt_get_run() {
+    local attempts=3
+    local i=1
+    while [ "$i" -le "$attempts" ]; do
+        wait_apt_lock 120 || return 1
+        if sudo apt-get "$@"; then
+            return 0
+        fi
+        local rc=$?
+        if [ "$i" -lt "$attempts" ]; then
+            print_warning "apt-get $1 failed (exit $rc), retrying ($i/$((attempts-1)))..."
+            sleep 5
+        else
+            print_error "apt-get $1 failed after $attempts attempts."
+            return "$rc"
+        fi
+        i=$((i + 1))
+    done
+}
+
 # Configure apt mirror for CN region and run apt-get update.
 # Guards: only runs on ubuntu/debian ($DISTRO).
 # Relies on $USE_CN_MIRRORS set by detect_network_region (network.sh).
@@ -317,7 +387,7 @@ EOF
         print_info "Region: global — using default apt sources"
     fi
 
-    sudo apt-get update -qq
+    apt_get_run update -qq || return 1
     print_success "apt updated"
 }
 
@@ -462,7 +532,7 @@ ensure_linux_deps() {
 
     detect_network_region
     setup_apt_mirror
-    sudo apt-get install -y build-essential git curl python3
+    apt_get_run install -y build-essential git curl python3 || return 1
     print_success "Dependencies installed"
 }
 

data/scripts/wsl_network_doctor.ps1

@@ -0,0 +1,196 @@
+# wsl_network_doctor.ps1 — diagnose & repair WSL2 mirrored networking for the browser tool.
+#
+# Designed to be invoked from inside WSL via:
+#   powershell.exe -NoProfile -ExecutionPolicy Bypass -File <win-path-to-this-script> <subcommand>
+#
+# Subcommands:
+#   status   Check whether mirrored networking is configured.
+#   enable   Write networkingMode=mirrored to %USERPROFILE%\.wslconfig.
+#   repair   Restart Windows Host Network Service (HNS) via UAC elevation.
+#
+# Exit codes (status only):
+#   0   OK              — mirrored configured, OR running on WSL1 (no config needed)
+#   10  NEED_ENABLE     — mirrored not configured, run `enable`
+#   20  NEED_REPAIR     — configured but suspected broken, run `repair`
+#   1   unexpected error
+#
+# `enable` and `repair` exit 0 on success, 1 on failure.
+
+param(
+    [Parameter(Position = 0)]
+    [ValidateSet('status', 'enable', 'repair')]
+    [string]$Command
+)
+
+$ErrorActionPreference = 'Stop'
+
+# ---------------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------------
+
+function Get-WslConfigPath {
+    return (Join-Path $env:USERPROFILE '.wslconfig')
+}
+
+function Test-MirroredConfigured {
+    $cfg = Get-WslConfigPath
+    if (-not (Test-Path $cfg)) { return $false }
+    $content = Get-Content $cfg -Raw -ErrorAction SilentlyContinue
+    if ($null -eq $content) { return $false }
+    return ($content -match '(?im)^\s*networkingMode\s*=\s*mirrored\s*$')
+}
+
+# Returns 1 or 2 if Ubuntu is registered, $null otherwise.
+# Parses `wsl.exe -l -v` output (UTF-16, may contain a star marker on default distro).
+function Get-UbuntuWslVersion {
+    try {
+        $raw = & wsl.exe -l -v 2>$null
+    } catch {
+        return $null
+    }
+    if (-not $raw) { return $null }
+
+    foreach ($line in $raw) {
+        $clean = ($line -replace '\s+', ' ').Trim().TrimStart('*').Trim()
+        if ($clean -match '^Ubuntu(?:-[\w\.]+)?\s+\S+\s+(\d+)\s*$') {
+            return [int]$matches[1]
+        }
+    }
+    return $null
+}
+
+# ---------------------------------------------------------------------------
+# Subcommand: status
+# ---------------------------------------------------------------------------
+
+function Invoke-Status {
+    $wslVer = Get-UbuntuWslVersion
+    if ($wslVer -eq 1) {
+        Write-Host "OK: Ubuntu is running on WSL1 — shares the Windows network stack directly."
+        Write-Host "No mirrored configuration needed. The browser tool can connect to 127.0.0.1 as-is."
+        exit 0
+    }
+
+    if (Test-MirroredConfigured) {
+        Write-Host "OK: mirrored networking is configured in .wslconfig."
+        Write-Host "If the browser tool still cannot connect, run: wsl_network_doctor.ps1 repair"
+        exit 0
+    }
+
+    Write-Host "NEED_ENABLE: mirrored networking is not configured."
+    Write-Host "Run: wsl_network_doctor.ps1 enable"
+    exit 10
+}
+
+# ---------------------------------------------------------------------------
+# Subcommand: enable
+# ---------------------------------------------------------------------------
+
+function Invoke-Enable {
+    if (Test-MirroredConfigured) {
+        Write-Host "OK: already enabled. No changes needed."
+        Write-Host "If the browser tool still cannot connect, run: wsl_network_doctor.ps1 repair"
+        exit 0
+    }
+
+    $cfg = Get-WslConfigPath
+    Write-Host "Writing networkingMode=mirrored to $cfg ..."
+
+    if (-not (Test-Path $cfg)) {
+        New-Item -ItemType File -Path $cfg -Force | Out-Null
+    }
+
+    $content = Get-Content $cfg -Raw -ErrorAction SilentlyContinue
+    if ($null -eq $content) { $content = '' }
+
+    if ($content -match '(?im)^\s*networkingMode\s*=') {
+        $new = [regex]::Replace($content, '(?im)^\s*networkingMode\s*=.*$', 'networkingMode=mirrored')
+        Set-Content -Path $cfg -Value $new -NoNewline
+    } else {
+        if ($content -notmatch '(?im)^\[wsl2\]') {
+            if ($content.Length -gt 0 -and -not $content.EndsWith([char]10)) {
+                Add-Content -Path $cfg -Value ''
+            }
+            Add-Content -Path $cfg -Value '[wsl2]'
+        }
+        Add-Content -Path $cfg -Value 'networkingMode=mirrored'
+    }
+
+    Write-Host "WROTE: .wslconfig updated."
+    Write-Host ""
+    Write-Host "Next step (cannot be done from inside WSL):"
+    Write-Host "  1. Open Windows PowerShell"
+    Write-Host "  2. Run: wsl --shutdown"
+    Write-Host "  3. Reopen Clacky and run /browser-setup again"
+    exit 0
+}
+
+# ---------------------------------------------------------------------------
+# Subcommand: repair
+# ---------------------------------------------------------------------------
+# Restart Windows Host Network Service (HNS). Requires admin → triggers UAC.
+# Does NOT call `wsl --shutdown` here — the user must run it manually after
+# the elevated window finishes, otherwise our own WSL session would be killed.
+
+function Invoke-Repair {
+    Write-Host "Repairing Windows Host Network Service (HNS) ..."
+    Write-Host ""
+    Write-Host "A Windows User Account Control (UAC) dialog will appear."
+    Write-Host "Please click 'Yes' to allow the repair script to run."
+    Write-Host ""
+
+    $inner = @'
+try {
+    Stop-Service hns -Force -ErrorAction SilentlyContinue
+    Start-Service hns -ErrorAction Stop
+    Write-Host "HNS restarted successfully."
+} catch {
+    Write-Host "Repair failed: $_"
+    Start-Sleep 5
+    exit 1
+}
+Write-Host ""
+Write-Host "Repair complete. Please run 'wsl --shutdown' in PowerShell, then reopen Clacky."
+Start-Sleep 4
+'@
+
+    $encoded = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes($inner))
+
+    try {
+        Start-Process powershell -Verb RunAs -ArgumentList '-NoProfile', '-EncodedCommand', $encoded
+    } catch {
+        Write-Host "FAILED: could not trigger UAC prompt: $_"
+        Write-Host ""
+        Write-Host "You can run the repair manually:"
+        Write-Host "  1. Open PowerShell as Administrator"
+        Write-Host "  2. Run: net stop hns; net start hns"
+        Write-Host "  3. Run: wsl --shutdown"
+        Write-Host "  4. Reopen Clacky"
+        exit 1
+    }
+
+    Write-Host "Repair script launched in an elevated PowerShell window."
+    Write-Host ""
+    Write-Host "After the elevated window finishes:"
+    Write-Host "  1. Run in regular PowerShell: wsl --shutdown"
+    Write-Host "  2. Reopen Clacky and run /browser-setup again"
+    exit 0
+}
+
+# ---------------------------------------------------------------------------
+# Dispatch
+# ---------------------------------------------------------------------------
+
+switch ($Command) {
+    'status' { Invoke-Status }
+    'enable' { Invoke-Enable }
+    'repair' { Invoke-Repair }
+    default {
+        Write-Host "Usage: wsl_network_doctor.ps1 {status|enable|repair}"
+        Write-Host ""
+        Write-Host "  status  Check whether WSL2 mirrored networking is configured."
+        Write-Host "  enable  Write networkingMode=mirrored to %USERPROFILE%\.wslconfig."
+        Write-Host "  repair  Restart Windows Host Network Service (HNS) via UAC."
+        exit 2
+    }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openclacky
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - windy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-25 00:00:00.000000000 Z
+date: 2026-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -596,6 +596,7 @@ files:
 - scripts/install_rails_deps.sh
 - scripts/install_system_deps.sh
 - scripts/uninstall.sh
+- scripts/wsl_network_doctor.ps1
 - sig/clacky.rbs
 homepage: https://github.com/clacky-ai/openclacky
 licenses: