Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ linters:
- usetesting
- whitespace
- wastedassign
- bodyclose
- makezero
- sqlclosecheck
settings:
forbidigo:
forbid:
Expand Down
2 changes: 1 addition & 1 deletion pkg/audio/transcribe/transcribe_darwin.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func (t *Transcriber) Start(ctx context.Context, handler TranscriptHandler) erro
t.cancel = cancel

// Connect to OpenAI Realtime API
conn, _, err := websocket.DefaultDialer.DialContext(ctx, openAIRealtimeURL, http.Header{
conn, _, err := websocket.DefaultDialer.DialContext(ctx, openAIRealtimeURL, http.Header{ //nolint:bodyclose // websocket upgrade response
"Authorization": []string{"Bearer " + t.apiKey},
"OpenAI-Beta": []string{"realtime=v1"},
})
Expand Down
5 changes: 5 additions & 0 deletions pkg/model/provider/oaistream/middleware_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ func TestErrorBodyMiddleware(t *testing.T) {

resp, err := middleware(req, next)
require.NoError(t, err)
defer resp.Body.Close()
assert.Equal(t, http.StatusOK, resp.StatusCode)
})

Expand All @@ -121,6 +122,7 @@ func TestErrorBodyMiddleware(t *testing.T) {

resp, err := middleware(req, next)
require.NoError(t, err)
defer resp.Body.Close()
assert.Equal(t, http.StatusTooManyRequests, resp.StatusCode)

body, err := io.ReadAll(resp.Body)
Expand All @@ -144,6 +146,7 @@ func TestErrorBodyMiddleware(t *testing.T) {

resp, err := middleware(req, next)
require.NoError(t, err)
defer resp.Body.Close()
assert.Equal(t, http.StatusTooManyRequests, resp.StatusCode)

body, err := io.ReadAll(resp.Body)
Expand All @@ -167,6 +170,7 @@ func TestErrorBodyMiddleware(t *testing.T) {

resp, err := middleware(req, next)
require.NoError(t, err)
defer resp.Body.Close()
assert.Equal(t, http.StatusTooManyRequests, resp.StatusCode)

body, err := io.ReadAll(resp.Body)
Expand All @@ -191,6 +195,7 @@ func TestErrorBodyMiddleware(t *testing.T) {

resp, err := middleware(req, next)
require.NoError(t, err)
defer resp.Body.Close()

body, err := io.ReadAll(resp.Body)
require.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion pkg/runtime/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ func (c *Client) runAgentWithAgentName(ctx context.Context, sessionID, agent, ag
req.Header.Set("Accept", "text/event-stream")
req.Header.Set("Cache-Control", "no-cache")

resp, err := c.httpClient.Do(req)
resp, err := c.httpClient.Do(req) //nolint:bodyclose // body is closed in the goroutine below
if err != nil {
return nil, fmt.Errorf("performing request: %w", err)
}
Expand Down
4 changes: 1 addition & 3 deletions pkg/session/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -680,23 +680,21 @@ func (s *SQLiteSessionStore) loadSessionItemsWith(ctx context.Context, q querier
if err != nil {
return nil, err
}
defer rows.Close()

// First, collect all raw row data so we can close the result set
// before making any recursive calls (SQLite doesn't allow concurrent queries)
var rawRows []sessionItemRow
for rows.Next() {
var row sessionItemRow
if err := rows.Scan(&row.position, &row.itemType, &row.agentName, &row.messageJSON, &row.implicit, &row.subsessionID, &row.summaryText); err != nil {
rows.Close()
return nil, err
}
rawRows = append(rawRows, row)
}
if err := rows.Err(); err != nil {
rows.Close()
return nil, err
}
rows.Close()

if len(rawRows) == 0 {
return nil, nil
Expand Down
4 changes: 2 additions & 2 deletions pkg/tools/builtin/tasks.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ func effectiveStatus(task Task, tasks map[string]Task) TaskStatus {

func hasCycle(tasks map[string]Task, startID string, deps []string) bool {
visited := make(map[string]bool)
stack := make([]string, len(deps))
copy(stack, deps)
stack := make([]string, 0, len(deps))
stack = append(stack, deps...)
for len(stack) > 0 {
current := stack[len(stack)-1]
stack = stack[:len(stack)-1]
Expand Down
Loading