From 5ec6ac6fe88971c42595f72c54daa9551c7519ba Mon Sep 17 00:00:00 2001
From: Levi Neely <141506390+lneely@users.noreply.github.com>
Date: Sun, 17 May 2026 00:15:40 +0200
Subject: [PATCH] session: use agent config backend/model as defaults; fix
 stubCore for ToolCallCount

---
 store/session.go    | 16 +++++++++++-----
 store/store_test.go |  1 +
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/store/session.go b/store/session.go
index e114557..0b8976a 100644
--- a/store/session.go
+++ b/store/session.go
@@ -365,6 +365,17 @@ func (s *SessionStore) createSession(args []string) error {
 			return err
 		}
 	} else {
+		cfg := LoadAgentConfig(s.cfg.AgentsDir, agentName, nil)
+		if cfg != nil {
+			allowTools = cfg.AllowTools
+			if backendOverride == "" && cfg.Backend != "" {
+				backendOverride = cfg.Backend
+			}
+			if modelOverride == "" && cfg.Model != "" {
+				modelOverride = cfg.Model
+			}
+		}
+
 		be, err := backend.NewWithName(backendOverride)
 		if err != nil {
 			return fmt.Errorf("backend: %w", err)
@@ -381,11 +392,6 @@ func (s *SessionStore) createSession(args []string) error {
 			return fmt.Errorf("sessions dir: %w", err)
 		}
 
-		cfg := LoadAgentConfig(s.cfg.AgentsDir, agentName, nil)
-		if cfg != nil {
-			allowTools = cfg.AllowTools
-		}
-
 		var execOpts []execute.Option
 		if s.cfg.Strict {
 			execOpts = append(execOpts, execute.WithStrict())
diff --git a/store/store_test.go b/store/store_test.go
index f1aefc0..07c7520 100644
--- a/store/store_test.go
+++ b/store/store_test.go
@@ -95,6 +95,7 @@ func (c *stubCore) WaitChange(ctx context.Context, _, _ string) (string, bool) {
 	return "", false
 }
 func (c *stubCore) Close()                                                      { c.closed = true }
+func (c *stubCore) ToolCallCount() int64                                        { return 0 }
 
 // publishCore wraps stubCore and emits a realistic event sequence on Submit.
 type publishCore struct {