From 3be030b1494c8a9cffe21eb7a205e0dadd7ccb29 Mon Sep 17 00:00:00 2001
From: PhotoPortfolio Developer <developer@photportfolio.local>
Date: Thu, 19 Feb 2026 22:15:32 +0800
Subject: [PATCH] Minor fix

---
 cmd/picoclaw/main.go |  2 +-
 pkg/agent/loop.go    | 76 +++++++++++++++++++++++++-------------------
 2 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/cmd/picoclaw/main.go b/cmd/picoclaw/main.go
index 128f8c421..af8c3f23d 100644
--- a/cmd/picoclaw/main.go
+++ b/cmd/picoclaw/main.go
@@ -485,7 +485,7 @@ func interactiveMode(agentLoop *agent.AgentLoop, sessionKey string) {
 func simpleInteractiveMode(agentLoop *agent.AgentLoop, sessionKey string) {
 	reader := bufio.NewReader(os.Stdin)
 	for {
-		fmt.Print(fmt.Sprintf("%s You: ", logo))
+		fmt.Printf("%s You: ", logo)
 		line, err := reader.ReadString('\n')
 		if err != nil {
 			if err == io.EOF {
diff --git a/pkg/agent/loop.go b/pkg/agent/loop.go
index 838b0ed92..d41a36eba 100644
--- a/pkg/agent/loop.go
+++ b/pkg/agent/loop.go
@@ -54,43 +54,35 @@ type processOptions struct {
 func NewAgentLoop(cfg *config.Config, msgBus *bus.MessageBus, provider providers.LLMProvider) *AgentLoop {
 	registry := NewAgentRegistry(cfg, provider)
 
-	// File system tools
-	registry.Register(tools.NewReadFileTool(workspace, restrict))
-	registry.Register(tools.NewWriteFileTool(workspace, restrict))
-	registry.Register(tools.NewListDirTool(workspace, restrict))
-	registry.Register(tools.NewEditFileTool(workspace, restrict))
-	registry.Register(tools.NewAppendFileTool(workspace, restrict))
+	for _, agentID := range registry.ListAgentIDs() {
+		agent, ok := registry.GetAgent(agentID)
+		if !ok {
+			continue
+		}
 
-	// Shell execution
-	registry.Register(tools.NewExecTool(workspace, restrict))
-
-	// Build web search tool from config - single provider with fallback to DuckDuckGo
-	searchOpts := []tools.WebSearchToolOptions{
-		{
-			Provider:   cfg.Tools.Web.Search.Provider,
-			APIKey:     cfg.Tools.Web.Search.APIKey,
-			BaseURL:    cfg.Tools.Web.Search.Endpoint,
-			MaxResults: cfg.Tools.Web.Search.MaxResults,
-			Mode:       cfg.Tools.Web.Search.RestType,
-			Param:      cfg.Tools.Web.Search.QueryParam,
-		},
-		// Always add DuckDuckGo as fallback
-		{
-			Provider:   "duckduckgo",
-			MaxResults: 5,
-		},
-	}
-
-	if searchTool := tools.NewWebSearchTool(searchOpts...); searchTool != nil {
-		registry.Register(searchTool)
-	}
-	registry.Register(tools.NewWebFetchTool(50000))
+		searchOpts := []tools.WebSearchToolOptions{
+			{
+				Provider:   cfg.Tools.Web.Search.Provider,
+				APIKey:     cfg.Tools.Web.Search.APIKey,
+				BaseURL:    cfg.Tools.Web.Search.Endpoint,
+				MaxResults: cfg.Tools.Web.Search.MaxResults,
+				Mode:       cfg.Tools.Web.Search.RestType,
+				Param:      cfg.Tools.Web.Search.QueryParam,
+			},
+			{
+				Provider:   "duckduckgo",
+				MaxResults: 5,
+			},
+		}
+		if searchTool := tools.NewWebSearchTool(searchOpts...); searchTool != nil {
+			agent.Tools.Register(searchTool)
+		}
+		agent.Tools.Register(tools.NewWebFetchTool(50000))
 
 		// Hardware tools (I2C, SPI) - Linux only, returns error on other platforms
 		agent.Tools.Register(tools.NewI2CTool())
 		agent.Tools.Register(tools.NewSPITool())
 
-		// Message tool
 		messageTool := tools.NewMessageTool()
 		messageTool.SetSendCallback(func(channel, chatID, content string) error {
 			msgBus.PublishOutbound(bus.OutboundMessage{
@@ -102,8 +94,15 @@ func NewAgentLoop(cfg *config.Config, msgBus *bus.MessageBus, provider providers
 		})
 		agent.Tools.Register(messageTool)
 
-		// Spawn tool with allowlist checker
 		subagentManager := tools.NewSubagentManager(provider, agent.Model, agent.Workspace, msgBus)
+		subagentTools := tools.NewToolRegistry()
+		for _, toolName := range agent.Tools.List() {
+			if tool, exists := agent.Tools.Get(toolName); exists {
+				subagentTools.Register(tool)
+			}
+		}
+		subagentManager.SetTools(subagentTools)
+
 		spawnTool := tools.NewSpawnTool(subagentManager)
 		currentAgentID := agentID
 		spawnTool.SetAllowlistChecker(func(targetAgentID string) bool {
@@ -111,9 +110,20 @@ func NewAgentLoop(cfg *config.Config, msgBus *bus.MessageBus, provider providers
 		})
 		agent.Tools.Register(spawnTool)
 
-		// Update context builder with the complete tools registry
+		subagentTool := tools.NewSubagentTool(subagentManager)
+		agent.Tools.Register(subagentTool)
+
 		agent.ContextBuilder.SetToolsRegistry(agent.Tools)
 	}
+
+	return &AgentLoop{
+		bus:         msgBus,
+		cfg:         cfg,
+		registry:    registry,
+		state:       state.NewManager(cfg.WorkspacePath()),
+		fallback:    providers.NewFallbackChain(providers.NewCooldownTracker()),
+		summarizing: sync.Map{},
+	}
 }
 
 func (al *AgentLoop) Run(ctx context.Context) error {