github
diff --git a/‎pkg/errors/error.go
Lines changed: 3 additions & 3 deletions b/‎pkg/errors/error.go
Lines changed: 3 additions & 3 deletions
diff --git a/‎pkg/github/actions.go
Lines changed: 3 additions & 3 deletions b/‎pkg/github/actions.go
Lines changed: 3 additions & 3 deletions
diff --git a/‎pkg/github/pullrequests_test.go
Lines changed: 3 additions & 17 deletions b/‎pkg/github/pullrequests_test.go
Lines changed: 3 additions & 17 deletions
@@ -85,7 +85,7 @@ func GetGitHubGraphQLErrors(ctx context.Context) ([]*GitHubGraphQLError, error)
 func NewGitHubAPIErrorToCtx(ctx context.Context, message string, resp *github.Response, err error) (context.Context, error) {
 	apiErr := newGitHubAPIError(message, resp, err)
 	if ctx != nil {
-		addGitHubAPIErrorToContext(ctx, apiErr)
+		_, _ = addGitHubAPIErrorToContext(ctx, apiErr) // Explicitly ignore error for graceful handling
 	}
 	return ctx, nil
 }
@@ -110,7 +110,7 @@ func addGitHubGraphQLErrorToContext(ctx context.Context, err *GitHubGraphQLError
 func NewGitHubAPIErrorResponse(ctx context.Context, message string, resp *github.Response, err error) *mcp.CallToolResult {
 	apiErr := newGitHubAPIError(message, resp, err)
 	if ctx != nil {
-		addGitHubAPIErrorToContext(ctx, apiErr)
+		_, _ = addGitHubAPIErrorToContext(ctx, apiErr) // Explicitly ignore error for graceful handling
 	}
 	return mcp.NewToolResultErrorFromErr(message, err)
 }
@@ -119,7 +119,7 @@ func NewGitHubAPIErrorResponse(ctx context.Context, message string, resp *github
 func NewGitHubGraphQLErrorResponse(ctx context.Context, message string, err error) *mcp.CallToolResult {
 	graphQLErr := newGitHubGraphQLError(message, err)
 	if ctx != nil {
-		addGitHubGraphQLErrorToContext(ctx, graphQLErr)
+		_, _ = addGitHubGraphQLErrorToContext(ctx, graphQLErr) // Explicitly ignore error for graceful handling
 	}
 	return mcp.NewToolResultErrorFromErr(message, err)
 }
@@ -680,7 +680,7 @@ func handleFailedJobLogs(ctx context.Context, client *github.Client, owner, repo
 				"error":    err.Error(),
 			}
 			// Enable reporting of status codes and error causes
-			ghErrors.NewGitHubAPIErrorToCtx(ctx, "failed to get job logs", resp, err)
+			_, _ = ghErrors.NewGitHubAPIErrorToCtx(ctx, "failed to get job logs", resp, err) // Explicitly ignore error for graceful handling
 		}
 
 		logResults = append(logResults, jobResult)
@@ -736,11 +736,11 @@ func getJobLogData(ctx context.Context, client *github.Client, owner, repo strin
 
 	if returnContent {
 		// Download and return the actual log content
-		content, resp, err := downloadLogContent(url.String())
+		content, httpResp, err := downloadLogContent(url.String()) //nolint:bodyclose // Response body is closed in downloadLogContent, but we need to return httpResp
 		if err != nil {
 			// To keep the return value consistent wrap the response as a GitHub Response
 			ghRes := &github.Response{
-				Response: resp,
+				Response: httpResp,
 			}
 			return nil, ghRes, fmt.Errorf("failed to download log content for job %d: %w", jobID, err)
 		}
 
@@ -275,31 +275,17 @@ func Test_UpdatePullRequest(t *testing.T) {
 			result, err := handler(context.Background(), request)
 
 			// Verify results
-			if tc.expectError {
+			if tc.expectError || tc.expectedErrMsg != "" {
 				require.NoError(t, err)
 				require.True(t, result.IsError)
 				errorContent := getErrorResult(t, result)
-				assert.Contains(t, errorContent.Text, tc.expectedErrMsg)
-				return
-			}
-
-			require.NoError(t, err)
-
-			// Check for expected error message within the result text
-			if tc.expectedErrMsg != "" {
-				if tc.expectError {
-					require.True(t, result.IsError)
-					errorContent := getErrorResult(t, result)
-					assert.Contains(t, errorContent.Text, tc.expectedErrMsg)
-				} else {
-					// Special case: error message returned as MCP error result, not Go error
-					require.True(t, result.IsError)
-					errorContent := getErrorResult(t, result)
+				if tc.expectedErrMsg != "" {
 					assert.Contains(t, errorContent.Text, tc.expectedErrMsg)
 				}
 				return
 			}
 
+			require.NoError(t, err)
 			require.False(t, result.IsError)
 
 			// Parse the result and get the text content
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ func GetGitHubGraphQLErrors(ctx context.Context) ([]*GitHubGraphQLError, error)`
`85`	`85`	`func NewGitHubAPIErrorToCtx(ctx context.Context, message string, resp *github.Response, err error) (context.Context, error) {`
`86`	`86`	`apiErr := newGitHubAPIError(message, resp, err)`
`87`	`87`	`if ctx != nil {`
`88`		`- addGitHubAPIErrorToContext(ctx, apiErr)`
	`88`	`+ _, _ = addGitHubAPIErrorToContext(ctx, apiErr) // Explicitly ignore error for graceful handling`
`89`	`89`	`}`
`90`	`90`	`return ctx, nil`
`91`	`91`	`}`
`@@ -110,7 +110,7 @@ func addGitHubGraphQLErrorToContext(ctx context.Context, err *GitHubGraphQLError`
`110`	`110`	`func NewGitHubAPIErrorResponse(ctx context.Context, message string, resp github.Response, err error) mcp.CallToolResult {`
`111`	`111`	`apiErr := newGitHubAPIError(message, resp, err)`
`112`	`112`	`if ctx != nil {`
`113`		`- addGitHubAPIErrorToContext(ctx, apiErr)`
	`113`	`+ _, _ = addGitHubAPIErrorToContext(ctx, apiErr) // Explicitly ignore error for graceful handling`
`114`	`114`	`}`
`115`	`115`	`return mcp.NewToolResultErrorFromErr(message, err)`
`116`	`116`	`}`
`@@ -119,7 +119,7 @@ func NewGitHubAPIErrorResponse(ctx context.Context, message string, resp *github`
`119`	`119`	`func NewGitHubGraphQLErrorResponse(ctx context.Context, message string, err error) *mcp.CallToolResult {`
`120`	`120`	`graphQLErr := newGitHubGraphQLError(message, err)`
`121`	`121`	`if ctx != nil {`
`122`		`- addGitHubGraphQLErrorToContext(ctx, graphQLErr)`
	`122`	`+ _, _ = addGitHubGraphQLErrorToContext(ctx, graphQLErr) // Explicitly ignore error for graceful handling`
`123`	`123`	`}`
`124`	`124`	`return mcp.NewToolResultErrorFromErr(message, err)`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -680,7 +680,7 @@ func handleFailedJobLogs(ctx context.Context, client *github.Client, owner, repo`
`680`	`680`	`"error": err.Error(),`
`681`	`681`	`}`
`682`	`682`	`// Enable reporting of status codes and error causes`
`683`		`- ghErrors.NewGitHubAPIErrorToCtx(ctx, "failed to get job logs", resp, err)`
	`683`	`+ _, _ = ghErrors.NewGitHubAPIErrorToCtx(ctx, "failed to get job logs", resp, err) // Explicitly ignore error for graceful handling`
`684`	`684`	`}`
`685`	`685`
`686`	`686`	`logResults = append(logResults, jobResult)`
`@@ -736,11 +736,11 @@ func getJobLogData(ctx context.Context, client *github.Client, owner, repo strin`
`736`	`736`
`737`	`737`	`if returnContent {`
`738`	`738`	`// Download and return the actual log content`
`739`		`- content, resp, err := downloadLogContent(url.String())`
	`739`	`+ content, httpResp, err := downloadLogContent(url.String()) //nolint:bodyclose // Response body is closed in downloadLogContent, but we need to return httpResp`
`740`	`740`	`if err != nil {`
`741`	`741`	`// To keep the return value consistent wrap the response as a GitHub Response`
`742`	`742`	`ghRes := &github.Response{`
`743`		`- Response: resp,`
	`743`	`+ Response: httpResp,`
`744`	`744`	`}`
`745`	`745`	`return nil, ghRes, fmt.Errorf("failed to download log content for job %d: %w", jobID, err)`
`746`	`746`	`}`