Fix SCUM companion trajectory storage

2026-08-31 15:42:16 +08:00
parent bc927a5144
commit ea4e780562
26 changed files with 1028 additions and 112 deletions
@@ -188,29 +188,60 @@ func (svc *CoreService) platformDistributionBuildInput(job domain.Job) (domain.D
 		if err != nil {
 			return domain.DistributionBuildInput{}, err
 		}
+		profile, err := svc.clientManagerDistributionBuildProfile(distribution)
+		if err != nil {
+			return domain.DistributionBuildInput{}, err
+		}
 		return domain.DistributionBuildInput{
-			JobID:            job.ID,
-			ComponentKind:    domain.DistributionComponentClientManager,
-			ServerInstanceID: distribution.ServerInstanceID,
-			PluginID:         distribution.PluginID,
-			RunEndpointID:    job.RunEndpointID,
-			ProfileKey:       distribution.ProfileKey,
-			TargetOS:         distribution.TargetOS,
-			TargetArch:       distribution.TargetArch,
-			PlatformURL:      runReleasePlatformURL(),
-			PackageFormat:    packageFormatForTarget(distribution.TargetOS),
-			RepositoryURL:    distribution.RepositoryURL,
-			SourceRevision:   distribution.SourceRevision,
-			ArtifactID:       distribution.ArtifactID,
-			OutputFilename:   clientManagerOutputName(distribution.ProfileKey, distribution.TargetOS),
-			SecretRef:        distribution.SecretRef,
-			KeyGeneration:    distribution.KeyGeneration,
-			AuthKey:          plainKey,
+			JobID:             job.ID,
+			ComponentKind:     domain.DistributionComponentClientManager,
+			ServerInstanceID:  distribution.ServerInstanceID,
+			PluginID:          distribution.PluginID,
+			RunEndpointID:     job.RunEndpointID,
+			ProfileKey:        distribution.ProfileKey,
+			TargetOS:          distribution.TargetOS,
+			TargetArch:        distribution.TargetArch,
+			PlatformURL:       runReleasePlatformURL(),
+			PackageFormat:     packageFormatForTarget(distribution.TargetOS),
+			RepositoryURL:     distribution.RepositoryURL,
+			SourceRevision:    distribution.SourceRevision,
+			WorkspaceRef:      profile.WorkspaceRef,
+			EntryRef:          profile.EntryRef,
+			ConfigTemplateRef: clientManagerBuildConfigTemplateRef(profile),
+			ArtifactID:        distribution.ArtifactID,
+			OutputFilename:    clientManagerOutputName(distribution.ProfileKey, distribution.TargetOS),
+			SecretRef:         distribution.SecretRef,
+			KeyGeneration:     distribution.KeyGeneration,
+			AuthKey:           plainKey,
 		}, nil
 	}
 	return domain.DistributionBuildInput{}, repo.ErrNotFound
 }

+func (svc *CoreService) clientManagerDistributionBuildProfile(distribution domain.ClientManagerDistribution) (domain.RuntimeClientManagerProfile, error) {
+	plugin, err := svc.store.GamePlugins().Get(distribution.PluginID)
+	if err != nil {
+		return domain.RuntimeClientManagerProfile{}, err
+	}
+	profile, err := findRuntimeClientManagerProfile(plugin, distribution.ProfileKey)
+	if err != nil {
+		return domain.RuntimeClientManagerProfile{}, err
+	}
+	if profile.RepositoryURL != distribution.RepositoryURL || !clientManagerProfileAllowsRevision(profile, distribution.SourceRevision) || !clientManagerProfileSupportsTarget(profile, distribution.TargetOS, distribution.TargetArch) {
+		return domain.RuntimeClientManagerProfile{}, validationError("client-manager build no longer matches the declared profile")
+	}
+	return profile, nil
+}
+
+func clientManagerBuildConfigTemplateRef(profile domain.RuntimeClientManagerProfile) string {
+	for _, candidate := range profile.ConfigTemplates {
+		if candidate.OutputRef == "config.yaml" && strings.TrimSpace(candidate.TemplateRef) != "" {
+			return candidate.TemplateRef
+		}
+	}
+	return "config.yaml.example"
+}
+
 type runDistributionPackageContext struct {
 	profileKey          string
 	workspaceSeed       string