Remove dead code, extract shared helpers, add --config-dir flag

  - Delete commands_pairing.go (move addTokenForMobile to pairing_handlers)
  - Delete utils.go (unused openFile)
  - Remove dead fields: running, cmd, inputBuffer, Available
  - Extract buildPairingQRData and reuse DetectSSHInfo in sendCLIInfo
  - Add --config-dir flag for isolated config (staging testing)
  - Add error handling for savePCConfig calls

Author: hhfrancois

Makefile

@@ -1,6 +1,6 @@
 VERSION := $(shell cat VERSION)
 
-# Default relay URL (can be overridden by .env.local or environment)
+# Default relay URL (can be overridden by .env.local or command line)
 RELAY_URL ?= wss://aipilot-relay.softwarity.io
 
 # Load .env.local if it exists (for local dev)

agents.go

@@ -17,21 +17,19 @@ const (
 
 // AgentInfo contains information about a detected agent
 type AgentInfo struct {
-	Command   string
-	Type      AgentType
-	Version   string
-	Available bool
+	Command string
+	Type    AgentType
+	Version string
 }
 
 // knownAgents lists all known AI terminal agents to detect
 var knownAgents = []struct {
-	command     string
-	agentType   AgentType
-	displayName string
+	command   string
+	agentType AgentType
 }{
-	{"claude", AgentClaude, "Claude Code"},
-	{"gemini", AgentGemini, "Google Gemini CLI"},
-	{"codex", AgentCodex, "OpenAI Codex"},
+	{"claude", AgentClaude},
+	{"gemini", AgentGemini},
+	{"codex", AgentCodex},
 }
 
 func checkCommand(command string) (string, error) {
@@ -85,10 +83,9 @@ func detectAvailableAgents() []AgentInfo {
 		if _, err := exec.LookPath(agent.command); err == nil {
 			version := getAgentVersion(agent.command, agent.agentType)
 			available = append(available, AgentInfo{
-				Command:   agent.command,
-				Type:      agent.agentType,
-				Version:   version,
-				Available: true,
+				Command: agent.command,
+				Type:    agent.agentType,
+				Version: version,
 			})
 		}
 	}

commands_info.go

@@ -2,26 +2,13 @@ package main
 
 import (
 	"encoding/json"
-	"fmt"
 	"net"
-	"os"
-	"os/user"
 	"runtime"
 )
 
 // sendCLIInfo sends CLI information to mobile
 func (d *Daemon) sendCLIInfo() {
-	hostname, err := os.Hostname()
-	if err != nil {
-		fmt.Printf("%sWarning: Could not get hostname: %v%s\n", yellow, err, reset)
-		hostname = "unknown"
-	}
-
-	currentUser := "unknown"
-	if u, err := user.Current(); err == nil {
-		currentUser = u.Username
-	}
-
+	// Gather all non-loopback IPv4 addresses for mobile connectivity
 	var ips []string
 	if addrs, err := net.InterfaceAddrs(); err == nil {
 		for _, addr := range addrs {
@@ -33,29 +20,20 @@ func (d *Daemon) sendCLIInfo() {
 		}
 	}
 
-	// Quick SSH check
-	sshPort := DefaultSSHPort
-	sshRunning := false
-	if conn, err := net.DialTimeout("tcp", fmt.Sprintf("127.0.0.1:%d", DefaultSSHPort), SSHQuickCheckTimeout); err == nil {
-		conn.Close()
-		sshRunning = true
-	} else if conn, err := net.DialTimeout("tcp", fmt.Sprintf("127.0.0.1:%d", AlternativeSSHPort), SSHQuickCheckTimeout); err == nil {
-		conn.Close()
-		sshPort = AlternativeSSHPort
-		sshRunning = true
-	}
+	// Use thorough SSH detection (ss/lsof/netstat/config parsing)
+	sshInfo := DetectSSHInfo()
 
 	info := map[string]interface{}{
 		"os":          runtime.GOOS,
 		"arch":        runtime.GOARCH,
-		"hostname":    hostname,
-		"user":        currentUser,
+		"hostname":    sshInfo.Hostname,
+		"user":        sshInfo.Username,
 		"cli_version": Version,
 		"working_dir": d.workDir,
 		"agent":       d.command,
 		"agent_type":  string(d.agentType),
-		"ssh_running": sshRunning,
-		"ssh_port":    sshPort,
+		"ssh_running": sshInfo.Available,
+		"ssh_port":    sshInfo.Port,
 		"ips":         ips,
 	}
 

commands_pairing.go

@@ -116,38 +116,25 @@ func (d *Daemon) showPairingQRRaw(onComplete func()) {
 		return
 	}
 
-	// Create QR data
-	qrData := PairingQRData{
-		Type:      "pairing",
-		Relay:     d.relay,
-		Token:     pairingResp.Token,
-		PCID:      d.pcConfig.PCID,
-		PCName:    d.pcConfig.PCName,
-		PublicKey: d.pcConfig.PublicKey,
-	}
-
 	// Include session info if we have an active session
 	d.mu.RLock()
 	sessionID := d.session
 	workDir := d.workDir
 	agentType := d.agentType
 	d.mu.RUnlock()
 
+	var sessionInfo *SessionQRInfo
 	if sessionID != "" {
-		qrData.SessionID = sessionID
-		qrData.WorkingDir = workDir
-		qrData.AgentType = string(agentType)
-
-		// Add SSH info
-		sshInfo := DetectSSHInfo()
-		if sshInfo != nil && sshInfo.Available {
-			qrData.SSHAvailable = true
-			qrData.SSHPort = sshInfo.Port
-			qrData.Hostname = sshInfo.Hostname
-			qrData.Username = sshInfo.Username
+		sessionInfo = &SessionQRInfo{
+			SessionID: sessionID,
+			WorkDir:   workDir,
+			AgentType: string(agentType),
 		}
 	}
 
+	// Create QR data using shared helper
+	qrData := buildPairingQRData(d.pcConfig, d.relay, pairingResp.Token, sessionInfo)
+
 	qrJSON, err := json.Marshal(qrData)
 	if err != nil {
 		printRaw("%sError creating QR: %v%s\n", red, err, reset)
@@ -200,7 +187,9 @@ func (d *Daemon) pollPairingCompletionRaw(token string, onComplete func()) {
 					PairedAt:  time.Now().Format(time.RFC3339),
 				}
 				d.pcConfig.addPairedMobile(mobile)
-				savePCConfig(d.pcConfig)
+				if err := savePCConfig(d.pcConfig); err != nil {
+					fmt.Printf("%sFailed to save config: %v%s\n", red, err, reset)
+				}
 
 				d.mu.RLock()
 				oldSessionID := d.session