various restart/devbox fixes (#288)

* restart init also on nil

* add gops to localds via hidden flags

* update-go-mod

* change column name

* various fixes

* CR: cleanup

Also distinguish restart from not-ok more correctly
in tp_monitor

Author: scott-cotton

go.mod

@@ -16,6 +16,7 @@ require (
 	github.com/go-openapi/strfmt v0.25.0
 	github.com/goccy/go-yaml v1.10.0
 	github.com/golang/protobuf v1.5.4
+	github.com/google/gops v0.3.28
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/jclem/sseparser v0.5.0
 	github.com/modelcontextprotocol/go-sdk v1.1.0

go.sum

@@ -271,6 +271,8 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gops v0.3.28 h1:2Xr57tqKAmQYRAfG12E+yLcoa2Y42UJo2lOrUFL9ark=
+github.com/google/gops v0.3.28/go.mod h1:6f6+Nl8LcHrzJwi8+p0ii+vmBFSlB4f8cOOkTJ7sk4c=
 github.com/google/jsonschema-go v0.3.0 h1:6AH2TxVNtk3IlvkkhjrtbUc4S8AvO0Xii0DxIygDg+Q=
 github.com/google/jsonschema-go v0.3.0/go.mod h1:r5quNTdLOYEz95Ru18zA0ydNbBuYoo9tgaYcxEYhJVE=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=

internal/command/devbox/printers.go

@@ -16,7 +16,7 @@ type devboxRow struct {
 	OS         string `sdtab:"OS"`
 	MachineID  string `sdtab:"MACHINE ID,trunc"`
 	Status     string `sdtab:"STATUS"`
-	ValidUntil string `sdtab:"VALID UNTIL"`
+	ValidUntil string `sdtab:"EXPIRES"`
 }
 
 // printDevboxTable prints devboxes in a table format.

internal/command/local/connect.go

@@ -210,6 +210,9 @@ func runConnectImpl(out, errOut io.Writer, log *slog.Logger, localConfig *config
 			"--daemon",
 			"--root-manager",
 		}
+		if localConfig.GOPSAddrRoot != "" {
+			args = append(args, "--gops-root-addr", localConfig.GOPSAddrRoot)
+		}
 		if localConfig.PProfAddr != "" {
 			args = append(args, "--pprof", localConfig.PProfAddr)
 		}
@@ -221,6 +224,9 @@ func runConnectImpl(out, errOut io.Writer, log *slog.Logger, localConfig *config
 			"--daemon",
 			"--sandbox-manager",
 		)
+		if localConfig.GOPSAddrNonRoot != "" {
+			cmd.Args = append(cmd.Args, "--gops-non-root-addr", localConfig.GOPSAddrNonRoot)
+		}
 		cmd.Env = append(cmd.Env, ciConfig.Env...)
 	}
 	cmd.Env = append(cmd.Env,

internal/command/local/printers.go

@@ -341,17 +341,15 @@ func getRawDevboxSession(cfg *config.LocalStatus, devboxSession *commonapi.Devbo
 	// Standard view
 	type PrintableDevboxSession struct {
 		Healthy         bool   `json:"healthy"`
-		SessionReleased bool   `json:"sessionReleased"`
 		DevboxId        string `json:"devboxId,omitempty"`
 		SessionId       string `json:"sessionId,omitempty"`
 		LastErrorReason string `json:"lastErrorReason,omitempty"`
 	}
 
 	result := &PrintableDevboxSession{
-		Healthy:         devboxSession.Healthy,
-		SessionReleased: devboxSession.SessionReleased,
-		DevboxId:        devboxSession.DevboxId,
-		SessionId:       devboxSession.SessionId,
+		Healthy:  devboxSession.Healthy,
+		DevboxId: devboxSession.DevboxId,
+		SessionId: devboxSession.SessionId,
 	}
 
 	if devboxSession.LastErrorReason != "" {
@@ -380,11 +378,7 @@ func printLocalStatus(cfg *config.LocalStatus, out io.Writer, status *sbmapi.Sta
 	}
 	// runtime config
 	printer.printRuntimeConfig()
-	// Check devbox session status
-	if status.DevboxSession != nil && status.DevboxSession.SessionReleased {
-		printer.printErrors(append(connectErrs, fmt.Errorf("devbox session no longer available (released by another process)")))
-		return nil
-	}
+	// Check devbox session status (no longer checking for session release)
 
 	// print status
 	if len(connectErrs) == 0 {
@@ -464,13 +458,13 @@ func (p *statusPrinter) printDevboxSessionStatus() {
 	}
 
 	ds := p.status.DevboxSession
-	if ds.SessionReleased {
-		msg := "devbox session no longer available"
+	if !ds.Healthy {
+		msg := "devbox session unhealthy"
 		if ds.LastErrorReason != "" {
 			msg += fmt.Sprintf(": %s", ds.LastErrorReason)
 		}
 		p.printLine(p.out, 1, msg, p.red("✗"))
-	} else if ds.Healthy {
+	} else {
 		msg := fmt.Sprintf("devbox session active (devbox: %s, session: %s)", ds.DevboxId, ds.SessionId)
 		if p.cfg.Details && ds.SessionId != "" {
 			msg = "devbox session active"
@@ -480,12 +474,6 @@ func (p *statusPrinter) printDevboxSessionStatus() {
 		} else {
 			p.printLine(p.out, 1, msg, p.green("✓"))
 		}
-	} else {
-		msg := "devbox session unhealthy"
-		if ds.LastErrorReason != "" {
-			msg += fmt.Sprintf(": %s", ds.LastErrorReason)
-		}
-		p.printLine(p.out, 1, msg, p.red("✗"))
 	}
 }
 

internal/command/locald/locald.go

@@ -72,9 +72,15 @@ func run(cfg *config.LocalDaemon, args []string) error {
 		}
 		if cfg.RootManager {
 			args = append(args, "--root-manager")
+			if cfg.GOPSAddrRoot != "" {
+				args = append(args, "--gops-root-addr", cfg.GOPSAddrRoot)
+			}
 		} else {
 			args = append(args, "--sandbox-manager")
 			env = append(env, ciConfig.Env...)
+			if cfg.GOPSAddrNonRoot != "" {
+				args = append(args, "--gops-non-root-addr", cfg.GOPSAddrNonRoot)
+			}
 		}
 		cmd := exec.Command(binary, args...)
 		cmd.Env = env

internal/config/local.go

@@ -26,6 +26,10 @@ type Local struct {
 
 	// initialized from ~/.signadot/config.yaml
 	LocalConfig *config.Config
+
+	// hidden
+	GOPSAddrRoot    string
+	GOPSAddrNonRoot string
 }
 
 func (l *Local) InitLocalConfig() error {
@@ -120,6 +124,10 @@ func (c *LocalConnect) AddFlags(cmd *cobra.Command) {
 	cmd.Flags().Lookup("wait").NoOptDefVal = ConnectWaitConnect.String()
 	cmd.Flags().StringVar(&c.PProfAddr, "pprof", "", "pprof listen address")
 	cmd.Flags().MarkHidden("pprof")
+	cmd.Flags().StringVar(&c.GOPSAddrRoot, "gops-root-addr", "", "gops root address")
+	cmd.Flags().MarkHidden("gops-root-addr")
+	cmd.Flags().StringVar(&c.GOPSAddrNonRoot, "gops-non-root-addr", "", "gops root address")
+	cmd.Flags().MarkHidden("gops-non-root-addr")
 }
 
 type ConnectWait int

internal/config/locald.go

@@ -30,6 +30,8 @@ type LocalDaemon struct {
 	// Hidden Flags
 	ConnectInvocationConfigFile string
 	PProfAddr                   string
+	GOPSAddrRoot                string
+	GOPSAddrNonRoot             string
 }
 
 func (ld *LocalDaemon) InitLocalDaemon() error {
@@ -106,13 +108,17 @@ func (ciConfig *ConnectInvocationConfig) GetLogName(isRootManager bool) string {
 	return SandboxManagerLogFile
 }
 
-func (c *LocalDaemon) AddFlags(cmd *cobra.Command) {
-	cmd.Flags().BoolVar(&c.DaemonRun, "daemon", false, "run in background as daemon")
-	cmd.Flags().BoolVar(&c.RootManager, "root-manager", false, "run the root-manager (privileged daemon)")
-	cmd.Flags().BoolVar(&c.SandboxManager, "sandbox-manager", false, "run the sandbox-manager (unprivileged daemon)")
+func (ld *LocalDaemon) AddFlags(cmd *cobra.Command) {
+	cmd.Flags().BoolVar(&ld.DaemonRun, "daemon", false, "run in background as daemon")
+	cmd.Flags().BoolVar(&ld.RootManager, "root-manager", false, "run the root-manager (privileged daemon)")
+	cmd.Flags().BoolVar(&ld.SandboxManager, "sandbox-manager", false, "run the sandbox-manager (unprivileged daemon)")
 
-	cmd.Flags().StringVar(&c.ConnectInvocationConfigFile, "ci-config-file", "", "by-pass calling signadot local connect (hidden)")
+	cmd.Flags().StringVar(&ld.ConnectInvocationConfigFile, "ci-config-file", "", "by-pass calling signadot local connect (hidden)")
 	cmd.Flags().MarkHidden("ci-config-file")
-	cmd.Flags().StringVar(&c.PProfAddr, "pprof", "", "pprof listen address")
+	cmd.Flags().StringVar(&ld.PProfAddr, "pprof", "", "pprof listen address")
 	cmd.Flags().MarkHidden("pprof")
+	cmd.Flags().StringVar(&ld.GOPSAddrRoot, "gops-root-addr", "", "gops root address")
+	cmd.Flags().MarkHidden("gops-root-addr")
+	cmd.Flags().StringVar(&ld.GOPSAddrNonRoot, "gops-non-root-addr", "", "gops root address")
+	cmd.Flags().MarkHidden("gops-non-root-addr")
 }