Clean up the PromptKit upgrade

internal/cli/run.go

@@ -30,7 +30,7 @@ import (
 const defaultConfigPath = "/usr/local/etc/notarius/config.yml"
 const usage = `Usage:
   notarius help
-  notarius run <pipeline-id> --input path/to/source.json [--config path/to/config.yml] [--output-dir path] [--json] [--chunk_cache auto|bypass|refresh] [--resume] [--recompute-step step-id] [--debug [--debug-dir path]] [--only lane-a,lane-b] [--session-id id] [--reference selector=path] [--without-reference selector]
+  notarius run <pipeline-id> --input path/to/source.json [--json] [flags]
   notarius config validate --config path/to/config.yml [--pipeline pipeline-id] [--only lane-a,lane-b]
   notarius pipelines list --config path/to/config.yml [--json]
 `

internal/core/artifacts/artifacts.go

@@ -1,6 +1,7 @@
 package artifacts
 
 import (
+	"strings"
 	"time"
 )
 
@@ -33,6 +34,27 @@ type LLMProfileManifest struct {
 	ReasoningEffort string `json:"reasoning_effort,omitempty"`
 }
 
+// Normalized returns the canonical representation used for manifest identity
+// and publication.
+func (profile LLMProfileManifest) Normalized() LLMProfileManifest {
+	profile.ID = strings.TrimSpace(profile.ID)
+	profile.Provider = strings.TrimSpace(profile.Provider)
+	profile.Model = strings.TrimSpace(profile.Model)
+	profile.BackendID = strings.TrimSpace(profile.BackendID)
+	profile.ReasoningEffort = strings.TrimSpace(profile.ReasoningEffort)
+	return profile
+}
+
+// IdentityKey returns an opaque, deterministic key for the effective profile.
+func (profile LLMProfileManifest) IdentityKey() string {
+	profile = profile.Normalized()
+	return profile.ID + "\x00" +
+		profile.Provider + "\x00" +
+		profile.Model + "\x00" +
+		profile.BackendID + "\x00" +
+		profile.ReasoningEffort
+}
+
 type ReferenceProvenance struct {
 	Stage            string `json:"stage,omitempty"`
 	StepID           string `json:"step_id,omitempty"`

internal/framework/llm/promptkit_client.go

@@ -313,12 +313,8 @@ func (r *LLMProfileRecorder) Record(profile artifacts.LLMProfileManifest) {
 	if r == nil {
 		return
 	}
-	profile.ID = strings.TrimSpace(profile.ID)
-	profile.Provider = strings.TrimSpace(profile.Provider)
-	profile.Model = strings.TrimSpace(profile.Model)
-	profile.BackendID = strings.TrimSpace(profile.BackendID)
-	profile.ReasoningEffort = strings.TrimSpace(profile.ReasoningEffort)
-	key := profile.ID + "\x00" + profile.Provider + "\x00" + profile.Model + "\x00" + profile.BackendID + "\x00" + profile.ReasoningEffort
+	profile = profile.Normalized()
+	key := profile.IdentityKey()
 	r.mu.Lock()
 	defer r.mu.Unlock()
 	if r.profiles == nil {

internal/framework/pipeline/runner.go

@@ -829,22 +829,12 @@ func mergeLLMProfileManifests(sources ...[]artifacts.LLMProfileManifest) []artif
 	merged := make(map[string]artifacts.LLMProfileManifest)
 	for _, source := range sources {
 		for _, profile := range source {
-			id := strings.TrimSpace(profile.ID)
-			provider := strings.TrimSpace(profile.Provider)
-			model := strings.TrimSpace(profile.Model)
-			backendID := strings.TrimSpace(profile.BackendID)
-			reasoningEffort := strings.TrimSpace(profile.ReasoningEffort)
-			key := id + "\x00" + provider + "\x00" + model + "\x00" + backendID + "\x00" + reasoningEffort
+			profile = profile.Normalized()
+			key := profile.IdentityKey()
 			if _, exists := merged[key]; exists {
 				continue
 			}
-			merged[key] = artifacts.LLMProfileManifest{
-				ID:              id,
-				Provider:        provider,
-				Model:           model,
-				BackendID:       backendID,
-				ReasoningEffort: reasoningEffort,
-			}
+			merged[key] = profile
 		}
 	}
 	if len(merged) == 0 {