minor bug fixes and changes

handlers.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 	"strings"
 )
 
@@ -24,8 +25,20 @@ func handleValidateLLM(w http.ResponseWriter, r *http.Request) {
 	apiKey := strings.TrimSpace(r.FormValue("api_key"))
 	model := strings.TrimSpace(r.FormValue("model"))
 
-	if provider == "" || apiKey == "" || model == "" {
-		errorResponse(w, "provider, api_key and model are required")
+	if provider == "" || model == "" {
+		errorResponse(w, "provider and model are required")
+		return
+	}
+
+	// No key supplied — fall back to whatever is already saved in config
+	if apiKey == "" {
+		cfg := readConfig()
+		if p, ok := cfg.Providers[provider]; ok {
+			apiKey, _ = p["api_key"].(string)
+		}
+	}
+	if apiKey == "" {
+		errorResponse(w, "No API key provided and none saved for this provider")
 		return
 	}
 
@@ -200,84 +213,19 @@ func handleInstallService(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	ok, msg := installService()
+	ok, msg := installSystemdService()
 	jsonResponse(w, map[string]interface{}{
 		"ok":      ok,
 		"message": msg,
 	})
 }
 
-func installService() (bool, string) {
+func installSystemdService() (bool, string) {
 	picocławPath, err := exec.LookPath("picoclaw")
 	if err != nil {
-		return false, "picoclaw not found in PATH — install PicoClaw first"
+		return false, "picoclaw not found in PATH"
 	}
 
-	osName, _ := runCommand("uname", "-s")
-	osName = strings.TrimSpace(osName)
-
-	if osName == "Darwin" {
-		return installLaunchdService(picocławPath)
-	}
-	return installSystemdService(picocławPath)
-}
-
-// macOS: launchd plist in ~/Library/LaunchAgents
-func installLaunchdService(picocławPath string) (bool, string) {
-	home, _ := os.UserHomeDir()
-	launchDir := filepath.Join(home, "Library", "LaunchAgents")
-	os.MkdirAll(launchDir, 0755)
-
-	logDir := filepath.Join(home, ".picoclaw", "logs")
-	os.MkdirAll(logDir, 0755)
-
-	plistContent := fmt.Sprintf(`<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>Label</key>
-  <string>com.picoclaw.agent</string>
-  <key>ProgramArguments</key>
-  <array>
-    <string>%s</string>
-    <string>gateway</string>
-  </array>
-  <key>RunAtLoad</key>
-  <true/>
-  <key>KeepAlive</key>
-  <true/>
-  <key>WorkingDirectory</key>
-  <string>%s</string>
-  <key>EnvironmentVariables</key>
-  <dict>
-    <key>HOME</key>
-    <string>%s</string>
-  </dict>
-  <key>StandardOutPath</key>
-  <string>%s/picoclaw.log</string>
-  <key>StandardErrorPath</key>
-  <string>%s/picoclaw.err</string>
-</dict>
-</plist>
-`, picocławPath, home, home, logDir, logDir)
-
-	plistPath := filepath.Join(launchDir, "com.picoclaw.agent.plist")
-	if err := os.WriteFile(plistPath, []byte(plistContent), 0644); err != nil {
-		return false, "Failed to write plist: " + err.Error()
-	}
-
-	// Unload first in case it was already loaded, ignore error
-	exec.Command("launchctl", "unload", plistPath).Run()
-
-	out, err := exec.Command("launchctl", "load", plistPath).CombinedOutput()
-	if err != nil {
-		return false, "launchctl load failed: " + strings.TrimSpace(string(out))
-	}
-	return true, "Service installed — PicoClaw will start automatically on login"
-}
-
-// Linux: systemd user service
-func installSystemdService(picocławPath string) (bool, string) {
 	home, _ := os.UserHomeDir()
 	serviceDir := filepath.Join(home, ".config", "systemd", "user")
 	os.MkdirAll(serviceDir, 0755)
@@ -310,16 +258,49 @@ WantedBy=default.target
 	}
 	for _, cmd := range commands {
 		if out, err := exec.Command(cmd[0], cmd[1:]...).CombinedOutput(); err != nil {
-			msg := strings.TrimSpace(string(out))
-			if msg == "" {
-				msg = "command failed: " + strings.Join(cmd, " ")
-			}
-			return false, msg
+			return false, strings.TrimSpace(string(out))
 		}
 	}
 	return true, "Service installed and started"
 }
 
+// ── Restart ──────────────────────────────────────────────────────────────────
+
+func handleRestartService(w http.ResponseWriter, r *http.Request) {
+	if r.Method != http.MethodPost {
+		http.Error(w, "POST only", http.StatusMethodNotAllowed)
+		return
+	}
+
+	var out string
+	var err error
+	if runtime.GOOS == "darwin" {
+		plistPath := os.ExpandEnv("$HOME/Library/LaunchAgents/com.picoclaw.agent.plist")
+		exec.Command("launchctl", "unload", plistPath).Run()
+		out, err = runCommand("launchctl", "load", plistPath)
+	} else {
+		out, err = runCommand("systemctl", "--user", "restart", "picoclaw")
+	}
+
+	if err != nil {
+		msg := strings.TrimSpace(out)
+		if msg == "" {
+			msg = "Restart failed: " + err.Error()
+		}
+		errorResponse(w, msg)
+		return
+	}
+	okResponse(w, "Agent restarted", nil)
+}
+
+// ── Local IP ─────────────────────────────────────────────────────────────────
+
+func handleLocalIP(w http.ResponseWriter, r *http.Request) {
+	jsonResponse(w, map[string]interface{}{
+		"ip": getLocalIP(),
+	})
+}
+
 // ── Health ────────────────────────────────────────────────────────────────────
 
 func handleHealth(w http.ResponseWriter, r *http.Request) {
@@ -434,8 +415,20 @@ func handleGetModels(w http.ResponseWriter, r *http.Request) {
 	provider := strings.TrimSpace(r.FormValue("provider"))
 	apiKey := strings.TrimSpace(r.FormValue("api_key"))
 
-	if provider != "openrouter" || apiKey == "" {
-		errorResponse(w, "provider and api_key required")
+	if provider != "openrouter" {
+		errorResponse(w, "provider required")
+		return
+	}
+
+	// No key supplied — fall back to whatever is already saved in config
+	if apiKey == "" {
+		cfg := readConfig()
+		if p, ok := cfg.Providers[provider]; ok {
+			apiKey, _ = p["api_key"].(string)
+		}
+	}
+	if apiKey == "" {
+		errorResponse(w, "No API key provided and none saved for this provider")
 		return
 	}
 
@@ -449,4 +442,4 @@ func handleGetModels(w http.ResponseWriter, r *http.Request) {
 		"ok":     true,
 		"models": models,
 	})
-}
+}

install.sh

@@ -30,7 +30,7 @@ if git -C "$REPO_DIR" rev-parse --is-inside-work-tree &>/dev/null; then
     log "✓ Already up to date (${AFTER:0:7})"
   fi
 else
-  log "⚠  Not a git repo — cloning fresh copy from $GITHUB_REPO..."
+  log "⚠  Not a git repo - cloning fresh copy from $GITHUB_REPO..."
   TMP_CLONE=$(mktemp -d)
   git clone "$GITHUB_REPO" "$TMP_CLONE" >> "$LOG_FILE" 2>&1
   cp -r "$TMP_CLONE/." "$REPO_DIR/"
@@ -82,7 +82,7 @@ EOF
       log "✓ Will launch automatically on next boot"
       ;;
     *)
-      log "⏭  Skipping startup autorun — run install.sh again anytime to set it up"
+      log "⏭  Skipping startup autorun - run install.sh again anytime to set it up"
       ;;
   esac
 fi
@@ -112,7 +112,7 @@ if command -v go &>/dev/null; then
   log "✓ Go already installed: $GO_INSTALLED"
 else
   log ""
-  log "⬇  Go not found — installing Go $GO_VERSION..."
+  log "⬇  Go not found - installing Go $GO_VERSION..."
 
   OS=$(uname -s)
   if [[ "$OS" == "Darwin" ]]; then
@@ -161,7 +161,7 @@ fi
 [ -z "$LOCAL_IP" ] && LOCAL_IP="localhost"
 log ""
 log "================================"
-log "✅ Ready — open in your browser:"
+log "✅ Ready - open in your browser:"
 log "   👉 http://$LOCAL_IP:3000"
 log "================================"
 log ""

main.go

@@ -34,6 +34,8 @@ func main() {
 	mux.HandleFunc("/api/health", handleHealth)
 	mux.HandleFunc("/api/install-picoclaw", handleInstallPicoclaw)
 	mux.HandleFunc("/api/models", handleGetModels)
+	mux.HandleFunc("/api/restart-service", handleRestartService)
+	mux.HandleFunc("/api/local-ip", handleLocalIP)
 
 	ip := getLocalIP()
 	fmt.Println(" *** claw-setup is running **** ")
@@ -69,4 +71,4 @@ func getLocalIP() string {
 func runCommand(name string, args ...string) (string, error) {
 	out, err := exec.Command(name, args...).CombinedOutput() 
 	return strings.TrimSpace(string(out)), err
-}
+}