Refactored to add loadSession(), removed inaccessible code path

Author: noahlwest

cmd/main.go

@@ -416,18 +416,6 @@ func RunRootCommand(ctx context.Context, opt Options, args []string) error {
 				if err != nil {
 					return fmt.Errorf("failed to get latest session: %w", err)
 				}
-				if chatStore == nil {
-					// No sessions exist, create a new one
-					meta := sessions.Metadata{
-						ProviderID: opt.ProviderID,
-						ModelID:    opt.ModelID,
-					}
-					chatStore, err = sessionManager.NewSession(meta)
-					if err != nil {
-						return fmt.Errorf("failed to create new session: %w", err)
-					}
-					klog.Infof("Created new session: %s\n", chatStore.(*sessions.Session).ID)
-				}
 			} else {
 				sessionID = opt.ResumeSession
 				chatStore, err = sessionManager.FindSessionByID(sessionID)

pkg/agent/conversation.go

@@ -200,13 +200,7 @@ func (s *Agent) Init(ctx context.Context) error {
 	}
 
 	if session, ok := s.ChatMessageStore.(*sessions.Session); ok {
-		metadata, err := session.LoadMetadata()
-		if err != nil {
-			return fmt.Errorf("failed to load session metadata: %w", err)
-		}
-		s.session.ID = session.ID
-		s.session.CreatedAt = metadata.CreatedAt
-		s.session.LastModified = metadata.LastAccessed
+		s.loadSession(session.ID)
 	} else {
 		s.session.ID = uuid.New().String()
 		s.session.CreatedAt = time.Now()
@@ -747,36 +741,62 @@ func (c *Agent) handleMetaQuery(ctx context.Context, query string) (answer strin
 			return "Invalid command. Usage: resume-session <session_id>", true, nil
 		}
 		sessionID := parts[1]
-
-		manager, err := sessions.NewSessionManager()
-		if err != nil {
-			return "", false, fmt.Errorf("failed to create session manager: %w", err)
+		if err := c.loadSession(sessionID); err != nil {
+			return "", false, err
 		}
+		return fmt.Sprintf("Resumed session %s.", sessionID), true, nil
+	}
 
-		session, err := manager.FindSessionByID(sessionID)
+	return "", false, nil
+}
+
+// loadSession loads a session by ID (or latest), updates the agent's state, and re-initializes the chat.
+func (c *Agent) loadSession(sessionID string) error {
+	manager, err := sessions.NewSessionManager()
+	if err != nil {
+		return fmt.Errorf("failed to create session manager: %w", err)
+	}
+
+	var session *sessions.Session
+	if sessionID == "" || sessionID == "latest" {
+		s, err := manager.GetLatestSession()
 		if err != nil {
-			return "", false, fmt.Errorf("failed to get session: %w", err)
+			return fmt.Errorf("failed to get latest session: %w", err)
 		}
-
-		c.sessionMu.Lock()
-		c.ChatMessageStore = session
-		c.session.ChatMessageStore = session
-		c.session.Messages = session.ChatMessages()
-		metadata, err := session.LoadMetadata()
+		if s == nil {
+			// This can happen if GetLatestSession returns nil, nil (no sessions exist)
+			return fmt.Errorf("no sessions found to resume")
+		}
+		session = s
+	} else {
+		s, err := manager.FindSessionByID(sessionID)
 		if err != nil {
-			c.sessionMu.Unlock()
-			return "", false, fmt.Errorf("failed to load session metadata: %w", err)
+			return fmt.Errorf("failed to get session %q: %w", sessionID, err)
 		}
-		c.session.ID = session.ID
-		c.session.CreatedAt = metadata.CreatedAt
-		c.session.LastModified = metadata.LastAccessed
-		c.llmChat.Initialize(c.session.ChatMessageStore.ChatMessages())
-		c.sessionMu.Unlock()
+		session = s
+	}
 
-		return fmt.Sprintf("Resumed session %s.", sessionID), true, nil
+	c.sessionMu.Lock()
+	defer c.sessionMu.Unlock()
+
+	c.ChatMessageStore = session
+	c.session.ChatMessageStore = session
+	c.session.Messages = session.ChatMessages()
+	metadata, err := session.LoadMetadata()
+	if err != nil {
+		return fmt.Errorf("failed to load session metadata: %w", err)
 	}
+	c.session.ID = session.ID
+	c.session.CreatedAt = metadata.CreatedAt
+	c.session.LastModified = metadata.LastAccessed
 
-	return "", false, nil
+	if c.llmChat != nil {
+		if err := c.llmChat.Initialize(c.session.ChatMessageStore.ChatMessages()); err != nil {
+			return fmt.Errorf("failed to re-initialize chat with new session: %w", err)
+		}
+	}
+
+	return nil
 }
 
 func (c *Agent) listModels(ctx context.Context) ([]string, error) {