Revert nilerr linter: too many //nolint annotations

All 11 issues were intentional patterns, requiring 11 //nolint
directives with no actual code improvement.

Assisted-By: cagent

Author: dgageot

.golangci.yml

@@ -38,7 +38,6 @@ linters:
     - misspell
     - mirror
     - nakedret
-    - nilerr
     - nolintlint
     - nosprintfhostport
     - nilnesserr

pkg/acp/agent.go

@@ -248,7 +248,7 @@ func (a *Agent) Prompt(ctx context.Context, params acp.PromptRequest) (acp.Promp
 	// Run the agent and stream updates
 	if err := a.runAgent(turnCtx, acpSess); err != nil {
 		if turnCtx.Err() != nil {
-			return acp.PromptResponse{StopReason: acp.StopReasonCancelled}, nil //nolint:nilerr // context cancellation is not an error, return cancelled status
+			return acp.PromptResponse{StopReason: acp.StopReasonCancelled}, nil
 		}
 		return acp.PromptResponse{}, err
 	}

pkg/app/export/html.go

@@ -155,7 +155,7 @@ func ToFile(data SessionData, filename string) (string, error) {
 
 	absPath, err := filepath.Abs(filename)
 	if err != nil {
-		return filename, nil //nolint:nilerr // fall back to relative path if Abs fails
+		return filename, nil
 	}
 	return absPath, nil
 }

pkg/fake/proxy.go

@@ -430,7 +430,7 @@ func StreamCopy(c echo.Context, resp *http.Response) error {
 			if result.err != nil {
 				// io.EOF or context canceled means normal completion
 				if errors.Is(result.err, io.EOF) || ctx.Err() != nil {
-					return nil //nolint:nilerr // EOF and context cancellation are normal stream termination
+					return nil
 				}
 				slog.ErrorContext(ctx, "stream read error", "error", result.err)
 				return result.err

pkg/fsx/fs.go

@@ -43,7 +43,7 @@ func directoryTree(path string, isPathAllowed func(string) error, shouldIgnore f
 
 		entries, err := os.ReadDir(path)
 		if err != nil {
-			return node, nil //nolint:nilerr // return partial tree on ReadDir failure
+			return node, nil // Return partial result on error
 		}
 
 		for _, entry := range entries {

pkg/skills/skills.go

@@ -218,7 +218,7 @@ func loadSkillsRecursive(dir string) []Skill {
 
 	_ = filepath.WalkDir(dir, func(path string, d fs.DirEntry, err error) error {
 		if err != nil || d.IsDir() {
-			return nil //nolint:nilerr // skip unreadable entries
+			return nil
 		}
 		if isHiddenOrSymlink(d) || d.Name() != skillFile {
 			return nil

pkg/teamloader/toon.go

@@ -38,7 +38,7 @@ func (f *toonTools) Tools(ctx context.Context) ([]tools.Tool, error) {
 				var o map[string]any
 				err = json.Unmarshal([]byte(res.Output), &o)
 				if err != nil {
-					return res, nil //nolint:nilerr // output is not JSON, skip toon encoding
+					return res, nil
 				}
 
 				tooned, err := gotoon.Encode(o)

pkg/tools/builtin/filesystem.go

@@ -592,7 +592,7 @@ func (t *FilesystemTool) handleSearchFilesContent(_ context.Context, args Search
 
 	err := filepath.WalkDir(resolvedPath, func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
-			return nil //nolint:nilerr // skip unreadable entries
+			return nil
 		}
 
 		// Check VCS ignore rules
@@ -606,7 +606,7 @@ func (t *FilesystemTool) handleSearchFilesContent(_ context.Context, args Search
 		// Check exclude patterns against relative path from search root
 		relPath, err := filepath.Rel(resolvedPath, path)
 		if err != nil {
-			return nil //nolint:nilerr // skip paths that can't be made relative
+			return nil
 		}
 
 		for _, exclude := range args.ExcludePatterns {
@@ -625,7 +625,7 @@ func (t *FilesystemTool) handleSearchFilesContent(_ context.Context, args Search
 
 		content, err := os.ReadFile(path)
 		if err != nil {
-			return nil //nolint:nilerr // skip unreadable files
+			return nil
 		}
 
 		lines := strings.Split(string(content), "\n")

pkg/tools/codemode/exec.go

@@ -66,7 +66,7 @@ func (c *codeModeTool) runJavascript(ctx context.Context, script string) (Script
 	v, err := vm.RunString(script)
 	if err != nil {
 		// Script execution failed - include tool call history to help LLM understand what went wrong
-		return ScriptResult{ //nolint:nilerr // script errors are returned as data, not Go errors
+		return ScriptResult{
 			StdOut:    stdOut.String(),
 			StdErr:    stdErr.String(),
 			Value:     err.Error(),

pkg/tools/mcp/mcp.go

@@ -243,7 +243,7 @@ func (ts *Toolset) Stop(ctx context.Context) error {
 
 	if err := ts.mcpClient.Close(context.WithoutCancel(ctx)); err != nil {
 		if ctx.Err() != nil {
-			return nil //nolint:nilerr // close error expected when context already cancelled
+			return nil
 		}
 		slog.Error("Failed to stop MCP toolset", "server", ts.logID, "error", err)
 		return err