cleanup

Author: d-buckner

cli/dev.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"codeberg.org/d-buckner/bloud-v3/cli/vm"
+	"codeberg.org/d-buckner/bloud/cli/vm"
 )
 
 // localExec runs a command on the host machine (not in VM)
@@ -20,7 +20,7 @@ func localExec(name string, args ...string) *exec.Cmd {
 const (
 	devVMName       = "bloud"
 	devTmuxSession  = "bloud-dev"
-	devProjectInVM  = "/home/bloud.linux/bloud-v3"
+	devProjectInVM  = "/home/bloud.linux/bloud"
 )
 
 var devPorts = []vm.PortForward{
@@ -310,6 +310,25 @@ func cmdServices() int {
 	return 0
 }
 
+func cmdDestroy() int {
+	if !vm.Exists(devVMName) {
+		log("VM does not exist")
+		return 0
+	}
+
+	// Kill port forwarding first
+	_ = vm.KillPortForwarding(devVMName, devPorts[0].LocalPort)
+
+	log("Destroying dev VM...")
+	if err := vm.Delete(devVMName); err != nil {
+		errorf("Failed to destroy VM: %v", err)
+		return 1
+	}
+
+	log("Dev VM destroyed")
+	return 0
+}
+
 // isPortForwardingRunning checks if port forwarding is running for a port
 func isPortForwardingRunning(port int) bool {
 	// Check for local SSH process doing port forwarding

cli/go.mod

@@ -1,4 +1,4 @@
-module codeberg.org/d-buckner/bloud-v3/cli
+module codeberg.org/d-buckner/bloud/cli
 
 go 1.24.0
 

cli/main.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"codeberg.org/d-buckner/bloud-v3/cli/vm"
+	"codeberg.org/d-buckner/bloud/cli/vm"
 )
 
 const (
@@ -52,6 +52,8 @@ func main() {
 		exitCode = cmdRebuild()
 	case "depgraph":
 		exitCode = cmdDepGraph()
+	case "destroy":
+		exitCode = cmdDestroy()
 
 	// Test commands (subcommand)
 	case "test":
@@ -121,6 +123,7 @@ func printUsage() {
 	fmt.Println("  shell [cmd]     Shell into VM (or run a command)")
 	fmt.Println("  rebuild         Rebuild NixOS configuration")
 	fmt.Println("  depgraph        Generate Mermaid dependency graph from app metadata")
+	fmt.Println("  destroy         Destroy the dev VM completely")
 	fmt.Println()
 	fmt.Println("Test Commands (ephemeral environment, ports 8081/3001/5174):")
 	fmt.Println("  test start      Create fresh test VM and start services")

cli/test.go

@@ -9,7 +9,7 @@ import (
 	"text/template"
 	"time"
 
-	"codeberg.org/d-buckner/bloud-v3/cli/vm"
+	"codeberg.org/d-buckner/bloud/cli/vm"
 )
 
 const (
@@ -55,7 +55,7 @@ func generateTestConfig(templatePath, outputPath, projectRoot string) error {
 	mainRepo := os.Getenv("BLOUD_MAIN_REPO")
 	if mainRepo == "" {
 		home, _ := os.UserHomeDir()
-		mainRepo = filepath.Join(home, "Projects", "bloud-v3")
+		mainRepo = filepath.Join(home, "Projects", "bloud")
 	}
 
 	data := map[string]string{
@@ -137,7 +137,7 @@ func testStart() int {
 	mainRepo := os.Getenv("BLOUD_MAIN_REPO")
 	if mainRepo == "" {
 		home, _ := os.UserHomeDir()
-		mainRepo = filepath.Join(home, "Projects", "bloud-v3")
+		mainRepo = filepath.Join(home, "Projects", "bloud")
 	}
 
 	// Create mount directories and mount filesystems

docs/testing-plan.md

@@ -1,4 +1,4 @@
-# Bloud-v3 Testing Plan
+# Bloud Testing Plan
 
 This document outlines the comprehensive testing strategy for the orchestrator and NixOS modules.
 

integration/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@bloud/integration-tests",
   "version": "0.1.0",
+  "license": "AGPL-3.0-only",
   "private": true,
   "type": "module",
   "scripts": {

lima/build-image.sh

@@ -37,18 +37,18 @@ build_on_vm() {
 
     # Copy project to VM's temp directory (to avoid 9p permission issues)
     echo "Copying project to VM..."
-    limactl shell nix-builder -- rm -rf /tmp/bloud-v3
-    limactl shell nix-builder -- mkdir -p /tmp/bloud-v3
+    limactl shell nix-builder -- rm -rf /tmp/bloud
+    limactl shell nix-builder -- mkdir -p /tmp/bloud
     rsync -av --exclude='.git' --exclude='node_modules' --exclude='result*' \
-        "$PROJECT_ROOT/" nix-builder:/tmp/bloud-v3/
+        "$PROJECT_ROOT/" nix-builder:/tmp/bloud/
 
     # Build the image
     echo "Building image..."
-    limactl shell nix-builder -- bash -c "cd /tmp/bloud-v3 && nix build .#lima-image -o result-lima-image"
+    limactl shell nix-builder -- bash -c "cd /tmp/bloud && nix build .#lima-image -o result-lima-image"
 
     # Copy the result back
     mkdir -p "$IMG_DIR"
-    limactl shell nix-builder -- cat /tmp/bloud-v3/result-lima-image/nixos.img > "$IMG_DIR/nixos-24.11-lima.img"
+    limactl shell nix-builder -- cat /tmp/bloud/result-lima-image/nixos.img > "$IMG_DIR/nixos-24.11-lima.img"
 
     echo "Image built: $IMG_DIR/nixos-24.11-lima.img"
 }

lima/dev

@@ -20,7 +20,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 VM_NAME="bloud"
 VM_USER="bloud"
 VM_PASSWORD="bloud"
-PROJECT_IN_VM="/home/bloud.linux/bloud-v3"
+PROJECT_IN_VM="/home/bloud.linux/bloud"
 TMUX_SESSION="bloud-dev"
 
 # Colors
@@ -107,7 +107,7 @@ cmd_vm_start() {
         # Using access=any so VM user can read/write Mac-owned files
         # Using cache=none to avoid stale metadata (important for hot reload)
         log "Mounting shared directories..."
-        vm_exec "sudo mount -t 9p -o trans=virtio,version=9p2000.L,msize=131072,cache=none,access=any mount0 /home/bloud.linux/bloud-v3 2>/dev/null || true"
+        vm_exec "sudo mount -t 9p -o trans=virtio,version=9p2000.L,msize=131072,cache=none,access=any mount0 /home/bloud.linux/bloud 2>/dev/null || true"
         vm_exec "sudo mount -t 9p -o trans=virtio,version=9p2000.L,msize=131072,cache=none,access=any mount1 /tmp/lima 2>/dev/null || true"
 
         echo ""

lima/nixos.yaml

@@ -12,7 +12,7 @@
 #
 # 3. SSH into the VM and apply our configuration:
 #    limactl shell bloud
-#    sudo nixos-rebuild switch --flake /home/bloud.linux/bloud-v3#vm-dev
+#    sudo nixos-rebuild switch --flake /home/bloud.linux/bloud#vm-dev
 #
 # 4. The VM is now running with full bloud services.
 #
@@ -33,14 +33,14 @@ timezone: ""
 
 # NixOS image (built with nixos-generators from NixOS 24.11, includes lima-init)
 images:
-  - location: "~/Projects/bloud-v3/lima/imgs/nixos-24.11-lima.img"
+  - location: "~/Projects/bloud/lima/imgs/nixos-24.11-lima.img"
     arch: "aarch64"
 
 # Mount the project directory into the VM
 mounts:
   # Mount the bloud project (writable for development)
-  - location: "~/Projects/bloud-v3"
-    mountPoint: "/home/bloud.linux/bloud-v3"
+  - location: "~/Projects/bloud"
+    mountPoint: "/home/bloud.linux/bloud"
     writable: true
     9p:
       cache: "mmap"

lima/start-dev.sh

@@ -10,7 +10,7 @@
 
 set -e
 
-PROJECT_DIR="/home/bloud.linux/bloud-v3"
+PROJECT_DIR="/home/bloud.linux/bloud"
 LOCAL_SRC="/tmp/bloud-src"
 DATA_DIR="/home/bloud/.local/share/bloud"  # Match NixOS module path
 LOCAL_NODE_MODULES="/tmp/bloud-node-modules"
@@ -58,6 +58,32 @@ fi
 rm -rf "$WEB_DIR/node_modules"
 ln -s "$LOCAL_NODE_MODULES/node_modules" "$WEB_DIR/node_modules"
 
+# Fix go.mod replace paths for VM directory structure
+sed -i 's|=> ../../apps|=> ../apps|g' "$LOCAL_SRC/host-agent/go.mod" 2>/dev/null || true
+sed -i 's|=> ../services/host-agent|=> ../host-agent|g' "$LOCAL_SRC/apps/go.mod" 2>/dev/null || true
+
+# Pre-build host-agent binary (required for service prestart/poststart hooks)
+echo "Building host-agent binary..."
+cd "$LOCAL_SRC/host-agent"
+if go build -o /tmp/host-agent ./cmd/host-agent 2>&1; then
+    echo "Host-agent binary built at /tmp/host-agent"
+else
+    echo "Warning: Failed to build host-agent, services may fail"
+fi
+
+# Restart any failed services (in case services failed before binary existed)
+echo "Checking for failed services..."
+systemctl --user reset-failed 2>/dev/null || true
+for svc in podman-apps-postgres podman-apps-redis bloud-db-init authentik-db-init podman-apps-authentik-server podman-apps-authentik-worker podman-apps-authentik-proxy; do
+    if systemctl --user is-failed "$svc.service" 2>/dev/null; then
+        echo "Restarting failed service: $svc"
+        systemctl --user restart "$svc.service" 2>/dev/null || true
+    elif ! systemctl --user is-active "$svc.service" 2>/dev/null; then
+        echo "Starting inactive service: $svc"
+        systemctl --user start "$svc.service" 2>/dev/null || true
+    fi
+done
+
 # Create Go watch script with rsync
 GO_WATCH="/tmp/go-watch.sh"
 cat > "$GO_WATCH" << 'GO_EOF'