Merge pull request #550 from mymmrac/govet-linter

mengzhuo · web-flow · commit 273a8a231876 · 2026-02-21T08:20:35.000+08:00
feat(linter): Fix govet linter
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -24,25 +24,6 @@ jobs:
         with:
           version: v2.10.1
 
-  # TODO: Remove once linter is properly configured
-  vet:
-    name: Vet
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: Setup Go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: go.mod
-
-      - name: Run go generate
-        run: go generate ./...
-
-      - name: Run go vet
-        run: go vet ./...
-
   test:
     name: Tests
     runs-on: ubuntu-latest
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -47,7 +47,6 @@ linters:
     - godox
     - goprintffuncname
     - gosec
-    - govet
     - ineffassign
     - lll
     - maintidx
diff --git a/cmd/picoclaw/cmd_auth.go b/cmd/picoclaw/cmd_auth.go
@@ -114,7 +114,7 @@ func authLoginOpenAI(useDeviceCode bool) {
 		os.Exit(1)
 	}
 
-	if err := auth.SetCredential("openai", cred); err != nil {
+	if err = auth.SetCredential("openai", cred); err != nil {
 		fmt.Printf("Failed to save credentials: %v\n", err)
 		os.Exit(1)
 	}
@@ -188,7 +188,7 @@ func authLoginGoogleAntigravity() {
 		fmt.Printf("Project: %s\n", projectID)
 	}
 
-	if err := auth.SetCredential("google-antigravity", cred); err != nil {
+	if err = auth.SetCredential("google-antigravity", cred); err != nil {
 		fmt.Printf("Failed to save credentials: %v\n", err)
 		os.Exit(1)
 	}
@@ -265,7 +265,7 @@ func authLoginPasteToken(provider string) {
 		os.Exit(1)
 	}
 
-	if err := auth.SetCredential(provider, cred); err != nil {
+	if err = auth.SetCredential(provider, cred); err != nil {
 		fmt.Printf("Failed to save credentials: %v\n", err)
 		os.Exit(1)
 	}
diff --git a/cmd/picoclaw/cmd_gateway.go b/cmd/picoclaw/cmd_gateway.go
@@ -98,7 +98,8 @@ func gatewayCmd() {
 			channel, chatID = "cli", "direct"
 		}
 		// Use ProcessHeartbeat - no session history, each heartbeat is independent
-		response, err := agentLoop.ProcessHeartbeat(context.Background(), prompt, channel, chatID)
+		var response string
+		response, err = agentLoop.ProcessHeartbeat(context.Background(), prompt, channel, chatID)
 		if err != nil {
 			return tools.ErrorResult(fmt.Sprintf("Heartbeat error: %v", err))
 		}
diff --git a/cmd/picoclaw/cmd_skills.go b/cmd/picoclaw/cmd_skills.go
@@ -118,15 +118,15 @@ func skillsInstallFromRegistry(cfg *config.Config, registryName, slug string) {
 	workspace := cfg.WorkspacePath()
 	targetDir := filepath.Join(workspace, "skills", slug)
 
-	if _, err := os.Stat(targetDir); err == nil {
+	if _, err = os.Stat(targetDir); err == nil {
 		fmt.Printf("\u2717 Skill '%s' already installed at %s\n", slug, targetDir)
 		os.Exit(1)
 	}
 
 	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
 	defer cancel()
 
-	if err := os.MkdirAll(filepath.Join(workspace, "skills"), 0o755); err != nil {
+	if err = os.MkdirAll(filepath.Join(workspace, "skills"), 0o755); err != nil {
 		fmt.Printf("\u2717 Failed to create skills directory: %v\n", err)
 		os.Exit(1)
 	}
diff --git a/pkg/channels/telegram.go b/pkg/channels/telegram.go
@@ -267,10 +267,10 @@ func (c *TelegramChannel) handleMessage(ctx context.Context, message *telego.Mes
 
 			transcribedText := ""
 			if c.transcriber != nil && c.transcriber.IsAvailable() {
-				ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
+				transcriberCtx, cancel := context.WithTimeout(ctx, 30*time.Second)
 				defer cancel()
 
-				result, err := c.transcriber.Transcribe(ctx, voicePath)
+				result, err := c.transcriber.Transcribe(transcriberCtx, voicePath)
 				if err != nil {
 					logger.ErrorCF("telegram", "Voice transcription failed", map[string]any{
 						"error": err.Error(),
diff --git a/pkg/channels/wecom.go b/pkg/channels/wecom.go
@@ -272,7 +272,7 @@ func (c *WeComBotChannel) handleMessageCallback(ctx context.Context, w http.Resp
 		AgentID    string   `xml:"AgentID"`
 	}
 
-	if err := xml.Unmarshal(body, &encryptedMsg); err != nil {
+	if err = xml.Unmarshal(body, &encryptedMsg); err != nil {
 		logger.ErrorCF("wecom", "Failed to parse XML", map[string]any{
 			"error": err.Error(),
 		})
diff --git a/pkg/channels/wecom_app.go b/pkg/channels/wecom_app.go
@@ -348,7 +348,7 @@ func (c *WeComAppChannel) handleMessageCallback(ctx context.Context, w http.Resp
 		AgentID    string   `xml:"AgentID"`
 	}
 
-	if err := xml.Unmarshal(body, &encryptedMsg); err != nil {
+	if err = xml.Unmarshal(body, &encryptedMsg); err != nil {
 		logger.ErrorCF("wecom_app", "Failed to parse XML", map[string]any{
 			"error": err.Error(),
 		})
diff --git a/pkg/channels/wecom_app_test.go b/pkg/channels/wecom_app_test.go
@@ -852,19 +852,6 @@ func TestWeComAppMessageStructures(t *testing.T) {
 		}
 	})
 
-	t.Run("WeComImageMessage structure", func(t *testing.T) {
-		msg := WeComImageMessage{
-			ToUser:  "user123",
-			MsgType: "image",
-			AgentID: 1000002,
-		}
-		msg.Image.MediaID = "media_123456"
-
-		if msg.Image.MediaID != "media_123456" {
-			t.Errorf("Image.MediaID = %q, want %q", msg.Image.MediaID, "media_123456")
-		}
-	})
-
 	t.Run("WeComAccessTokenResponse structure", func(t *testing.T) {
 		jsonData := `{
 			"errcode": 0,
diff --git a/pkg/channels/wecom_test.go b/pkg/channels/wecom_test.go
@@ -198,10 +198,8 @@ func TestWeComBotVerifySignature(t *testing.T) {
 			Token:      "",
 			WebhookURL: "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=test",
 		}
-		base := NewBaseChannel("wecom", cfgEmpty, msgBus, cfgEmpty.AllowFrom)
 		chEmpty := &WeComBotChannel{
-			BaseChannel: base,
-			config:      cfgEmpty,
+			config: cfgEmpty,
 		}
 
 		if !WeComVerifySignature(chEmpty.config.Token, "any_sig", "any_ts", "any_nonce", "any_msg") {
diff --git a/pkg/migrate/migrate.go b/pkg/migrate/migrate.go
@@ -67,7 +67,7 @@ func Run(opts Options) (*Result, error) {
 		return nil, err
 	}
 
-	if _, err := os.Stat(openclawHome); os.IsNotExist(err) {
+	if _, err = os.Stat(openclawHome); os.IsNotExist(err) {
 		return nil, fmt.Errorf("OpenClaw installation not found at %s", openclawHome)
 	}
 
diff --git a/pkg/migrate/migrate_test.go b/pkg/migrate/migrate_test.go
@@ -58,21 +58,21 @@ func TestConvertKeysToSnake(t *testing.T) {
 		t.Fatal("expected map[string]interface{}")
 	}
 
-	if _, ok := m["api_key"]; !ok {
+	if _, ok = m["api_key"]; !ok {
 		t.Error("expected key 'api_key' after conversion")
 	}
-	if _, ok := m["api_base"]; !ok {
+	if _, ok = m["api_base"]; !ok {
 		t.Error("expected key 'api_base' after conversion")
 	}
 
 	nested, ok := m["nested"].(map[string]any)
 	if !ok {
 		t.Fatal("expected nested map")
 	}
-	if _, ok := nested["max_tokens"]; !ok {
+	if _, ok = nested["max_tokens"]; !ok {
 		t.Error("expected key 'max_tokens' in nested map")
 	}
-	if _, ok := nested["allow_from"]; !ok {
+	if _, ok = nested["allow_from"]; !ok {
 		t.Error("expected key 'allow_from' in nested map")
 	}
 
@@ -108,7 +108,7 @@ func TestLoadOpenClawConfig(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err := os.WriteFile(configPath, data, 0o644); err != nil {
+	if err = os.WriteFile(configPath, data, 0o644); err != nil {
 		t.Fatal(err)
 	}
 
diff --git a/pkg/providers/codex_cli_credentials.go b/pkg/providers/codex_cli_credentials.go
@@ -31,7 +31,7 @@ func ReadCodexCliCredentials() (accessToken, accountID string, expiresAt time.Ti
 	}
 
 	var auth CodexCliAuth
-	if err := json.Unmarshal(data, &auth); err != nil {
+	if err = json.Unmarshal(data, &auth); err != nil {
 		return "", "", time.Time{}, fmt.Errorf("parsing %s: %w", authPath, err)
 	}
 
diff --git a/pkg/tools/edit.go b/pkg/tools/edit.go
@@ -72,7 +72,7 @@ func (t *EditFileTool) Execute(ctx context.Context, args map[string]any) *ToolRe
 		return ErrorResult(err.Error())
 	}
 
-	if _, err := os.Stat(resolvedPath); os.IsNotExist(err) {
+	if _, err = os.Stat(resolvedPath); os.IsNotExist(err) {
 		return ErrorResult(fmt.Sprintf("file not found: %s", path))
 	}
 
diff --git a/pkg/tools/filesystem.go b/pkg/tools/filesystem.go
@@ -34,17 +34,19 @@ func validatePath(path, workspace string, restrict bool) (string, error) {
 			return "", fmt.Errorf("access denied: path is outside the workspace")
 		}
 
+		var resolved string
 		workspaceReal := absWorkspace
-		if resolved, err := filepath.EvalSymlinks(absWorkspace); err == nil {
+		if resolved, err = filepath.EvalSymlinks(absWorkspace); err == nil {
 			workspaceReal = resolved
 		}
 
-		if resolved, err := filepath.EvalSymlinks(absPath); err == nil {
+		if resolved, err = filepath.EvalSymlinks(absPath); err == nil {
 			if !isWithinWorkspace(resolved, workspaceReal) {
 				return "", fmt.Errorf("access denied: symlink resolves outside workspace")
 			}
 		} else if os.IsNotExist(err) {
-			if parentResolved, err := resolveExistingAncestor(filepath.Dir(absPath)); err == nil {
+			var parentResolved string
+			if parentResolved, err = resolveExistingAncestor(filepath.Dir(absPath)); err == nil {
 				if !isWithinWorkspace(parentResolved, workspaceReal) {
 					return "", fmt.Errorf("access denied: symlink resolves outside workspace")
 				}
diff --git a/pkg/tools/i2c_linux.go b/pkg/tools/i2c_linux.go
@@ -182,7 +182,7 @@ func (t *I2CTool) readDevice(args map[string]any) *ToolResult {
 		if reg < 0 || reg > 255 {
 			return ErrorResult("register must be between 0x00 and 0xFF")
 		}
-		_, err := syscall.Write(fd, []byte{byte(reg)})
+		_, err = syscall.Write(fd, []byte{byte(reg)})
 		if err != nil {
 			return ErrorResult(fmt.Sprintf("failed to write register 0x%02x: %v", reg, err))
 		}
diff --git a/pkg/voice/transcriber.go b/pkg/voice/transcriber.go
@@ -79,17 +79,17 @@ func (t *GroqTranscriber) Transcribe(ctx context.Context, audioFilePath string)
 
 	logger.DebugCF("voice", "File copied to request", map[string]any{"bytes_copied": copied})
 
-	if err := writer.WriteField("model", "whisper-large-v3"); err != nil {
+	if err = writer.WriteField("model", "whisper-large-v3"); err != nil {
 		logger.ErrorCF("voice", "Failed to write model field", map[string]any{"error": err})
 		return nil, fmt.Errorf("failed to write model field: %w", err)
 	}
 
-	if err := writer.WriteField("response_format", "json"); err != nil {
+	if err = writer.WriteField("response_format", "json"); err != nil {
 		logger.ErrorCF("voice", "Failed to write response_format field", map[string]any{"error": err})
 		return nil, fmt.Errorf("failed to write response_format field: %w", err)
 	}
 
-	if err := writer.Close(); err != nil {
+	if err = writer.Close(); err != nil {
 		logger.ErrorCF("voice", "Failed to close multipart writer", map[string]any{"error": err})
 		return nil, fmt.Errorf("failed to close multipart writer: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ func authLoginOpenAI(useDeviceCode bool) {`
`114`	`114`	`os.Exit(1)`
`115`	`115`	`}`
`116`	`116`
`117`		`- if err := auth.SetCredential("openai", cred); err != nil {`
	`117`	`+ if err = auth.SetCredential("openai", cred); err != nil {`
`118`	`118`	`fmt.Printf("Failed to save credentials: %v\n", err)`
`119`	`119`	`os.Exit(1)`
`120`	`120`	`}`
`@@ -188,7 +188,7 @@ func authLoginGoogleAntigravity() {`
`188`	`188`	`fmt.Printf("Project: %s\n", projectID)`
`189`	`189`	`}`
`190`	`190`
`191`		`- if err := auth.SetCredential("google-antigravity", cred); err != nil {`
	`191`	`+ if err = auth.SetCredential("google-antigravity", cred); err != nil {`
`192`	`192`	`fmt.Printf("Failed to save credentials: %v\n", err)`
`193`	`193`	`os.Exit(1)`
`194`	`194`	`}`
`@@ -265,7 +265,7 @@ func authLoginPasteToken(provider string) {`
`265`	`265`	`os.Exit(1)`
`266`	`266`	`}`
`267`	`267`
`268`		`- if err := auth.SetCredential(provider, cred); err != nil {`
	`268`	`+ if err = auth.SetCredential(provider, cred); err != nil {`
`269`	`269`	`fmt.Printf("Failed to save credentials: %v\n", err)`
`270`	`270`	`os.Exit(1)`
`271`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,8 @@ func gatewayCmd() {`
`98`	`98`	`channel, chatID = "cli", "direct"`
`99`	`99`	`}`
`100`	`100`	`// Use ProcessHeartbeat - no session history, each heartbeat is independent`
`101`		`- response, err := agentLoop.ProcessHeartbeat(context.Background(), prompt, channel, chatID)`
	`101`	`+ var response string`
	`102`	`+ response, err = agentLoop.ProcessHeartbeat(context.Background(), prompt, channel, chatID)`
`102`	`103`	`if err != nil {`
`103`	`104`	`return tools.ErrorResult(fmt.Sprintf("Heartbeat error: %v", err))`
`104`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ func (c *WeComBotChannel) handleMessageCallback(ctx context.Context, w http.Resp`
`272`	`272`	AgentID string `xml:"AgentID"`
`273`	`273`	`}`
`274`	`274`
`275`		`- if err := xml.Unmarshal(body, &encryptedMsg); err != nil {`
	`275`	`+ if err = xml.Unmarshal(body, &encryptedMsg); err != nil {`
`276`	`276`	`logger.ErrorCF("wecom", "Failed to parse XML", map[string]any{`
`277`	`277`	`"error": err.Error(),`
`278`	`278`	`})`
Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ func (c *WeComAppChannel) handleMessageCallback(ctx context.Context, w http.Resp`
`348`	`348`	AgentID string `xml:"AgentID"`
`349`	`349`	`}`
`350`	`350`
`351`		`- if err := xml.Unmarshal(body, &encryptedMsg); err != nil {`
	`351`	`+ if err = xml.Unmarshal(body, &encryptedMsg); err != nil {`
`352`	`352`	`logger.ErrorCF("wecom_app", "Failed to parse XML", map[string]any{`
`353`	`353`	`"error": err.Error(),`
`354`	`354`	`})`
Original file line number	Diff line number	Diff line change
`@@ -198,10 +198,8 @@ func TestWeComBotVerifySignature(t *testing.T) {`
`198`	`198`	`Token: "",`
`199`	`199`	`WebhookURL: "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=test",`
`200`	`200`	`}`
`201`		`- base := NewBaseChannel("wecom", cfgEmpty, msgBus, cfgEmpty.AllowFrom)`
`202`	`201`	`chEmpty := &WeComBotChannel{`
`203`		`- BaseChannel: base,`
`204`		`- config: cfgEmpty,`
	`202`	`+ config: cfgEmpty,`
`205`	`203`	`}`
`206`	`204`
`207`	`205`	`if !WeComVerifySignature(chEmpty.config.Token, "any_sig", "any_ts", "any_nonce", "any_msg") {`