Collapse statusinfo subpackage into modules/actions

modules/actions/statusinfo only existed to dodge the modules/actions ->
services/context leak from artifacts.go. With that file moved, the
subpackage is unneeded. Rename types to avoid stutter in their new
home: statusinfo.ActionInfo -> actions.CommitStatusInfo and
statusinfo.GetActionInfo -> actions.GetCommitStatusInfo.

Also tighten doc on util_actions.go's ActionsUtils (drop drift-prone
cross-file comparison and a duplicated rationale on the one-line
wrapper method).

Co-Authored-By: Claude (Opus 4.7) <noreply@anthropic.com>

Author: silverwind

modules/actions/statusinfo/info.go modules/actions/commit_status_info.gomodules/actions/statusinfo/info.go renamed to modules/actions/commit_status_info.go

@@ -1,7 +1,7 @@
 // Copyright 2026 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package statusinfo
+package actions
 
 import (
 	"context"
@@ -13,41 +13,43 @@ import (
 	"code.gitea.io/gitea/modules/log"
 )
 
-// ActionInfo maps CommitStatus.ID to the live ActionRunJob status
+// CommitStatusInfo maps CommitStatus.ID to the live ActionRunJob status
 // for Gitea Actions rows.
-type ActionInfo map[int64]actions_model.Status
+type CommitStatusInfo map[int64]actions_model.Status
 
 // IconStatus returns the action status name to route the icon through
 // repo/icons/action_status, or "" when the row isn't from Gitea Actions.
-func (m ActionInfo) IconStatus(s *git_model.CommitStatus) string {
+func (m CommitStatusInfo) IconStatus(s *git_model.CommitStatus) string {
 	if status, ok := m[s.ID]; ok {
 		return status.String()
 	}
 	return ""
 }
 
-// GetActionInfo resolves the live ActionRunJob.Status for every
+// GetCommitStatusInfo resolves the live ActionRunJob.Status for every
 // CommitStatus row backed by Gitea Actions. Rows from other sources (external
 // CIs, API) are left untouched and rendered from their stored State.
 //
-// Side effect: populates status.Repo for inputs whose Repo is nil, sharing
-// one lookup across entries with the same RepoID. ParseGiteaActionsTargetURL
-// needs the Repo loaded; the caching avoids one DB hit per row.
-func GetActionInfo(ctx context.Context, statuses []*git_model.CommitStatus) ActionInfo {
+// Side effect: fills in status.Repo for inputs whose Repo is nil, sharing one
+// lookup across entries with the same RepoID — ParseGiteaActionsTargetURL
+// needs Repo loaded and would otherwise lazy-load it per row.
+func GetCommitStatusInfo(ctx context.Context, statuses []*git_model.CommitStatus) CommitStatusInfo {
 	if len(statuses) == 0 {
 		return nil
 	}
 	statusByJobID := make(map[int64]*git_model.CommitStatus)
-	repoCache := make(map[int64]*repo_model.Repository)
+	repoByID := make(map[int64]*repo_model.Repository)
 	for _, status := range statuses {
 		if status == nil || status.TargetURL == "" {
 			continue
 		}
 		if status.Repo == nil {
-			status.Repo = repoCache[status.RepoID]
+			status.Repo = repoByID[status.RepoID]
 		}
+		// ParseGiteaActionsTargetURL lazy-loads status.Repo on miss; cache the
+		// outcome so later entries with the same RepoID skip that load.
 		_, jobID, ok := status.ParseGiteaActionsTargetURL(ctx)
-		repoCache[status.RepoID] = status.Repo
+		repoByID[status.RepoID] = status.Repo
 		if ok {
 			statusByJobID[jobID] = status
 		}
@@ -61,10 +63,10 @@ func GetActionInfo(ctx context.Context, statuses []*git_model.CommitStatus) Acti
 	}
 	jobs := make(map[int64]*actions_model.ActionRunJob, len(jobIDs))
 	if err := db.GetEngine(ctx).In("id", jobIDs).Cols("id", "status").Find(&jobs); err != nil {
-		log.Error("GetActionInfo: find action run jobs: %v", err)
+		log.Error("GetCommitStatusInfo: find action run jobs: %v", err)
 		return nil
 	}
-	info := make(ActionInfo, len(jobs))
+	info := make(CommitStatusInfo, len(jobs))
 	for jobID, status := range statusByJobID {
 		if job, ok := jobs[jobID]; ok && !job.Status.IsUnknown() {
 			info[status.ID] = job.Status

modules/templates/util_actions.go

@@ -7,11 +7,11 @@ import (
 	"context"
 
 	git_model "code.gitea.io/gitea/models/git"
-	"code.gitea.io/gitea/modules/actions/statusinfo"
+	actions_module "code.gitea.io/gitea/modules/actions"
 )
 
 // ActionsUtils groups template helpers for Gitea Actions data. Methods may
-// issue DB queries; unlike MiscUtils/RenderUtils these are not pure.
+// issue DB queries.
 type ActionsUtils struct {
 	ctx context.Context
 }
@@ -20,10 +20,6 @@ func NewActionsUtils(ctx context.Context) *ActionsUtils {
 	return &ActionsUtils{ctx: ctx}
 }
 
-// CommitStatusInfo resolves the live ActionRunJob.Status for every
-// Gitea-Actions-backed CommitStatus row so repo/pulls/status.tmpl can render
-// the matching live icon (the stored State collapses Waiting/Running/Blocked
-// into Pending).
-func (a *ActionsUtils) CommitStatusInfo(statuses []*git_model.CommitStatus) statusinfo.ActionInfo {
-	return statusinfo.GetActionInfo(a.ctx, statuses)
+func (a *ActionsUtils) CommitStatusInfo(statuses []*git_model.CommitStatus) actions_module.CommitStatusInfo {
+	return actions_module.GetCommitStatusInfo(a.ctx, statuses)
 }

tests/integration/actions_trigger_test.go

@@ -22,7 +22,6 @@ import (
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
 	actions_module "code.gitea.io/gitea/modules/actions"
-	"code.gitea.io/gitea/modules/actions/statusinfo"
 	"code.gitea.io/gitea/modules/commitstatus"
 	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/json"
@@ -1810,7 +1809,7 @@ jobs:
 	})
 }
 
-// Verify GetActionInfo surfaces the live ActionRunJob.Status so the
+// Verify GetCommitStatusInfo surfaces the live ActionRunJob.Status so the
 // icon reflects Waiting/Running/Blocked — all three share State=Pending in the
 // stored CommitStatus row.
 func TestActionsCommitStatusRunning(t *testing.T) {
@@ -1850,11 +1849,11 @@ func TestActionsCommitStatusRunning(t *testing.T) {
 		require.Len(t, statuses, 1)
 		assert.Equal(t, commitstatus.CommitStatusPending, statuses[0].State)
 
-		info := statusinfo.GetActionInfo(t.Context(), statuses)
+		info := actions_module.GetCommitStatusInfo(t.Context(), statuses)
 		assert.Equal(t, actions_model.StatusRunning.String(), info.IconStatus(statuses[0]))
 
 		// No enrichment available → IconStatus is empty.
-		empty := statusinfo.ActionInfo{}
+		empty := actions_module.CommitStatusInfo{}
 		assert.Empty(t, empty.IconStatus(statuses[0]))
 
 		// The commits-list tippy tooltip renders status.tmpl too: verify the live