fix: update job logs schema snapshot

Author: he-yufeng

pkg/github/__toolsnaps__/get_job_logs.snap

@@ -1,17 +1,17 @@
 {
   "annotations": {
     "readOnlyHint": true,
-    "title": "Get job logs"
+    "title": "Get GitHub Actions workflow job logs"
   },
-  "description": "Download logs for a specific workflow job or efficiently get all failed job logs for a workflow run",
+  "description": "Get logs for GitHub Actions workflow jobs.\nUse this tool to retrieve logs for a specific job or all jobs in a workflow run.\nProvide job_id for one job, or run_id for all jobs in a run. Set failed_only=true to restrict either mode to failed jobs only.\n",
   "inputSchema": {
     "properties": {
       "failed_only": {
-        "description": "When true, gets logs for all failed jobs in run_id",
+        "description": "When true, only returns logs for failed jobs. With job_id, the job must have failed. With run_id, only failed jobs in the run are included.",
         "type": "boolean"
       },
       "job_id": {
-        "description": "The unique identifier of the workflow job (required for single job logs)",
+        "description": "The unique identifier of the workflow job. Provide either job_id or run_id, not both.",
         "type": "number"
       },
       "owner": {
@@ -27,7 +27,7 @@
         "type": "boolean"
       },
       "run_id": {
-        "description": "Workflow run ID (required when using failed_only)",
+        "description": "The unique identifier of the workflow run. Provide either run_id or job_id, not both.",
         "type": "number"
       },
       "tail_lines": {

pkg/github/actions.go

@@ -57,8 +57,13 @@ func handleRunJobLogs(ctx context.Context, client *github.Client, owner, repo st
 
 	// Filter jobs when requested. Otherwise return logs for every job in the run.
 	var selectedJobs []*github.WorkflowJob
+	failedJobsCount := 0
 	for _, job := range jobs.Jobs {
-		if !failedOnly || job.GetConclusion() == "failure" {
+		failed := job.GetConclusion() == "failure"
+		if failed {
+			failedJobsCount++
+		}
+		if !failedOnly || failed {
 			selectedJobs = append(selectedJobs, job)
 		}
 	}
@@ -69,12 +74,10 @@ func handleRunJobLogs(ctx context.Context, client *github.Client, owner, repo st
 			message = "No failed jobs found in this workflow run"
 		}
 		result := map[string]any{
-			"message":    message,
-			"run_id":     runID,
-			"total_jobs": len(jobs.Jobs),
-		}
-		if failedOnly {
-			result["failed_jobs"] = 0
+			"message":     message,
+			"run_id":      runID,
+			"total_jobs":  len(jobs.Jobs),
+			"failed_jobs": failedJobsCount,
 		}
 		r, _ := json.Marshal(result)
 		return utils.NewToolResultText(string(r)), nil, nil
@@ -106,12 +109,10 @@ func handleRunJobLogs(ctx context.Context, client *github.Client, owner, repo st
 		"message":       message,
 		"run_id":        runID,
 		"total_jobs":    len(jobs.Jobs),
+		"failed_jobs":   failedJobsCount,
 		"logs":          logResults,
 		"return_format": map[string]bool{"content": returnContent, "urls": !returnContent},
 	}
-	if failedOnly {
-		result["failed_jobs"] = len(selectedJobs)
-	}
 
 	r, err := json.Marshal(result)
 	if err != nil {

pkg/github/actions_test.go

@@ -529,10 +529,7 @@ func Test_ActionsGetJobLogs(t *testing.T) {
 	// Verify tool definition once
 	toolDef := ActionsGetJobLogs(translations.NullTranslationHelper)
 
-	// Note: consolidated ActionsGetJobLogs has same tool name "get_job_logs" as the individual tool
-	// but with different descriptions. We skip toolsnap validation here since the individual
-	// tool's toolsnap already exists and is tested in Test_GetJobLogs.
-	// The consolidated tool has FeatureFlagEnable set, so only one will be active at a time.
+	require.NoError(t, toolsnaps.Test(toolDef.Tool.Name, toolDef.Tool))
 	assert.Equal(t, "get_job_logs", toolDef.Tool.Name)
 	assert.NotEmpty(t, toolDef.Tool.Description)
 	inputSchema := toolDef.Tool.InputSchema.(*jsonschema.Schema)
@@ -599,7 +596,7 @@ func Test_ActionsGetJobLogs_SingleJob(t *testing.T) {
 			}),
 		})
 
-		client := github.NewClient(mockedClient)
+		client := mustNewGHClient(t, mockedClient)
 		deps := BaseDeps{
 			Client:            client,
 			ContentWindowSize: 5000,
@@ -638,7 +635,7 @@ func Test_ActionsGetJobLogs_SingleJob(t *testing.T) {
 			}),
 		})
 
-		client := github.NewClient(mockedClient)
+		client := mustNewGHClient(t, mockedClient)
 		deps := BaseDeps{
 			Client:            client,
 			ContentWindowSize: 5000,
@@ -689,7 +686,7 @@ func Test_ActionsGetJobLogs_FailedJobs(t *testing.T) {
 			}),
 		})
 
-		client := github.NewClient(mockedClient)
+		client := mustNewGHClient(t, mockedClient)
 		deps := BaseDeps{
 			Client:            client,
 			ContentWindowSize: 5000,
@@ -712,6 +709,7 @@ func Test_ActionsGetJobLogs_FailedJobs(t *testing.T) {
 		require.NoError(t, err)
 		assert.Equal(t, float64(456), response["run_id"])
 		assert.Equal(t, float64(2), response["total_jobs"])
+		assert.Equal(t, float64(1), response["failed_jobs"])
 		assert.Len(t, response["logs"], 2)
 		assert.Contains(t, response["message"], "Retrieved logs for 2 jobs")
 	})
@@ -771,10 +769,64 @@ func Test_ActionsGetJobLogs_FailedJobs(t *testing.T) {
 		err = json.Unmarshal([]byte(textContent.Text), &response)
 		require.NoError(t, err)
 		assert.Equal(t, float64(456), response["run_id"])
+		assert.Equal(t, float64(2), response["failed_jobs"])
 		assert.Contains(t, response, "logs")
 		assert.Contains(t, response["message"], "Retrieved logs for")
 	})
 
+	t.Run("successful failed-only logs when all jobs failed", func(t *testing.T) {
+		mockedClient := MockHTTPClientWithHandlers(map[string]http.HandlerFunc{
+			GetReposActionsRunsJobsByOwnerByRepoByRunID: http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+				jobs := &github.Jobs{
+					TotalCount: github.Ptr(2),
+					Jobs: []*github.WorkflowJob{
+						{
+							ID:         github.Ptr(int64(1)),
+							Name:       github.Ptr("test-job-1"),
+							Conclusion: github.Ptr("failure"),
+						},
+						{
+							ID:         github.Ptr(int64(2)),
+							Name:       github.Ptr("test-job-2"),
+							Conclusion: github.Ptr("failure"),
+						},
+					},
+				}
+				w.WriteHeader(http.StatusOK)
+				_ = json.NewEncoder(w).Encode(jobs)
+			}),
+			GetReposActionsJobsLogsByOwnerByRepoByJobID: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.Header().Set("Location", "https://github.com/logs/job/"+r.URL.Path[len(r.URL.Path)-1:])
+				w.WriteHeader(http.StatusFound)
+			}),
+		})
+
+		client := mustNewGHClient(t, mockedClient)
+		deps := BaseDeps{
+			Client:            client,
+			ContentWindowSize: 5000,
+		}
+		handler := toolDef.Handler(deps)
+
+		request := createMCPRequest(map[string]any{
+			"owner":       "owner",
+			"repo":        "repo",
+			"run_id":      float64(456),
+			"failed_only": true,
+		})
+		result, err := handler(ContextWithDeps(context.Background(), deps), &request)
+
+		require.NoError(t, err)
+		require.False(t, result.IsError)
+
+		textContent := getTextResult(t, result)
+		var response map[string]any
+		err = json.Unmarshal([]byte(textContent.Text), &response)
+		require.NoError(t, err)
+		assert.Equal(t, float64(2), response["failed_jobs"])
+		assert.Len(t, response["logs"], 2)
+	})
+
 	t.Run("no failed jobs found", func(t *testing.T) {
 		mockedClient := MockHTTPClientWithHandlers(map[string]http.HandlerFunc{
 			GetReposActionsRunsJobsByOwnerByRepoByRunID: http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
@@ -826,7 +878,7 @@ func Test_ActionsGetJobLogs_FailedJobs(t *testing.T) {
 
 func Test_ActionsGetJobLogs_Validation(t *testing.T) {
 	toolDef := ActionsGetJobLogs(translations.NullTranslationHelper)
-	client := github.NewClient(MockHTTPClientWithHandlers(map[string]http.HandlerFunc{}))
+	client := mustNewGHClient(t, MockHTTPClientWithHandlers(map[string]http.HandlerFunc{}))
 	deps := BaseDeps{
 		Client:            client,
 		ContentWindowSize: 5000,