perf: move task store to storage

Author: voocel

internal/agent/session.go

@@ -10,7 +10,6 @@ import (
 	"github.com/voocel/codebot/internal/provider"
 	"github.com/voocel/codebot/internal/skill"
 	"github.com/voocel/codebot/internal/storage"
-	localtools "github.com/voocel/codebot/internal/tools"
 )
 
 // ModelFactory creates a chat model instance for a provider/model tuple.
@@ -25,7 +24,7 @@ type SessionConfig struct {
 	Registry       *provider.ModelRegistry
 	Settings       config.Resolved
 	Cwd            string
-	TaskStore      *localtools.TaskStore
+	TaskStore      *storage.TaskStore
 	// CreateModel allows tests/integrations to override model construction.
 	// Defaults to provider.CreateModel when nil.
 	CreateModel ModelFactory
@@ -82,10 +81,10 @@ type Session struct {
 	skills            []skill.Spec
 	skillCatalog      *skill.Catalog
 	skillUsage        *skill.UsageTracker
-	overlays          promptOverlays
+	overlays          overlayStore
 	beforePrompt      func()
 	hookRunner        *hooks.Runner
-	taskStore         *localtools.TaskStore
+	taskStore         *storage.TaskStore
 	skillAllowsSetter func([]string)
 	skillRuntime      skillRuntimeState
 
@@ -145,10 +144,39 @@ type invokedSkillSnapshot struct {
 	Timestamp  time.Time
 }
 
-type promptOverlays struct {
-	MCP          string
-	PlanMode     string
-	ApprovedPlan string
+type overlayStore struct {
+	order []string
+	byKey map[string]string
+}
+
+func (o *overlayStore) set(key, text string) {
+	if o.byKey == nil {
+		o.byKey = make(map[string]string)
+	}
+	if text == "" {
+		delete(o.byKey, key)
+		for i, k := range o.order {
+			if k == key {
+				o.order = append(o.order[:i], o.order[i+1:]...)
+				break
+			}
+		}
+		return
+	}
+	if _, exists := o.byKey[key]; !exists {
+		o.order = append(o.order, key)
+	}
+	o.byKey[key] = text
+}
+
+func (o *overlayStore) texts() []string {
+	out := make([]string, 0, len(o.order))
+	for _, k := range o.order {
+		if v := o.byKey[k]; v != "" {
+			out = append(out, v)
+		}
+	}
+	return out
 }
 
 // NewSession creates a Session and wires auto-persist to the agent.
@@ -201,16 +229,16 @@ func NewSession(cfg SessionConfig) *Session {
 	return s
 }
 
-func (s *Session) SetTaskNotifyFn(fn localtools.TaskNotifyFn) {
+func (s *Session) SetTaskNotifyFn(fn storage.TaskNotifyFn) {
 	if s.taskStore == nil {
 		return
 	}
 	s.taskStore.SetNotifyFn(fn)
 }
 
-func (s *Session) TaskSnapshot() localtools.TaskSnapshot {
+func (s *Session) TaskSnapshot() storage.TaskSnapshot {
 	if s.taskStore == nil {
-		return localtools.TaskSnapshot{}
+		return storage.TaskSnapshot{}
 	}
 	return s.taskStore.Snapshot()
 }

internal/agent/session_prompt.go

@@ -37,28 +37,14 @@ func (s *Session) ReplaceMCPTools(tools []agentcore.Tool) {
 	s.prompts.replaceMCPTools(tools)
 }
 
-func (s *Session) SetSystemSuffix(suffix string) {
-	s.prompts.setApprovedPlanPrompt(suffix)
-}
-
 func (s *Session) SetMCPInstructions(text string) {
-	s.prompts.setMCPInstructions(text)
-}
-
-func (s *Session) SetPlanModePrompt(text string) {
-	s.prompts.setPlanModePrompt(text)
-}
-
-func (s *Session) ClearPlanModePrompt() {
-	s.prompts.setPlanModePrompt("")
-}
-
-func (s *Session) SetApprovedPlanPrompt(text string) {
-	s.prompts.setApprovedPlanPrompt(text)
+	s.prompts.overlayPrompt("mcp", text)
 }
 
-func (s *Session) ClearApprovedPlanPrompt() {
-	s.prompts.setApprovedPlanPrompt("")
+// OverlayPrompt registers or removes a named instructions overlay.
+// Pass empty text to remove. Overlays are rendered in insertion order.
+func (s *Session) OverlayPrompt(key, text string) {
+	s.prompts.overlayPrompt(key, text)
 }
 
 func (s *Session) Skills() []skill.Spec {
@@ -152,18 +138,8 @@ func (m *sessionPromptManager) replaceMCPTools(tools []agentcore.Tool) {
 	m.rebuildPrompt()
 }
 
-func (m *sessionPromptManager) setMCPInstructions(text string) {
-	m.session.overlays.MCP = text
-	m.rebuildPrompt()
-}
-
-func (m *sessionPromptManager) setPlanModePrompt(text string) {
-	m.session.overlays.PlanMode = text
-	m.rebuildPrompt()
-}
-
-func (m *sessionPromptManager) setApprovedPlanPrompt(text string) {
-	m.session.overlays.ApprovedPlan = text
+func (m *sessionPromptManager) overlayPrompt(key, text string) {
+	m.session.overlays.set(key, text)
 	m.rebuildPrompt()
 }
 
@@ -208,14 +184,8 @@ func (m *sessionPromptManager) rebuildPrompt() {
 
 	// Build two-block system prompt (identity + instructions) for cache stability.
 	identity, instructions := config.BuildSystemBlockTexts(m.session.cwd, m.session.contextFiles, visibleInfos)
-	for _, overlay := range []string{
-		m.session.overlays.MCP,
-		m.session.overlays.PlanMode,
-		m.session.overlays.ApprovedPlan,
-	} {
-		if strings.TrimSpace(overlay) != "" {
-			instructions += "\n\n" + overlay
-		}
+	for _, overlay := range m.session.overlays.texts() {
+		instructions += "\n\n" + overlay
 	}
 	blocks := []agentcore.SystemBlock{
 		{Text: identity, CacheControl: "ephemeral"},

internal/agent/session_runtime.go

@@ -499,7 +499,19 @@ func (s *Session) providerType(prov string) (string, error) {
 	return config.ResolveProviderType(prov, "")
 }
 
-func (s *Session) ResolveAndSetModel(pattern string) (string, error) {
+func (s *Session) ResolveAndSetModel(pattern string) (resolved string, err error) {
+	defer func() {
+		if err == nil {
+			prov, model := s.Provider(), s.ModelName()
+			if e := config.PatchGlobalSettings(config.Settings{
+				Provider: &prov,
+				Model:    &model,
+			}); e != nil {
+				fmt.Fprintf(os.Stderr, "warning: persist model setting: %v\n", e)
+			}
+		}
+	}()
+
 	// Extract :thinking suffix (e.g. "model:high").
 	thinkingLevel := agentcore.ThinkingLevel("")
 	if idx := strings.LastIndex(pattern, ":"); idx > 0 {

internal/agent/session_test.go

@@ -524,6 +524,7 @@ func TestSetModelDoesNotRewriteGlobalSettings(t *testing.T) {
 	})
 	t.Cleanup(s.Close)
 
+	// SetModel (internal) should NOT persist to global settings.
 	if err := s.SetModel("anthropic", "claude-sonnet-4-5"); err != nil {
 		t.Fatalf("set model: %v", err)
 	}
@@ -538,9 +539,6 @@ func TestSetModelDoesNotRewriteGlobalSettings(t *testing.T) {
 	if got.Model != "gpt-5.4" {
 		t.Fatalf("model rewritten: got %q want %q", got.Model, "gpt-5.4")
 	}
-	if got.SmallModel != "gpt-5.4" {
-		t.Fatalf("small model rewritten: got %q want %q", got.SmallModel, "gpt-5.4")
-	}
 	if s.Provider() != "anthropic" {
 		t.Fatalf("session provider not switched: got %q want %q", s.Provider(), "anthropic")
 	}
@@ -787,8 +785,8 @@ func TestPromptOverlaysAppendInFixedOrder(t *testing.T) {
 	t.Cleanup(s.Close)
 
 	s.SetMCPInstructions("mcp overlay")
-	s.SetPlanModePrompt("plan overlay")
-	s.SetApprovedPlanPrompt("approved overlay")
+	s.OverlayPrompt("plan.mode", "plan overlay")
+	s.OverlayPrompt("plan.approved", "approved overlay")
 
 	systemPrompt := ag.State().SystemPrompt
 	mcpIdx := strings.Index(systemPrompt, "mcp overlay")
@@ -987,7 +985,7 @@ func TestPromptDoesNotQueueTaskManagementReminderFromUserText(t *testing.T) {
 		Agent:     ag,
 		Settings:  config.Resolved{MaxTurns: 30},
 		Cwd:       t.TempDir(),
-		TaskStore: localtools.NewTaskStore(),
+		TaskStore: storage.NewTaskStore(),
 	})
 	t.Cleanup(s.Close)
 
@@ -1008,10 +1006,10 @@ func TestPromptDoesNotQueueTaskManagementReminderFromUserText(t *testing.T) {
 func TestTaskManagementReminderSteersBeforeStopWithOpenInProgressTask(t *testing.T) {
 	t.Parallel()
 
-	store := localtools.NewTaskStore()
+	store := storage.NewTaskStore()
 	task := store.Create("Summarize project state", "Write the final analysis summary", "Summarizing project state", nil)
-	inProgress := localtools.TaskInProgress
-	if _, err := store.Update(task.ID, localtools.TaskUpdateOpts{Status: &inProgress}); err != nil {
+	inProgress := storage.TaskInProgress
+	if _, err := store.Update(task.ID, storage.TaskUpdateOpts{Status: &inProgress}); err != nil {
 		t.Fatalf("set task in_progress: %v", err)
 	}
 

internal/agent/task_reminders.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/voocel/agentcore"
-	localtools "github.com/voocel/codebot/internal/tools"
+	"github.com/voocel/codebot/internal/storage"
 )
 
 const (
@@ -15,7 +15,7 @@ const (
 	taskReminderTurnsBetweenReminders = 10
 )
 
-func taskManagementReminderForNextPrompt(msgs []agentcore.AgentMessage, snap localtools.TaskSnapshot) (key, reminder string, ok bool) {
+func taskManagementReminderForNextPrompt(msgs []agentcore.AgentMessage, snap storage.TaskSnapshot) (key, reminder string, ok bool) {
 	if snap.Total == 0 {
 		return "", "", false
 	}
@@ -42,7 +42,7 @@ func taskManagementReminderForNextPrompt(msgs []agentcore.AgentMessage, snap loc
 	return "task_management:stale", sb.String(), true
 }
 
-func taskManagementReminderBeforeStop(msg agentcore.Message, snap localtools.TaskSnapshot) (key, reminder string, ok bool) {
+func taskManagementReminderBeforeStop(msg agentcore.Message, snap storage.TaskSnapshot) (key, reminder string, ok bool) {
 	if msg.Role != agentcore.RoleAssistant || msg.StopReason != agentcore.StopReasonStop {
 		return "", "", false
 	}
@@ -66,14 +66,14 @@ func taskManagementReminderBeforeStop(msg agentcore.Message, snap localtools.Tas
 	return "", "", false
 }
 
-func inProgressTasks(snap localtools.TaskSnapshot) []localtools.Task {
+func inProgressTasks(snap storage.TaskSnapshot) []storage.Task {
 	if len(snap.Items) == 0 || snap.InProgress == 0 {
 		return nil
 	}
 
-	out := make([]localtools.Task, 0, snap.InProgress)
+	out := make([]storage.Task, 0, snap.InProgress)
 	for _, task := range snap.Items {
-		if task.Status == localtools.TaskInProgress {
+		if task.Status == storage.TaskInProgress {
 			out = append(out, task)
 		}
 	}

internal/bootstrap/services.go

@@ -13,7 +13,7 @@ import (
 	mcpclient "github.com/voocel/codebot/internal/mcp"
 	"github.com/voocel/codebot/internal/plugin"
 	"github.com/voocel/codebot/internal/skill"
-	localtools "github.com/voocel/codebot/internal/tools"
+	"github.com/voocel/codebot/internal/storage"
 )
 
 type bootServices struct {
@@ -24,7 +24,7 @@ type bootServices struct {
 	skillUsage     *skill.UsageTracker
 	mcpManager     *mcpclient.Manager
 	mcpServers     map[string]mcpclient.ServerConfig
-	taskStore      *localtools.TaskStore
+	taskStore      *storage.TaskStore
 }
 
 func buildServices(input *resolvedInput) (*bootServices, error) {
@@ -103,8 +103,8 @@ func buildMCPServices(cwd string, contrib plugin.Contributions) (*mcpclient.Mana
 	return mcpclient.NewManager(), mcpServers
 }
 
-func newTaskStore(input *resolvedInput) *localtools.TaskStore {
-	taskStore := localtools.NewTaskStore()
+func newTaskStore(input *resolvedInput) *storage.TaskStore {
+	taskStore := storage.NewTaskStore()
 	taskDir := filepath.Join(config.TasksDir(), input.sessionStore.Header().SessionID)
 	if err := taskStore.SetDir(taskDir); err != nil {
 		fmt.Fprintf(os.Stderr, "warning: task persistence: %v\n", err)

internal/plan/manager.go

@@ -190,26 +190,31 @@ func (c *Manager) applyState(state State) {
 	}
 	c.wireValidators()
 
+	const (
+		planModeOverlay     = "plan.mode"
+		planApprovedOverlay = "plan.approved"
+	)
+
 	switch state.Phase {
 	case PhasePlanning:
 		readOnly := c.session.ToolsByName("read", "glob", "grep", "ls", "ask_user")
 		c.session.SetTools(append(readOnly, c.newExitTool())...)
-		c.session.SetPlanModePrompt(modePrompt)
-		c.session.ClearApprovedPlanPrompt()
+		c.session.OverlayPrompt(planModeOverlay, modePrompt)
+		c.session.OverlayPrompt(planApprovedOverlay, "")
 		if c.approval != nil {
 			c.approval.SetPlanMode(true)
 			c.approval.SetPlanAllowedCommands(nil)
 		}
 	case PhaseReview:
-		c.session.SetPlanModePrompt(modePrompt)
-		c.session.ClearApprovedPlanPrompt()
+		c.session.OverlayPrompt(planModeOverlay, modePrompt)
+		c.session.OverlayPrompt(planApprovedOverlay, "")
 		if c.approval != nil {
 			c.approval.SetPlanMode(true)
 			c.approval.SetPlanAllowedCommands(nil)
 		}
 	default:
 		c.session.RestoreAllTools()
-		c.session.ClearPlanModePrompt()
+		c.session.OverlayPrompt(planModeOverlay, "")
 		if c.approval != nil {
 			c.approval.SetPlanMode(false)
 			if mode, err := approval.ParseMode(state.PreMode); err == nil && state.PreMode != "" {
@@ -219,11 +224,11 @@ func (c *Manager) applyState(state State) {
 		}
 		if state.Slug != "" && state.Title != "" && c.planStore != nil {
 			if content, err := c.planStore.Load(state.Slug); err == nil && strings.TrimSpace(content) != "" {
-				c.session.SetApprovedPlanPrompt(BuildApprovedPlanPrompt(state.Title, content, state.AllowedCommands))
+				c.session.OverlayPrompt(planApprovedOverlay, BuildApprovedPlanPrompt(state.Title, content, state.AllowedCommands))
 				return
 			}
 		}
-		c.session.ClearApprovedPlanPrompt()
+		c.session.OverlayPrompt(planApprovedOverlay, "")
 	}
 }