fix: repair message sequence

Author: voocel

internal/bootstrap/boot_assembly.go

@@ -36,25 +36,25 @@ type bootInput struct {
 }
 
 type bootSpec struct {
-	settings       config.Resolved
-	activeProvider string
-	activeModel    string
-	chatModel      agentcore.ChatModel
-	tools          []agentcore.Tool
-	baseTools      []agentcore.Tool
+	settings              config.Resolved
+	activeProvider        string
+	activeModel           string
+	chatModel             agentcore.ChatModel
+	tools                 []agentcore.Tool
+	baseTools             []agentcore.Tool
 	systemBlocks          []agentcore.SystemBlock
 	deferredToolsPreamble string
 	reminders             []string
-	contextFiles   config.ContextFiles
-	skills         []config.Skill
-	mcpManager     *mcpclient.Manager
-	mcpServers     map[string]mcpclient.ServerConfig
-	subagentTool   *agentcore.SubAgentTool
-	bashTool       *agentcoretools.BashTool
-	permission     func(context.Context, agentcore.ToolCall) error
-	policyEngine   *policy.Engine
-	hookMiddleware agentcore.ToolMiddleware // nil = no hooks configured
-	hookRunner     *hooks.Runner
+	contextFiles          config.ContextFiles
+	skills                []config.Skill
+	mcpManager            *mcpclient.Manager
+	mcpServers            map[string]mcpclient.ServerConfig
+	subagentTool          *agentcore.SubAgentTool
+	bashTool              *agentcoretools.BashTool
+	permission            func(context.Context, agentcore.ToolCall) error
+	policyEngine          *policy.Engine
+	hookMiddleware        agentcore.ToolMiddleware // nil = no hooks configured
+	hookRunner            *hooks.Runner
 }
 
 func resolveBootInput(opts Options) (*bootInput, error) {

internal/storage/session_context.go

@@ -131,8 +131,10 @@ func (s *Store) BuildSnapshot() (ContextSnapshot, error) {
 		}
 	}
 
+	repaired := agentcore.RepairMessageSequence(agentcore.CollectMessages(msgs))
+
 	return ContextSnapshot{
-		Messages: msgs,
+		Messages: agentcore.ToAgentMessages(repaired),
 		Provider: lastProvider,
 		Model:    lastModel,
 		Thinking: lastThinking,

internal/storage/session_context_test.go

@@ -44,3 +44,53 @@ func TestBuildContextSnapshotIncludesModelProviderAndThinking(t *testing.T) {
 		t.Fatalf("messages len = %d, want 1", len(snapshot.Messages))
 	}
 }
+
+func TestBuildSnapshotRepairsMissingToolResult(t *testing.T) {
+	t.Parallel()
+
+	dir := t.TempDir()
+	store, err := create(dir, "/workspace/project")
+	if err != nil {
+		t.Fatalf("create store: %v", err)
+	}
+	defer store.Close()
+
+	assistant := agentcore.Message{
+		Role: agentcore.RoleAssistant,
+		Content: []agentcore.ContentBlock{
+			agentcore.ToolCallBlock(agentcore.ToolCall{
+				ID:   "toolu_123",
+				Name: "read",
+				Args: []byte(`{"path":"README.md"}`),
+			}),
+		},
+	}
+	if err := store.AppendMessage(assistant); err != nil {
+		t.Fatalf("append assistant message: %v", err)
+	}
+	if err := store.AppendMessage(agentcore.UserMsg("继续")); err != nil {
+		t.Fatalf("append user message: %v", err)
+	}
+
+	snapshot, err := store.BuildSnapshot()
+	if err != nil {
+		t.Fatalf("build context: %v", err)
+	}
+	if len(snapshot.Messages) != 3 {
+		t.Fatalf("messages len = %d, want 3", len(snapshot.Messages))
+	}
+
+	toolMsg, ok := snapshot.Messages[1].(agentcore.Message)
+	if !ok {
+		t.Fatalf("snapshot message[1] type = %T, want agentcore.Message", snapshot.Messages[1])
+	}
+	if toolMsg.Role != agentcore.RoleTool {
+		t.Fatalf("message[1] role = %s, want %s", toolMsg.Role, agentcore.RoleTool)
+	}
+	if got := toolMsg.Metadata["tool_call_id"]; got != "toolu_123" {
+		t.Fatalf("tool_call_id = %v, want toolu_123", got)
+	}
+	if got := toolMsg.Metadata["is_error"]; got != true {
+		t.Fatalf("is_error = %v, want true", got)
+	}
+}