Expose content hashes on prepared runs

This commit is contained in:
2026-11-20 04:16:50 +00:00
parent e415ad43ce
commit dd40171c01
8 changed files with 41 additions and 2 deletions

View File

@@ -100,6 +100,7 @@ func fromDomainPreparedRun(prepared *domain.PreparedRun) *PreparedRun {
InputHashes: copyStringMap(prepared.InputHashes),
SessionID: prepared.SessionID,
RenderedPromptHash: prepared.RenderedPromptHash,
MessageContentHash: prepared.MessageContentHash,
Messages: fromDomainRenderedMessages(prepared.Messages),
StartTime: prepared.StartTime,
EndTime: prepared.EndTime,

View File

@@ -105,6 +105,8 @@ relations pass without changing existing rendered-hash expectations.
## Stage 2 — Wire Prepared Values And Snapshot Lifecycle
Status: complete.
Update `internal/domain/domain.go`, `types.go`, `internal/usecase/runner.go`,
and `convert.go`:

View File

@@ -118,6 +118,7 @@ type PreparedRun struct {
InputHashes map[string]string
SessionID string
RenderedPromptHash string
MessageContentHash string
Messages []RenderedMessage
StartTime time.Time
EndTime time.Time

View File

@@ -511,6 +511,7 @@ func (r *Runner) completePreparationWithStructuredOutput(
InputHashes: inputHashes,
SessionID: effectivePrompt.SessionID,
RenderedPromptHash: hashRenderedPrompt(effectivePrompt),
MessageContentHash: hashMessageContent(effectivePrompt.Messages),
Messages: effectivePrompt.Messages,
StartTime: state.start,
EndTime: end,

View File

@@ -91,6 +91,7 @@ func TestPreparedRunJSONContractRoundTripsAllFields(t *testing.T) {
"input_hashes",
"session_id",
"rendered_prompt_hash",
"message_content_hash",
"messages",
"start_time",
"end_time",
@@ -124,6 +125,13 @@ func TestPreparedRunJSONContractRoundTripsAllFields(t *testing.T) {
t.Fatalf("marshal zero PreparedRun: %v", err)
}
zeroObject := decodeJSONObject(t, zeroPayload)
if string(zeroObject["message_content_hash"]) != `""` {
t.Fatalf("zero message content hash missing or nonempty: %s", zeroPayload)
}
var legacy promptkit.PreparedRun
if err := json.Unmarshal([]byte(`{"messages":[]}`), &legacy); err != nil || legacy.MessageContentHash != "" {
t.Fatalf("legacy prepared run = %+v, %v", legacy, err)
}
for _, field := range []string{
"prompt_version",
"prompt_hash",
@@ -271,6 +279,7 @@ func fullyPopulatedPreparedRun() promptkit.PreparedRun {
InputHashes: map[string]string{"first": "hash-1", "second": "hash-2"},
SessionID: "session-prepared",
RenderedPromptHash: "rendered-hash",
MessageContentHash: "content-hash",
Messages: []promptkit.RenderedMessage{
{
Role: "system",

View File

@@ -112,12 +112,20 @@ func TestPreparedExecutionFreezesSourcesAndReturnsIndependentDetails(t *testing.
reader.set("changed artifact", "changed-input-hash")
first := prepared.Details()
originalContentHash := first.MessageContentHash
if originalContentHash == "" {
t.Fatal("prepared content hash is empty")
}
first.MessageContentHash = "changed hash"
first.Messages[2].Content = "changed details"
first.InputHashes["input"] = "changed-details-hash"
first.EffectiveModelParams.ExtraParams["nested"].(map[string]any)["source"] = "changed details"
first.StructuredOutput.JSONSchema.Schema.(map[string]any)["title"] = "changed details"
second := prepared.Details()
if second.MessageContentHash != originalContentHash {
t.Fatal("details content hash changed")
}
if second.Messages[2].Content != "Input=original artifact Label=original variable" {
t.Fatalf("details message changed: %q", second.Messages[2].Content)
}
@@ -144,7 +152,7 @@ func TestPreparedExecutionFreezesSourcesAndReturnsIndependentDetails(t *testing.
if reader.callCount() != 1 {
t.Fatalf("execution reopened artifact source: calls=%d", reader.callCount())
}
if notified == nil || prepared.Details().Messages[2].Content != second.Messages[2].Content || prepared.Details().Messages[3].CacheControl.Type != promptkit.CacheControlEphemeral || !reflect.DeepEqual(initial.Exchange.Details(), initialDetails) || result.Exchange.Details().Messages[0].Content != "history" || prepared.Details().StructuredOutput.JSONSchema.Schema.(map[string]any)["title"] != "original root" {
if notified == nil || notified.MessageContentHash != originalContentHash || prepared.Details().MessageContentHash != originalContentHash || prepared.Details().Messages[2].Content != second.Messages[2].Content || prepared.Details().Messages[3].CacheControl.Type != promptkit.CacheControlEphemeral || !reflect.DeepEqual(initial.Exchange.Details(), initialDetails) || result.Exchange.Details().Messages[0].Content != "history" || prepared.Details().StructuredOutput.JSONSchema.Schema.(map[string]any)["title"] != "original root" {
t.Fatal("notification changed prepared state")
}
@@ -680,6 +688,9 @@ func TestPreparedExecutionDiscardAndFormattingDoNotExposePrivateState(t *testing
t.Fatalf("prepare execution for discard: %v", err)
}
discardedDetails := discarded.Details()
if discardedDetails.MessageContentHash == "" {
t.Fatal("discarded handle has no content hash")
}
discarded.Discard()
discarded.Discard()
result, lifecycleErr := engine.RunPrepared(context.Background(), discarded)

View File

@@ -22,9 +22,13 @@ func TestPreparedNotificationSelectionAndOrdering(t *testing.T) {
}
return &promptkit.GenerateResponse{Content: "ok"}, nil
}))
expected, err := engine.Prepare(context.Background(), promptkit.RunRequest{PromptID: "prompt"})
if err != nil || expected.MessageContentHash == "" {
t.Fatalf("preparation = %+v, %v", expected, err)
}
req := promptkit.RunRequest{PromptID: "prompt", OnPrepared: func(_ context.Context, details promptkit.PreparedRun) {
calls++
if details.PromptID != "prompt" || len(details.Messages) == 0 {
if details.PromptID != "prompt" || len(details.Messages) == 0 || details.MessageContentHash != expected.MessageContentHash {
t.Fatalf("details=%+v", details)
}
}}
@@ -36,6 +40,9 @@ func TestPreparedNotificationSelectionAndOrdering(t *testing.T) {
if calls != 0 {
t.Fatal("preparation notified")
}
if handle.Details().MessageContentHash != expected.MessageContentHash {
t.Fatal("prepared handle content hash differs")
}
req.OnPrepared = func(context.Context, promptkit.PreparedRun) { t.Fatal("selection changed") }
_, err = engine.RunPrepared(context.Background(), handle)
if err != nil {

View File

@@ -226,6 +226,13 @@ type PreparedRun struct {
SessionID string `json:"session_id,omitempty"`
// RenderedPromptHash is an opaque equality value for SessionID and Messages.
RenderedPromptHash string `json:"rendered_prompt_hash"`
// MessageContentHash is an opaque, filename-safe equality value computed
// during preparation from the ordered roles and exact text of Messages.
// It excludes session identity, cache hints, and other metadata outside the
// messages. Identical role/text sequences retain the same value across
// releases while the hash scheme is unchanged. A scheme change is a
// compatibility change and will be documented; no scheme is permanent.
MessageContentHash string `json:"message_content_hash"`
// Messages are the complete effective messages that Run or RunPrepared passes
// to the LLM client: captured history, if any, followed by definition
// messages and RunRequest.AppendedMessages in caller order.