fix: first message

Author: voocel

internal/agent/session_runtime.go

@@ -20,7 +20,7 @@ func (s *Session) Prompt(text string) error {
 
 	var msgs []agentcore.AgentMessage
 	if !s.preambleInjected && s.deferredToolsPreamble != "" {
-		msgs = append(msgs, agentcore.UserMsg(s.deferredToolsPreamble))
+		msgs = append(msgs, injectedUserMsg(s.deferredToolsPreamble))
 		s.preambleInjected = true
 	}
 	msgs = append(msgs, s.buildUserMessage(agentcore.TextBlock(text)))
@@ -35,7 +35,7 @@ func (s *Session) PromptWithBlocks(blocks []agentcore.ContentBlock) error {
 
 	var msgs []agentcore.AgentMessage
 	if !s.preambleInjected && s.deferredToolsPreamble != "" {
-		msgs = append(msgs, agentcore.UserMsg(s.deferredToolsPreamble))
+		msgs = append(msgs, injectedUserMsg(s.deferredToolsPreamble))
 		s.preambleInjected = true
 	}
 	msgs = append(msgs, s.buildUserMessage(blocks...))
@@ -426,6 +426,7 @@ func (s *Session) SwitchSession(id string) error {
 		if err := s.agent.SetMessages(snapshot.Messages); err != nil {
 			return fmt.Errorf("restore messages: %w", err)
 		}
+		agentcore.ReactivateDeferred(s.allTools, snapshot.Messages)
 	}
 	if snapshot.Thinking != "" {
 		thinkingLevel := agentcore.ThinkingLevel(snapshot.Thinking)
@@ -565,3 +566,11 @@ func (s *Session) Close() {
 		store.Close()
 	}
 }
+
+// injectedUserMsg creates a user message marked as system-injected via metadata.
+// Auto-naming and session listing skip messages with this marker.
+func injectedUserMsg(text string) agentcore.Message {
+	msg := agentcore.UserMsg(text)
+	msg.Metadata = map[string]any{"injected": true}
+	return msg
+}

internal/agent/session_state.go

@@ -174,7 +174,10 @@ func (p *sessionPersistence) tryAutoName() {
 		if !ok || msg.Role != agentcore.RoleUser {
 			continue
 		}
-		text := msg.TextContent()
+		if msg.Metadata["injected"] == true {
+			continue
+		}
+		text := lastTextBlock(msg)
 		if text == "" {
 			continue
 		}
@@ -573,6 +576,19 @@ func truncateMessageText(msg agentcore.Message) agentcore.Message {
 	}
 }
 
+// lastTextBlock returns the text of the last ContentText block in msg.
+// In buildUserMessage, reminder blocks are prepended and the user's actual
+// input is always the final text block, so this extracts the real user text.
+func lastTextBlock(msg agentcore.Message) string {
+	var last string
+	for _, b := range msg.Content {
+		if b.Type == agentcore.ContentText && b.Text != "" {
+			last = b.Text
+		}
+	}
+	return last
+}
+
 func truncateBytes(b []byte, n int) string {
 	if len(b) <= n {
 		return string(b)

internal/bootstrap/boot_assembly.go

@@ -480,6 +480,7 @@ func buildRuntime(input *bootInput, spec *bootSpec) (*Runtime, error) {
 		if err := ag.SetMessages(input.snapshot.Messages); err != nil {
 			return nil, fmt.Errorf("restore agent messages: %w", err)
 		}
+		agentcore.ReactivateDeferred(spec.tools, input.snapshot.Messages)
 	}
 	if input.snapshot.Thinking != "" {
 		ag.SetThinkingLevel(agentcore.ThinkingLevel(input.snapshot.Thinking))

internal/storage/session_manager.go

@@ -148,16 +148,18 @@ func readSessionInfo(path string) (SessionInfo, error) {
 			messageCount++
 			if firstMessage == "" {
 				var msg struct {
-					Role    string `json:"role"`
-					Content []struct {
+					Role     string `json:"role"`
+					Content  []struct {
 						Text string `json:"text"`
 					} `json:"content"`
+					Metadata map[string]any `json:"metadata,omitempty"`
 				}
-				if json.Unmarshal(e.Data, &msg) == nil && msg.Role == "user" {
+				if json.Unmarshal(e.Data, &msg) == nil && msg.Role == "user" && msg.Metadata["injected"] != true {
+					// Take the last text block: reminders are prepended,
+					// the user's actual input is always the final text block.
 					for _, c := range msg.Content {
 						if c.Text != "" {
 							firstMessage = c.Text
-							break
 						}
 					}
 					if len(firstMessage) > 80 {

internal/ui/tui/model.go

@@ -475,7 +475,7 @@ func (m Model) handleKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 			return m, nil
 		case "enter":
 			m.acceptCompletion()
-			return m, nil
+			// Fall through to normal enter handling to execute the command directly.
 		case "up":
 			if m.compIdx > 0 {
 				m.compIdx--