Add paused sandboxes to the list of running sandboxes

packages/api/internal/handlers/sandbox_get.go

@@ -24,50 +24,60 @@ func (a *APIStore) GetSandboxesSandboxID(c *gin.Context, id string) {
 
 	sandboxId := strings.Split(id, "-")[0]
 
+	// Try to get the running instance first
 	info, err := a.orchestrator.GetInstance(ctx, sandboxId)
-	if err != nil {
-		c.JSON(http.StatusNotFound, fmt.Sprintf("instance \"%s\" doesn't exist or you don't have access to it", id))
+	if err == nil && *info.TeamID == team.ID {
+		// Instance exists and belongs to the team - return running sandbox info
+		build, err := a.db.Client.EnvBuild.Query().Where(envbuild.ID(*info.BuildID)).First(ctx)
+		if err != nil {
+			telemetry.ReportCriticalError(ctx, err)
+			c.JSON(http.StatusInternalServerError, fmt.Sprintf("Error getting build for instance %s", id))
+			return
+		}
+
+		instance := api.RunningSandbox{
+			ClientID:   info.Instance.ClientID,
+			TemplateID: info.Instance.TemplateID,
+			Alias:      info.Instance.Alias,
+			SandboxID:  info.Instance.SandboxID,
+			StartedAt:  info.StartTime,
+			CpuCount:   int32(build.Vcpu),
+			MemoryMB:   int32(build.RAMMB),
+			EndAt:      info.EndTime,
+			State:      "running",
+		}
+
+		if info.Metadata != nil {
+			meta := api.SandboxMetadata(info.Metadata)
+			instance.Metadata = &meta
+		}
+
+		c.JSON(http.StatusOK, instance)
 		return
 	}
 
-	if *info.TeamID != team.ID {
-		c.JSON(http.StatusNotFound, fmt.Sprintf("instance \"%s\" doesn't exist or you don't have access to it", id))
-		return
-	}
-
-	a.posthog.IdentifyAnalyticsTeam(team.ID.String(), team.Name)
-	properties := a.posthog.GetPackageToPosthogProperties(&c.Request.Header)
-	a.posthog.CreateAnalyticsTeamEvent(team.ID.String(), "get running instance", properties)
-
-	build, err := a.db.Client.EnvBuild.Query().Where(envbuild.ID(*info.BuildID)).First(ctx)
+	// If instance not found or doesn't belong to team, try to get the latest snapshot
+	snapshot, build, err := a.db.GetLastSnapshot(ctx, sandboxId, team.ID)
 	if err != nil {
-		telemetry.ReportCriticalError(ctx, err)
-		c.JSON(http.StatusInternalServerError, fmt.Sprintf("Error getting build for instance %s", id))
-
+		fmt.Println(err)
+		c.JSON(http.StatusNotFound, fmt.Sprintf("instance or snapshot \"%s\" doesn't exist or you don't have access to it", id))
 		return
 	}
 
-	memoryMB := int32(-1)
-	cpuCount := int32(-1)
-
-	if build != nil {
-		memoryMB = int32(build.RAMMB)
-		cpuCount = int32(build.Vcpu)
-	}
-
+	// optional
 	instance := api.RunningSandbox{
-		ClientID:   info.Instance.ClientID,
-		TemplateID: info.Instance.TemplateID,
-		Alias:      info.Instance.Alias,
-		SandboxID:  info.Instance.SandboxID,
-		StartedAt:  info.StartTime,
-		CpuCount:   cpuCount,
-		MemoryMB:   memoryMB,
-		EndAt:      info.EndTime,
+		ClientID:   "00000000",
+		TemplateID: snapshot.EnvID,
+		SandboxID:  snapshot.SandboxID,
+		StartedAt:  snapshot.SandboxStartedAt,
+		CpuCount:   int32(build.Vcpu),
+		MemoryMB:   int32(build.RAMMB),
+		EndAt:      snapshot.PausedAt,
+		State:      "paused",
 	}
 
-	if info.Metadata != nil {
-		meta := api.SandboxMetadata(info.Metadata)
+	if snapshot.Metadata != nil {
+		meta := api.SandboxMetadata(snapshot.Metadata)
 		instance.Metadata = &meta
 	}
 

packages/api/internal/handlers/sandbox_pause.go

@@ -49,6 +49,7 @@ func (a *APIStore) PostSandboxesSandboxIDPause(c *gin.Context, sandboxID api.San
 	snapshotConfig := &db.SnapshotInfo{
 		BaseTemplateID:     sbx.Instance.TemplateID,
 		SandboxID:          sandboxID,
+		SandboxStartedAt:   sbx.StartTime,
 		VCPU:               sbx.VCpu,
 		RAMMB:              sbx.RamMB,
 		TotalDiskSizeMB:    sbx.TotalDiskSizeMB,