diff --git a/loop/agent.go b/loop/agent.go
index 0d32420..1d21a48 100644
--- a/loop/agent.go
+++ b/loop/agent.go
@@ -28,6 +28,7 @@
 	"sketch.dev/llm"
 	"sketch.dev/llm/ant"
 	"sketch.dev/llm/conversation"
+	"sketch.dev/skabandclient"
 )
 
 const (
@@ -989,6 +990,8 @@
 	Commit string
 	// Prefix for git branches created by sketch
 	BranchPrefix string
+	// Skaband client for session history (optional)
+	SkabandClient *skabandclient.SkabandClient
 }
 
 // NewAgent creates a new Agent.
@@ -1211,6 +1214,13 @@
 	}
 
 	convo.Tools = append(convo.Tools, browserTools...)
+
+	// Add session history tools if skaband client is available
+	if a.config.SkabandClient != nil {
+		sessionHistoryTools := claudetool.CreateSessionHistoryTools(a.config.SkabandClient, a.config.SessionID, a.gitOrigin)
+		convo.Tools = append(convo.Tools, sessionHistoryTools...)
+	}
+
 	convo.Listener = a
 	return convo
 }