improve web fetch

Author: chaoyuepan

agent/orchestrator.go

@@ -138,7 +138,7 @@ func (o *Orchestrator) runLoop(ctx context.Context, state *AgentState) ([]AgentM
 		// Agent would stop here. Check for follow-up messages.
 		followUpMessages := o.fetchFollowUpMessages()
 		if len(followUpMessages) > 0 {
-			pendingMessages = followUpMessages
+			pendingMessages = append(pendingMessages, followUpMessages...)
 			continue
 		}
 
@@ -183,8 +183,7 @@ func (o *Orchestrator) streamAssistantResponse(ctx context.Context, state *Agent
 	}
 
 	// Prepare tool definitions
-	var toolDefs []providers.ToolDefinition
-	toolDefs = convertToToolDefinitions(state.Tools)
+	toolDefs := convertToToolDefinitions(state.Tools)
 
 	// Emit message start
 	o.emit(NewEvent(EventMessageStart))

agent/skills.go

@@ -219,7 +219,7 @@ func (l *SkillsLoader) checkBlockingRequirements(skill *Skill) bool {
 func (l *SkillsLoader) parseSkillMetadata(content string, skill *Skill) error {
 	// 首先尝试使用新的 frontmatter 解析器
 	frontmatter := skills.ParseFrontmatter(content)
-	if frontmatter != nil && len(frontmatter) > 0 {
+	if len(frontmatter) > 0 {
 		// 从 frontmatter 中解析基本字段
 		if name := frontmatter["name"]; name != "" {
 			skill.Name = name
@@ -529,7 +529,7 @@ func (l *SkillsLoader) confirmInstall(skillName string, install *SkillInstall) b
 		fmt.Print("Install now? [Y/n]: ")
 
 		var response string
-		fmt.Scanln(&response)
+		_, _ = fmt.Scanln(&response)
 		return strings.ToLower(response) == "y" || response == ""
 	}
 
@@ -560,9 +560,9 @@ func (l *SkillsLoader) refreshPath() error {
 	if homeDir != "" {
 		shellPaths = append(shellPaths,
 			homeDir+"/.npm-global/bin",           // npm
-			homeDir+"/.local/share/pnpm",       // pnpm
-			homeDir+"/.yarn/bin",              // yarn
-			homeDir+"/.bun/bin",               // bun
+			homeDir+"/.local/share/pnpm",         // pnpm
+			homeDir+"/.yarn/bin",                 // yarn
+			homeDir+"/.bun/bin",                  // bun
 			"/opt/homebrew/lib/node_modules/bin", // npm (brew-installed node)
 		)
 	}

agent/subagent_registry.go

@@ -196,7 +196,7 @@ func (r *SubagentRegistry) ReleaseRun(runID string) {
 		r.sweeperStop = nil
 	}
 
-	r.saveToDisk()
+	_ = r.saveToDisk()
 }
 
 // DeleteChildSession 删除子会话
@@ -316,7 +316,7 @@ func (r *SubagentRegistry) sweep() {
 			zap.String("run_id", runID))
 	}
 
-	r.saveToDisk()
+	_ = r.saveToDisk()
 
 	// 如果没有运行记录了，停止清理器
 	if len(r.runs) == 0 && r.sweeperStop != nil {
@@ -338,7 +338,7 @@ func (r *SubagentRegistry) Cleanup(runID string, cleanup string, didAnnounce boo
 	if !didAnnounce {
 		// 允许重试
 		record.CleanupHandled = false
-		r.saveToDisk()
+		_ = r.saveToDisk()
 		return
 	}
 
@@ -353,7 +353,7 @@ func (r *SubagentRegistry) Cleanup(runID string, cleanup string, didAnnounce boo
 		record.CleanupCompletedAt = &now
 	}
 
-	r.saveToDisk()
+	_ = r.saveToDisk()
 }
 
 // BeginCleanup 开始清理流程
@@ -375,7 +375,7 @@ func (r *SubagentRegistry) BeginCleanup(runID string) bool {
 	}
 
 	record.CleanupHandled = true
-	r.saveToDisk()
+	_ = r.saveToDisk()
 	return true
 }
 

agent/tools/web.go

@@ -196,6 +196,8 @@ func (t *WebTool) WebFetch(ctx context.Context, params map[string]interface{}) (
 
 	// 设置 User-Agent
 	req.Header.Set("User-Agent", "Mozilla/5.0 (compatible; goclaw/1.0)")
+	// 设置 Accept header 优先获取 markdown 格式
+	req.Header.Set("Accept", "text/markdown, text/html")
 
 	// 发送请求
 	resp, err := t.client.Do(req)

cli/commands/commands.go

@@ -981,29 +981,24 @@ func (r *CommandRegistry) searchSkills(query string) string {
 
 	for _, skill := range skills {
 		score := 0.0
-		matches := []string{}
 
 		// 检查名称匹配
 		if strings.Contains(strings.ToLower(skill.Name), query) {
 			if strings.EqualFold(skill.Name, query) {
 				score += 1.0
-				matches = append(matches, "name (exact)")
 			} else {
 				score += 0.8
-				matches = append(matches, "name")
 			}
 		}
 
 		// 检查描述匹配
 		if strings.Contains(strings.ToLower(skill.Description), query) {
 			score += 0.6
-			matches = append(matches, "description")
 		}
 
 		// 检查作者匹配
 		if strings.Contains(strings.ToLower(skill.Author), query) {
 			score += 0.4
-			matches = append(matches, "author")
 		}
 
 		if score > 0 {

cli/commands/tui.go

@@ -232,7 +232,7 @@ func runTUI(cmd *cobra.Command, args []string) {
 	}
 	defer func() {
 		agentCancel()
-		tuiAgent.Stop()
+		_ = tuiAgent.Stop()
 	}()
 
 	// Always create a new session (unless explicitly specified)
@@ -441,6 +441,8 @@ func processTUIDialogue(
 }
 
 // runAgentIteration runs a single agent iteration (copied from chat.go)
+//
+//nolint:unused
 func runAgentIteration(
 	ctx context.Context,
 	sess *session.Session,
@@ -635,6 +637,8 @@ func runAgentIteration(
 }
 
 // getLoadedSkills from session
+//
+//nolint:unused
 func getLoadedSkills(sess *session.Session) []string {
 	if sess.Metadata == nil {
 		return []string{}
@@ -646,6 +650,8 @@ func getLoadedSkills(sess *session.Session) []string {
 }
 
 // setLoadedSkills in session
+//
+//nolint:unused
 func setLoadedSkills(sess *session.Session, skills []string) {
 	if sess.Metadata == nil {
 		sess.Metadata = make(map[string]interface{})
@@ -669,6 +675,8 @@ func getUserInputHistory(sess *session.Session) []string {
 }
 
 // findMostRecentTUISession finds the most recently updated tui session
+//
+//nolint:unused
 func findMostRecentTUISession(mgr *session.Manager) string {
 	keys, err := mgr.List()
 	if err != nil {
@@ -762,6 +770,8 @@ func (ft *FailureTracker) GetFailedToolNames() []string {
 }
 
 // formatToolError 格式化工具错误，提供替代建议
+//
+//nolint:unused
 func formatToolError(toolName string, params map[string]interface{}, err error, availableTools []string) string {
 	errorMsg := err.Error()
 
@@ -824,6 +834,8 @@ func formatToolError(toolName string, params map[string]interface{}, err error,
 }
 
 // shouldUseErrorGuidance 判断是否需要添加错误处理指导
+//
+//nolint:unused
 func shouldUseErrorGuidance(history []session.Message) bool {
 	// 检查最近的消息中是否有工具失败
 	if len(history) == 0 {
@@ -847,6 +859,8 @@ func shouldUseErrorGuidance(history []session.Message) bool {
 }
 
 // getAvailableToolNames 获取可用的工具名称列表
+//
+//nolint:unused
 func getAvailableToolNames(toolRegistry *tools.Registry) []string {
 	if toolRegistry == nil {
 		return []string{}

internal/builtin_skills.go

@@ -148,6 +148,8 @@ func EnsureConfig() (bool, error) {
 }
 
 // copyBuiltinSkills 复制内置技能到目标目录
+//
+//nolint:unused
 func copyBuiltinSkills(targetDir string) error {
 	// 遍历 builtin_skills 目录
 	entries, err := builtinSkillsFS.ReadDir("builtin_skills")

providers/rotation.go

@@ -3,6 +3,7 @@ package providers
 import (
 	"context"
 	"fmt"
+	"sort"
 	"sync"
 	"time"
 
@@ -153,6 +154,11 @@ func (p *RotationProvider) selectRoundRobin(available []*ProviderProfile) *Provi
 		return nil
 	}
 
+	// Sort by name to ensure consistent ordering
+	sort.Slice(available, func(i, j int) bool {
+		return available[i].Name < available[j].Name
+	})
+
 	profile := available[p.currentIndex%len(available)]
 	p.currentIndex++
 	return profile

skills/eligibility_checker.go

@@ -61,11 +61,7 @@ func (c *DefaultEligibilityChecker) ShouldInclude(skill *SkillEntry, config Skil
 
 	// Check config paths
 	missingConfig := c.CheckConfigPaths(skill)
-	if len(missingConfig) > 0 {
-		return false
-	}
-
-	return true
+	return len(missingConfig) == 0
 }
 
 // CheckOSCompatibility checks if the skill is compatible with the current OS.

skills/install.go

@@ -187,6 +187,8 @@ func InstallSkill(ctx context.Context, req InstallRequest) (*InstallResult, erro
 	if ctx == nil {
 		ctx = context.Background()
 	}
+	ctx, cancel := context.WithTimeout(ctx, timeout)
+	defer cancel()
 
 	// Load skill entries
 	entries, err := LoadSkillEntries(req.WorkspaceDir, LoadSkillsOptions{