feat: AppStatus is more unified, with added information.

Author: SSwser

core/main.go

@@ -29,11 +29,12 @@ import (
 )
 
 var configPath = "config.yaml" // 全局可用
-var appStatus = "未启动"
 var extraArgs []string
 var lastFoundArgs []string // 仅记录 FindProcessByPath 找到的参数（不含exe路径）
 var currentAppPid int
 
+var appStatus = internal.NewAppStatus(internal.AppNotStarted, 0, 0, "初始状态")
+
 var (
 	idleTimer  *time.Timer
 	idleTimerC <-chan time.Time
@@ -72,14 +73,6 @@ func internalGetConfig() (*internal.Config, error) {
 	return cfg, nil
 }
 
-func internalGetAppStatus() string {
-	// 用 FindProcessByPath 判断真实运行状态
-	// if pid, _, found := internal.FindProcessByPath(app.Path); found && pid != 0 {
-	// 	return internal.AppRunning.String()
-	// }
-	return fmt.Sprintf("%s", appStatus)
-}
-
 func internalGetActivate() string {
 	cfg, err := internalGetConfig()
 	if err != nil {
@@ -148,10 +141,10 @@ func internalKillCurrentApp() error {
 	}
 	err := internal.KillProcessTreeAndWait(currentAppPid)
 	if err == nil {
-		appStatus = "已终止 (PID=" + fmt.Sprint(currentAppPid) + ")"
+		appStatus = internal.NewAppStatus(internal.AppExited, currentAppPid, 0, "已终止")
 		setCurrentAppPid(0)
 	} else {
-		appStatus = "终止失败 (PID=" + fmt.Sprint(currentAppPid) + ")"
+		appStatus = internal.NewAppStatus(internal.AppExited, currentAppPid, 0, "终止失败")
 	}
 	return err
 }
@@ -187,34 +180,54 @@ func runAppProxy(args []string) {
 	fmt.Printf("[DEBUG] finalArgs: %v\n", finalArgs)
 
 	_, err = internal.StartAppProcess(app.Path, finalArgs, func(status string, pid int, exitErr error) {
+		exitCode := 0
+		if exitErr != nil {
+			if c, ok := internal.ExtractExitCode(exitErr); ok {
+				exitCode = c
+			}
+		}
+
 		switch status {
+		case "start_failed":
+			appStatus = internal.NewAppStatus(internal.AppExited, 0, exitCode, "启动失败")
+			fmt.Printf("启动应用失败: %v\n", exitErr)
 		case "running":
-			appStatus = fmt.Sprintf("运行中 (PID=%d)", pid)
 			setCurrentAppPid(pid)
+			appStatus = internal.NewAppStatus(internal.AppRunning, pid, 0, "运行中")
 			fmt.Printf("已启动应用: %s (PID=%d)\n", app.Path, pid)
 		case "exited":
-			appStatus = fmt.Sprintf("已退出 (PID=%d)", pid)
-			fmt.Println("应用已正常退出")
 			setCurrentAppPid(0)
+			appStatus = internal.NewAppStatus(internal.AppExited, pid, exitCode, "已退出")
+			fmt.Println("应用已正常退出")
 		case "exit_failed":
-			appStatus = fmt.Sprintf("异常退出 (PID=%d)", pid)
-			fmt.Printf("应用异常退出，返回码非0: %v\n", exitErr)
 			setCurrentAppPid(0)
+			code := 1
+			if exitCode != 0 {
+				code = exitCode
+			}
+			appStatus = internal.NewAppStatus(internal.AppExited, pid, code, "异常退出")
+			fmt.Printf("应用异常退出，返回码非0: %v\n", exitErr)
 		case "killed":
-			appStatus = fmt.Sprintf("被终止 (PID=%d)", pid)
-			fmt.Printf("应用被信号终止: %v\n", exitErr)
 			setCurrentAppPid(0)
+			code := 1
+			if exitCode != 0 {
+				code = exitCode
+			}
+			appStatus = internal.NewAppStatus(internal.AppExited, pid, code, "被终止")
+			fmt.Printf("应用被信号终止: %v\n", exitErr)
 		case "crashed":
-			appStatus = fmt.Sprintf("已崩溃 (PID=%d)", pid)
-			fmt.Printf("应用崩溃: %v\n", exitErr)
 			setCurrentAppPid(0)
-		case "start_failed":
-			appStatus = "启动失败"
-			fmt.Printf("启动应用失败: %v\n", exitErr)
+			code := 1
+			if exitCode != 0 {
+				code = exitCode
+			}
+			appStatus = internal.NewAppStatus(internal.AppCrashed, pid, code, "已崩溃")
+			fmt.Printf("应用崩溃: %v\n", exitErr)
 		}
 	})
+
 	if err != nil {
-		appStatus = "启动失败"
+		appStatus = internal.NewAppStatus(internal.AppExited, 0, 0, "启动失败")
 		fmt.Printf("启动应用失败: %v\n", err)
 		return
 	}
@@ -263,7 +276,14 @@ func handleConsoleConn(conn net.Conn, configPath string) {
 	case "activate":
 		conn.Write([]byte(internalGetActivate()))
 	case "status":
-		conn.Write([]byte(internalGetAppStatus()))
+		conn.Write(
+			// 返回详细状态字符串
+			fmt.Appendf(nil, "%s | PID=%d | ExitCode=%d",
+				appStatus.Main.String(),
+				appStatus.Pid,
+				appStatus.ExitCode,
+			),
+		)
 	case "list":
 		cfg, err := internalGetConfig()
 		if err != nil {
@@ -378,7 +398,7 @@ func main() {
 		// 通过进程路径查找是否有已运行实例
 		if pid, args, found := internal.FindProcessByPath(appPath); found {
 			shouldStart = false
-			appStatus = fmt.Sprintf("运行中 (PID=%d)", pid)
+			appStatus = internal.NewAppStatus(internal.AppRunning, pid, 0, "运行中")
 			fmt.Printf("[DEBUG] FindProcessByPath 原始args: %v\n", args)
 			if len(args) > 1 {
 				fmt.Printf("[DEBUG] FindProcessByPath 参数部分: %v\n", args[1:])

internal/apps.go

@@ -3,48 +3,69 @@ package internal
 import (
 	"fmt"
 	"strings"
+	"time"
 )
 
 // AppStatus 表示应用运行状态，用于托盘菜单、主程序等统一判断
-type AppStatus int
+type AppMainStatus int
 
 const (
-	AppUnknown AppStatus = iota
-	AppRunning
-	AppStopped
-	AppExited
-	AppCrashed
+	AppNotStarted AppMainStatus = iota // 未启动
+	AppRunning                         // 运行中
+	AppExited                          // 已退出
+	AppCrashed                         // 已崩溃
+	AppUnknown                         // 未知
 )
 
-func (a AppStatus) String() string {
-	// 与 ParseAppStatus 的判定顺序保持一致
-	switch a {
+func (s AppMainStatus) String() string {
+	switch s {
+	case AppNotStarted:
+		return "未启动"
 	case AppRunning:
 		return "运行中"
-	case AppStopped:
-		return "未启动"
 	case AppExited:
 		return "已退出"
 	case AppCrashed:
 		return "已崩溃"
 	case AppUnknown:
-		fallthrough
+		return "未知"
 	default:
 		return "未知"
 	}
 }
 
-// ParseAppStatus 从描述字符串解析为 AppStatus 枚举
-func ParseAppStatus(status string) AppStatus {
+type AppStatus struct {
+	Main      AppMainStatus // 主状态
+	Pid       int           // 进程PID
+	ExitCode  int           // 退出码
+	Detail    string        // 详细描述
+	Timestamp time.Time     // 状态变更时间
+}
+
+// NewAppStatus 构建带当前时间戳的 AppStatus
+func NewAppStatus(main AppMainStatus, pid, exitCode int, detail string) AppStatus {
+	return AppStatus{
+		Main:      main,
+		Pid:       pid,
+		ExitCode:  exitCode,
+		Detail:    detail,
+		Timestamp: time.Now(),
+	}
+}
+
+// ParseAppStatus 从描述字符串解析为 AppMainStatus 枚举
+func ParseAppStatus(status string) AppMainStatus {
 	switch {
 	case strings.Contains(status, "未启动"):
-		return AppStopped
+		return AppNotStarted
 	case strings.Contains(status, "已退出"):
 		return AppExited
 	case strings.Contains(status, "已崩溃"):
 		return AppCrashed
 	case strings.Contains(status, "运行中"):
 		return AppRunning
+	case strings.Contains(status, "未知"):
+		return AppUnknown
 	default:
 		return AppUnknown
 	}

internal/process.go

@@ -13,6 +13,24 @@ import (
 	"github.com/StackExchange/wmi"
 )
 
+// ExtractExitCode 提取 error 中的退出码（如有），否则返回 false
+func ExtractExitCode(err error) (int, bool) {
+	if err == nil {
+		return 0, false
+	}
+	if exitErr, ok := err.(*exec.ExitError); ok {
+		// 优先使用 Go1.12+ ExitCode()
+		if code := exitErr.ExitCode(); code != -1 {
+			return code, true
+		}
+		// 尝试 syscall.WaitStatus
+		if status, ok := exitErr.Sys().(syscall.WaitStatus); ok {
+			return status.ExitStatus(), true
+		}
+	}
+	return 0, false
+}
+
 // 检查进程是否存活（windows 适用）
 func IsProcessAlive(pid int) bool {
 	if pid == 0 {

launcher/command/command.go

@@ -72,12 +72,12 @@ func GetActivate() string {
 }
 
 // GetAppStatus returns AppStatus from "status".
-func GetAppStatus() internal.AppStatus {
+func GetAppStatus() string {
 	resp, err := SendCommand("status")
 	if err != nil {
-		return internal.AppUnknown
+		return internal.AppUnknown.String()
 	}
-	return internal.ParseAppStatus(resp)
+	return resp
 }
 
 // GetAppInfo 获取应用信息，name 为空则为当前激活 app，否则为指定 app。

launcher/main.go

@@ -46,19 +46,19 @@ func trayOnReady() {
 			},
 		},
 		{
-			Title:   "应用: ",
-			Tooltip: "当前运行的应用",
+			Title:   "状态：",
+			Tooltip: "应用运行状态",
 			Disable: true,
 			OnRefresh: func(item *systray.MenuItem) {
-				item.SetTitle("应用: " + command.GetActivate())
+				item.SetTitle("状态: " + command.GetAppStatus())
 			},
 		},
 		{
-			Title:   "状态：",
-			Tooltip: "应用运行状态",
+			Title:   "应用: ",
+			Tooltip: "当前运行的应用",
 			Disable: true,
 			OnRefresh: func(item *systray.MenuItem) {
-				item.SetTitle("状态: " + command.GetAppStatus().String())
+				item.SetTitle("应用: " + command.GetActivate())
 			},
 		},
 		{
@@ -99,7 +99,7 @@ func trayOnReady() {
 			Title:   "启动 / 重启",
 			Tooltip: "运行或重启当前激活的应用",
 			OnClick: func(item *systray.MenuItem) {
-				status := command.GetAppStatus()
+				status := internal.ParseAppStatus(command.GetAppStatus())
 				if status == internal.AppRunning {
 					command.RestartApp()
 				} else {