Fix CI job key matching reuse

Author: cursoragent

pkg/cmd/ci/logs.go

@@ -1128,7 +1128,7 @@ func findLogsJobWithOptions(resp *civ1.GetRunStatusResponse, originalID, jobKey,
 		bestTier := 0
 		tierMatches := map[int][]jobCandidate{}
 		for _, c := range candidates {
-			if tier := matchJobKey(c.job.JobKey, jobKey); tier > 0 {
+			if tier := coreci.MatchJobKey(c.job.JobKey, jobKey); tier > 0 {
 				tierMatches[tier] = append(tierMatches[tier], c)
 				if bestTier == 0 || tier < bestTier {
 					bestTier = tier

pkg/cmd/ci/ssh.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/depot/cli/pkg/api"
+	coreci "github.com/depot/cli/pkg/ci"
 	"github.com/depot/cli/pkg/config"
 	"github.com/depot/cli/pkg/helpers"
 	civ1 "github.com/depot/cli/pkg/proto/depot/ci/v1"
@@ -211,7 +212,7 @@ func findJob(resp *civ1.GetRunStatusResponse, jobKey, originalID string) (*civ1.
 		bestTier := 0
 		tierMatches := map[int][]*civ1.JobStatus{}
 		for _, j := range allJobs {
-			if tier := matchJobKey(j.JobKey, jobKey); tier > 0 {
+			if tier := coreci.MatchJobKey(j.JobKey, jobKey); tier > 0 {
 				tierMatches[tier] = append(tierMatches[tier], j)
 				if bestTier == 0 || tier < bestTier {
 					bestTier = tier
@@ -277,28 +278,6 @@ func workflowErrorMessage(resp *civ1.GetRunStatusResponse) string {
 	return ""
 }
 
-// matchJobKey returns the match tier of userKey against the full jobKey.
-// Returns 0 for no match. Lower non-zero values are higher priority:
-//
-//	1 = exact match ("build" == "build")
-//	2 = suffix match ("_inline_0.yaml:build" ends with ":build")
-//	3 = segment match ("pr.yaml:bazel:build" contains ":bazel:" as a segment)
-func matchJobKey(jobKey, userKey string) int {
-	if jobKey == userKey {
-		return 1
-	}
-	if strings.HasSuffix(jobKey, ":"+userKey) {
-		return 2
-	}
-	// Check if userKey appears as a complete colon-delimited segment anywhere
-	// in the key. Handles reusable workflow keys like "pr.yaml:bazel:build"
-	// where "bazel" is an intermediate segment.
-	if strings.Contains(":"+jobKey+":", ":"+userKey+":") {
-		return 3
-	}
-	return 0
-}
-
 func printSSHInfo(sandboxID, sessionID, output string) error {
 	if output == "json" {
 		enc := json.NewEncoder(os.Stdout)

pkg/cmd/ci/ssh_test.go

@@ -3,6 +3,7 @@ package ci
 import (
 	"testing"
 
+	coreci "github.com/depot/cli/pkg/ci"
 	civ1 "github.com/depot/cli/pkg/proto/depot/ci/v1"
 )
 
@@ -31,9 +32,9 @@ func TestMatchJobKey(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		got := matchJobKey(tt.jobKey, tt.userKey)
+		got := coreci.MatchJobKey(tt.jobKey, tt.userKey)
 		if got != tt.want {
-			t.Errorf("matchJobKey(%q, %q) = %d, want %d", tt.jobKey, tt.userKey, got, tt.want)
+			t.Errorf("MatchJobKey(%q, %q) = %d, want %d", tt.jobKey, tt.userKey, got, tt.want)
 		}
 	}
 }

pkg/proto/depot/testresults/v1/test_results.pb.go

@@ -37,9 +37,8 @@ enum TestResultStatus {
 }
 
 message ReportTestResultsRequest {
-  // Per-step identity key. Populated by the action from `key:` input, else
-  // $GITHUB_ACTION, else "default". This scopes multiple reports within a
-  // single owner. Must be non-empty.
+  // Per-invocation identity key. This scopes multiple reports within a single
+  // owner. Must be non-empty.
   string invocation_id = 1;
 
   // One entry per JUnit XML file matched by the action's glob.