Fix/codespace boot resilience (#209)

Makes our codespace resilient to starting up in the non-default branch.

---------

Co-authored-by: Claude <[email protected]>
Co-authored-by: Claude <[email protected]>

Author: 3 people

.devcontainer/features/feature/catnip-upgrade-and-start.sh

@@ -12,11 +12,32 @@ export PATH="$OPT_DIR/bin:$HOME/.local/bin:$PATH"
 
 # 1. Capture current environment to /etc/default/catnip
 log "Updating catnip service environment..."
-sudo tee -a /etc/default/catnip >/dev/null <<EOF
 
-# Updated with current codespace environment ($(date))
-$(printenv | sed 's/^/export /')
-EOF
+# Create a temporary file with properly quoted exports
+TEMP_ENV=$(mktemp)
+trap "rm -f $TEMP_ENV" EXIT
+
+# Use bash's declare -px to get properly quoted environment exports
+# This handles all special characters, quotes, newlines, etc. correctly
+{
+  echo ""
+  echo "# ==================== RUNTIME ENVIRONMENT ===================="
+  echo "# Updated from codespace environment at $(date)"
+  echo "# This section is regenerated on each startup"
+  echo ""
+
+  # Export all current environment variables with proper shell quoting
+  # declare -px outputs variables in a format safe for re-sourcing
+  declare -px
+
+} > "$TEMP_ENV"
+
+# Remove any previous runtime environment section and append the new one
+# This preserves the template but prevents duplicates
+sudo sed -i '/^# ==================== RUNTIME ENVIRONMENT ====================/,$d' /etc/default/catnip
+sudo cat "$TEMP_ENV" | sudo tee -a /etc/default/catnip >/dev/null
+sudo chmod 644 /etc/default/catnip
+
 ok "Environment captured"
 
 # 2. Attempt upgrade with timeout (non-blocking)
@@ -30,6 +51,25 @@ else
   else
     warn "Upgrade check failed (exit $EXIT_CODE), proceeding with existing version"
   fi
+
+  # If upgrade failed/timed-out, check if it left us with a backup but no binary
+  # This can happen if timeout occurs after backup creation but before install
+  log "Checking for orphaned backup files..."
+  for BACKUP_PATH in "$HOME/.local/bin/catnip.backup" "$OPT_DIR/bin/catnip.backup"; do
+    if [ -f "$BACKUP_PATH" ]; then
+      BINARY_PATH="${BACKUP_PATH%.backup}"
+      if [ ! -f "$BINARY_PATH" ]; then
+        warn "Found backup at $BACKUP_PATH but no binary at $BINARY_PATH - restoring backup"
+        mv "$BACKUP_PATH" "$BINARY_PATH"
+        chmod +x "$BINARY_PATH"
+        ok "Restored backup to $BINARY_PATH"
+      else
+        # Backup exists but so does binary - clean up backup
+        log "Removing stale backup at $BACKUP_PATH"
+        rm -f "$BACKUP_PATH"
+      fi
+    fi
+  done
 fi
 
 # 3. Start service (always runs regardless of upgrade outcome)

.devcontainer/features/feature/catnip-vscode-extension/src/extension.ts

@@ -1,11 +1,7 @@
 import * as vscode from "vscode";
-import { exec } from "child_process";
-import { promisify } from "util";
 import * as http from "http";
 import * as QRCode from "qrcode";
 
-const execAsync = promisify(exec);
-
 // Device detection function
 function isMobileDevice(): boolean {
   // In VSCode extension context, we can check the environment
@@ -493,7 +489,7 @@ export function activate(context: vscode.ExtensionContext) {
           await vscode.workspace.fs.stat(uri);
           // Directory exists locally, open it in a new window
           await vscode.commands.executeCommand("vscode.openFolder", uri, true);
-        } catch (statError) {
+        } catch (_statError) {
           // Directory doesn't exist locally - likely in a container scenario
           // Open catnip interface in browser instead
 

container/internal/cmd/upgrade.go

@@ -114,10 +114,35 @@ func runUpgrade(cmd *cobra.Command, args []string) error {
 	fmt.Printf("Current version: %s\n", currentVersion)
 	fmt.Printf("Latest version:  %s\n", latestVersion)
 
-	// Check if upgrade is needed
-	if !force && currentVersion == latestVersion {
-		fmt.Println("✅ Already running the latest version")
-		return nil
+	// Check if upgrade is needed using semantic version comparison
+	if !force {
+		comparison, err := compareVersions(currentVersion, latestVersion)
+		if err != nil {
+			return fmt.Errorf("failed to compare versions: %w", err)
+		}
+
+		// Debug: show comparison result
+		if os.Getenv("DEBUG") == "1" {
+			fmt.Printf("🔍 Version comparison: %d (current vs latest)\n", comparison)
+		}
+
+		if comparison > 0 {
+			// Current version is newer than latest
+			if strings.Contains(currentVersion, "-") {
+				fmt.Printf("✅ Already running newer version %s (dev/pre-release, latest stable is %s)\n", currentVersion, latestVersion)
+			} else {
+				fmt.Printf("✅ Already running newer version %s (latest is %s)\n", currentVersion, latestVersion)
+			}
+			return nil
+		}
+
+		if comparison == 0 {
+			// Current version equals latest
+			fmt.Println("✅ Already running the latest version")
+			return nil
+		}
+
+		// comparison < 0: upgrade needed, continue below
 	}
 
 	if checkOnly {
@@ -185,6 +210,68 @@ func getLatestVersion(includeDev bool) (string, error) {
 	}
 }
 
+// parseVersion extracts the base version and pre-release suffix from a version string
+// Examples:
+//
+//	"v0.11.1-dev" -> ("0.11.1", "-dev")
+//	"0.11.2" -> ("0.11.2", "")
+//	"v1.2.3-rc.1" -> ("1.2.3", "-rc.1")
+func parseVersion(version string) (baseVersion string, suffix string) {
+	// Strip leading 'v' if present
+	version = strings.TrimPrefix(version, "v")
+
+	// Split on first hyphen to separate base version from suffix
+	if idx := strings.Index(version, "-"); idx != -1 {
+		return version[:idx], version[idx:]
+	}
+
+	return version, ""
+}
+
+// compareVersions compares two semantic versions
+// Returns:
+//
+//	-1 if v1 < v2
+//	 0 if v1 == v2 (comparing base versions)
+//	 1 if v1 > v2
+func compareVersions(v1, v2 string) (int, error) {
+	base1, _ := parseVersion(v1)
+	base2, _ := parseVersion(v2)
+
+	// Parse version components
+	parts1 := strings.Split(base1, ".")
+	parts2 := strings.Split(base2, ".")
+
+	// Ensure we have at least 3 parts (major.minor.patch)
+	for len(parts1) < 3 {
+		parts1 = append(parts1, "0")
+	}
+	for len(parts2) < 3 {
+		parts2 = append(parts2, "0")
+	}
+
+	// Compare each component
+	for i := 0; i < 3; i++ {
+		var num1, num2 int
+		if _, err := fmt.Sscanf(parts1[i], "%d", &num1); err != nil {
+			return 0, fmt.Errorf("invalid version component in %s: %s", v1, parts1[i])
+		}
+		if _, err := fmt.Sscanf(parts2[i], "%d", &num2); err != nil {
+			return 0, fmt.Errorf("invalid version component in %s: %s", v2, parts2[i])
+		}
+
+		if num1 < num2 {
+			return -1, nil
+		}
+		if num1 > num2 {
+			return 1, nil
+		}
+	}
+
+	// Base versions are equal
+	return 0, nil
+}
+
 func confirmUpgrade(currentVersion, latestVersion string) bool {
 	// Check if we're in a TTY (interactive terminal)
 	if !term.IsTerminal(int(os.Stdin.Fd())) {