style: revert verbose defer Close wrappers, configure errcheck exclusions

Wrapping `defer rows.Close()` as `defer func() { _ = rows.Close() }()`
solely to satisfy errcheck hurts readability for no practical benefit —
the error from a deferred Close is unactionable. Configure errcheck to
exclude common Close methods and revert all 70+ instances to clean
`defer x.Close()`.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: gcmsg

.golangci.yml

@@ -6,6 +6,18 @@ linters:
     - staticcheck
     - unused
 
+  settings:
+    errcheck:
+      # Don't flag deferred Close / cleanup calls – the error is unactionable in
+      # a defer and wrapping them hurts readability.
+      exclude-functions:
+        - (io.Closer).Close
+        - (*database/sql.Rows).Close
+        - (*database/sql.DB).Close
+        - (*os.File).Close
+        - (net/http.ResponseWriter).Write
+        - (*github.com/redis/go-redis/v9.PubSub).Close
+
   exclusions:
     rules:
       # Exclude errcheck in test files – test helpers rarely need error checking.

cmd/peerclawd/main.go

@@ -89,7 +89,7 @@ func main() {
 		logger.Error("failed to open database", "error", err, "driver", cfg.Database.Driver)
 		os.Exit(1)
 	}
-	defer func() { _ = store.Close() }()
+	defer store.Close()
 
 	// Extract the underlying *sql.DB for shared use by reputation and verification modules.
 	sqlDB, _ := store.GetDB().(*sql.DB)

go.mod

@@ -19,7 +19,6 @@ require (
 	go.opentelemetry.io/otel/trace v1.41.0
 	golang.org/x/crypto v0.48.0
 	golang.org/x/time v0.14.0
-	google.golang.org/grpc v1.79.1
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -39,5 +38,6 @@ require (
 	golang.org/x/text v0.34.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect
+	google.golang.org/grpc v1.79.1 // indirect
 	google.golang.org/protobuf v1.36.11 // indirect
 )

internal/blob/fs.go

@@ -29,7 +29,7 @@ func (fs *DiskFileStore) Write(id string, r io.Reader) (int64, error) {
 	if err != nil {
 		return 0, fmt.Errorf("create blob file: %w", err)
 	}
-	defer func() { _ = f.Close() }()
+	defer f.Close()
 
 	n, err := io.Copy(f, r)
 	if err != nil {

internal/blob/postgres.go

@@ -72,7 +72,7 @@ func (s *PostgresMetaStore) ListExpired(ctx context.Context) ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer func() { _ = rows.Close() }()
+	defer rows.Close()
 
 	var ids []string
 	for rows.Next() {

internal/blob/sqlite.go

@@ -84,7 +84,7 @@ func (s *SQLiteMetaStore) ListExpired(ctx context.Context) ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer func() { _ = rows.Close() }()
+	defer rows.Close()
 
 	var ids []string
 	for rows.Next() {

internal/bridge/a2a/adapter.go

@@ -109,7 +109,7 @@ func (a *Adapter) Send(ctx context.Context, env *envelope.Envelope) error {
 	if err != nil {
 		return fmt.Errorf("a2a: http post: %w", err)
 	}
-	defer func() { _ = httpResp.Body.Close() }()
+	defer httpResp.Body.Close()
 
 	respBody, err := io.ReadAll(io.LimitReader(httpResp.Body, maxResponseBodySize))
 	if err != nil {
@@ -223,7 +223,7 @@ func (a *Adapter) SendStream(ctx context.Context, env *envelope.Envelope) (<-cha
 
 func (a *Adapter) readSSEStream(resp *http.Response, ch chan<- bridge.StreamChunk) {
 	defer close(ch)
-	defer func() { _ = resp.Body.Close() }()
+	defer resp.Body.Close()
 
 	scanner := bufio.NewScanner(resp.Body)
 	scanner.Buffer(make([]byte, 64*1024), 64*1024)
@@ -266,7 +266,7 @@ func (a *Adapter) readSSEStream(resp *http.Response, ch chan<- bridge.StreamChun
 
 func (a *Adapter) readBufferedResponse(resp *http.Response, ch chan<- bridge.StreamChunk) {
 	defer close(ch)
-	defer func() { _ = resp.Body.Close() }()
+	defer resp.Body.Close()
 
 	body, err := io.ReadAll(io.LimitReader(resp.Body, maxResponseBodySize))
 	if err != nil {

internal/bridge/a2a/adapter_test.go

@@ -21,7 +21,7 @@ func init() {
 
 func TestAdapterProtocol(t *testing.T) {
 	a := New(nil, nil)
-	defer func() { _ = a.Close() }()
+	defer a.Close()
 	if a.Protocol() != "a2a" {
 		t.Errorf("Protocol() = %q", a.Protocol())
 	}

internal/bridge/acp/adapter.go

@@ -81,7 +81,7 @@ func (a *Adapter) Send(ctx context.Context, env *envelope.Envelope) error {
 	if err != nil {
 		return fmt.Errorf("acp: http post: %w", err)
 	}
-	defer func() { _ = httpResp.Body.Close() }()
+	defer httpResp.Body.Close()
 
 	respBody, err := io.ReadAll(io.LimitReader(httpResp.Body, maxResponseBodySize))
 	if err != nil {

internal/bridge/acp/adapter_test.go

@@ -19,7 +19,7 @@ func init() {
 
 func TestAdapterProtocol(t *testing.T) {
 	a := New(nil, nil)
-	defer func() { _ = a.Close() }()
+	defer a.Close()
 	if a.Protocol() != "acp" {
 		t.Errorf("Protocol() = %q", a.Protocol())
 	}
@@ -56,7 +56,7 @@ func TestAdapterSend(t *testing.T) {
 	defer server.Close()
 
 	adapter := New(nil, server.Client())
-	defer func() { _ = adapter.Close() }()
+	defer adapter.Close()
 
 	env := envelope.New("alice", "echo", protocol.ProtocolACP, []byte("do something"))
 	env.Metadata["acp.endpoint"] = server.URL
@@ -90,7 +90,7 @@ func TestAdapterSend(t *testing.T) {
 
 func TestAdapterSendMissingEndpoint(t *testing.T) {
 	adapter := New(nil, nil)
-	defer func() { _ = adapter.Close() }()
+	defer adapter.Close()
 
 	env := envelope.New("a", "b", protocol.ProtocolACP, []byte("test"))
 	err := adapter.Send(context.Background(), env)
@@ -101,7 +101,7 @@ func TestAdapterSendMissingEndpoint(t *testing.T) {
 
 func TestAdapterTranslateToA2A(t *testing.T) {
 	adapter := New(nil, nil)
-	defer func() { _ = adapter.Close() }()
+	defer adapter.Close()
 
 	msg := Message{
 		Role:  "agent",
@@ -121,7 +121,7 @@ func TestAdapterTranslateToA2A(t *testing.T) {
 
 func TestAdapterTranslateSame(t *testing.T) {
 	adapter := New(nil, nil)
-	defer func() { _ = adapter.Close() }()
+	defer adapter.Close()
 
 	env := envelope.New("a", "b", protocol.ProtocolACP, []byte("test"))
 	translated, err := adapter.Translate(context.Background(), env, "acp")
@@ -135,7 +135,7 @@ func TestAdapterTranslateSame(t *testing.T) {
 
 func TestHandleListAgents(t *testing.T) {
 	adapter := New(nil, nil)
-	defer func() { _ = adapter.Close() }()
+	defer adapter.Close()
 
 	httpReq := httptest.NewRequest(http.MethodGet, "/acp/agents", nil)
 	w := httptest.NewRecorder()
@@ -155,7 +155,7 @@ func TestHandleListAgents(t *testing.T) {
 
 func TestHandleGetAgent(t *testing.T) {
 	adapter := New(nil, nil)
-	defer func() { _ = adapter.Close() }()
+	defer adapter.Close()
 
 	httpReq := httptest.NewRequest(http.MethodGet, "/acp/agents/echo", nil)
 	httpReq.SetPathValue("name", "echo")
@@ -176,7 +176,7 @@ func TestHandleGetAgent(t *testing.T) {
 
 func TestHandleCreateRun(t *testing.T) {
 	adapter := New(nil, nil)
-	defer func() { _ = adapter.Close() }()
+	defer adapter.Close()
 
 	req := CreateRunRequest{
 		AgentName: "echo",
@@ -220,7 +220,7 @@ func TestHandleCreateRun(t *testing.T) {
 
 func TestHandleCreateRun_MissingAgent(t *testing.T) {
 	adapter := New(nil, nil)
-	defer func() { _ = adapter.Close() }()
+	defer adapter.Close()
 
 	req := CreateRunRequest{Input: []Message{}}
 	body, _ := json.Marshal(req)
@@ -237,7 +237,7 @@ func TestHandleCreateRun_MissingAgent(t *testing.T) {
 
 func TestHandleGetRun(t *testing.T) {
 	adapter := New(nil, nil)
-	defer func() { _ = adapter.Close() }()
+	defer adapter.Close()
 
 	run := &Run{RunID: "run-1", Status: RunStatusCompleted, AgentName: "echo"}
 	adapter.runs.Store("run-1", run)
@@ -261,7 +261,7 @@ func TestHandleGetRun(t *testing.T) {
 
 func TestHandleGetRun_NotFound(t *testing.T) {
 	adapter := New(nil, nil)
-	defer func() { _ = adapter.Close() }()
+	defer adapter.Close()
 
 	httpReq := httptest.NewRequest(http.MethodGet, "/acp/runs/unknown", nil)
 	httpReq.SetPathValue("run_id", "unknown")
@@ -276,7 +276,7 @@ func TestHandleGetRun_NotFound(t *testing.T) {
 
 func TestHandleCancelRun(t *testing.T) {
 	adapter := New(nil, nil)
-	defer func() { _ = adapter.Close() }()
+	defer adapter.Close()
 
 	run := &Run{RunID: "run-1", Status: RunStatusInProgress}
 	adapter.runs.Store("run-1", run)
@@ -300,7 +300,7 @@ func TestHandleCancelRun(t *testing.T) {
 
 func TestHandlePing(t *testing.T) {
 	adapter := New(nil, nil)
-	defer func() { _ = adapter.Close() }()
+	defer adapter.Close()
 
 	httpReq := httptest.NewRequest(http.MethodGet, "/acp/ping", nil)
 	w := httptest.NewRecorder()
@@ -314,7 +314,7 @@ func TestHandlePing(t *testing.T) {
 
 func TestInjectMessage(t *testing.T) {
 	adapter := New(nil, nil)
-	defer func() { _ = adapter.Close() }()
+	defer adapter.Close()
 
 	env := envelope.New("test", "dest", protocol.ProtocolACP, []byte("test"))
 	if err := adapter.InjectMessage(env); err != nil {