Restore pasted image source content

Author: SqlRush

docs/first-second-parity-audit.md

@@ -505,6 +505,7 @@ M7 progress now includes:
 - `internal/session`: prompt-history `LogEntry` loading now accepts project aliases such as `projectPath`/`cwd`/`workingDirectory`/`workspacePath` and timestamp aliases such as `createdAt`/`unixTimestamp`, including RFC3339 timestamp normalization to Unix milliseconds.
 - `internal/session`: prompt-history display text loading now accepts aliases such as `prompt`/`text`/`input`/`content`/`value` for runtime and stored history.
 - `internal/session`: prompt-history pasted-content containers now accept aliases such as `pastedContent`/`pasted_content`, `pasteContents`/`paste_contents`, `pastes`, and `attachments`/`attachment`, matching interaction script fixture shapes for runtime and stored history.
+- `internal/session`: prompt-history pasted image loading now accepts content-block-style `source`/`imageSource` objects plus source URL/URI/cache-path aliases, and stored image entries with inline source data now restore base64 content into prompt image blocks instead of keeping only metadata.
 - `internal/compact`: microcompact disk cache loading now accepts broader summary-like direct and provider aliases including `body`, `markdown`, `description`/`details`, `finalSummary`, `summaryContent`, `resultText`, `completionText`, `responseText`, and `messageText`, preserving visible summary recovery through nested cache entries, JSON:API/resource envelopes, and provider-style response wrappers.
 
 Still missing for full M6/M7 parity:

internal/session/history.go

@@ -280,6 +280,7 @@ func LogEntryToHistoryEntry(entry LogEntry, resolver PasteResolver) HistoryEntry
 			pastedContents[id] = PastedContent{
 				ID:         contentID,
 				Type:       stored.Type,
+				Content:    stored.Content,
 				MediaType:  stored.MediaType,
 				Filename:   stored.Filename,
 				Dimensions: stored.Dimensions,

internal/session/history_aliases.go

@@ -113,9 +113,10 @@ func historyApplyPastedContentFields(content *PastedContent, fields map[string]j
 	if value := historyDimensionsJSONField(fields, "dimensions", "imageDimensions", "image_dimensions"); value != nil && (overwrite || content.Dimensions == nil) {
 		content.Dimensions = value
 	}
-	if value := historyStringJSONField(fields, "sourcePath", "source_path", "filePath", "file_path", "path"); value != "" && (overwrite || content.SourcePath == "") {
+	if value := historyStringJSONField(fields, historyPastedContentSourcePathFieldNames()...); value != "" && (overwrite || content.SourcePath == "") {
 		content.SourcePath = value
 	}
+	historyApplyPastedContentSourceFields(content, fields)
 }
 
 func historyApplyStoredPastedContentFields(content *StoredPastedContent, fields map[string]json.RawMessage, overwrite bool) {
@@ -140,9 +141,10 @@ func historyApplyStoredPastedContentFields(content *StoredPastedContent, fields
 	if value := historyDimensionsJSONField(fields, "dimensions", "imageDimensions", "image_dimensions"); value != nil && (overwrite || content.Dimensions == nil) {
 		content.Dimensions = value
 	}
-	if value := historyStringJSONField(fields, "sourcePath", "source_path", "filePath", "file_path", "path"); value != "" && (overwrite || content.SourcePath == "") {
+	if value := historyStringJSONField(fields, historyPastedContentSourcePathFieldNames()...); value != "" && (overwrite || content.SourcePath == "") {
 		content.SourcePath = value
 	}
+	historyApplyStoredPastedContentSourceFields(content, fields)
 }
 
 func canonicalPastedContentType(value string) string {
@@ -508,6 +510,45 @@ func historyPastedContentContentFieldNames() []string {
 	}
 }
 
+func historyPastedContentSourcePathFieldNames() []string {
+	return []string{
+		"sourcePath",
+		"source_path",
+		"sourceURL",
+		"sourceUrl",
+		"source_url",
+		"sourceURI",
+		"sourceUri",
+		"source_uri",
+		"filePath",
+		"file_path",
+		"imagePath",
+		"image_path",
+		"cachePath",
+		"cache_path",
+		"storedPath",
+		"stored_path",
+		"path",
+		"url",
+		"uri",
+		"href",
+		"source",
+		"src",
+	}
+}
+
+func historyPastedContentSourceObjectFieldNames() []string {
+	return []string{
+		"source",
+		"imageSource",
+		"image_source",
+		"contentSource",
+		"content_source",
+		"mediaSource",
+		"media_source",
+	}
+}
+
 func historyPastedContentHashFieldNames() []string {
 	return []string{
 		"contentHash",
@@ -525,6 +566,59 @@ func historyPastedContentHashFieldNames() []string {
 	}
 }
 
+func historyApplyPastedContentSourceFields(content *PastedContent, fields map[string]json.RawMessage) {
+	source := historyImageSourceJSONField(fields)
+	if source == nil {
+		return
+	}
+	if value := historyStringJSONField(source, historyPastedContentContentFieldNames()...); value != "" && content.Content == "" {
+		content.Content = value
+	}
+	if value := historyStringJSONField(source, "mediaType", "media_type", "mimeType", "mime_type", "contentType", "content_type"); value != "" && content.MediaType == "" {
+		content.MediaType = value
+	}
+	if value := historyStringJSONField(source, historyPastedContentSourcePathFieldNames()...); value != "" && content.SourcePath == "" {
+		content.SourcePath = value
+	}
+}
+
+func historyApplyStoredPastedContentSourceFields(content *StoredPastedContent, fields map[string]json.RawMessage) {
+	source := historyImageSourceJSONField(fields)
+	if source == nil {
+		return
+	}
+	if value := historyStringJSONField(source, historyPastedContentContentFieldNames()...); value != "" && content.Content == "" {
+		content.Content = value
+	}
+	if value := historyStringJSONField(source, historyPastedContentHashFieldNames()...); value != "" && content.ContentHash == "" {
+		content.ContentHash = value
+	}
+	if value := historyStringJSONField(source, "mediaType", "media_type", "mimeType", "mime_type", "contentType", "content_type"); value != "" && content.MediaType == "" {
+		content.MediaType = value
+	}
+	if value := historyStringJSONField(source, historyPastedContentSourcePathFieldNames()...); value != "" && content.SourcePath == "" {
+		content.SourcePath = value
+	}
+}
+
+func historyImageSourceJSONField(fields map[string]json.RawMessage) map[string]json.RawMessage {
+	for _, name := range historyPastedContentSourceObjectFieldNames() {
+		raw, ok := fields[name]
+		if !ok {
+			continue
+		}
+		raw = bytes.TrimSpace(raw)
+		if len(raw) == 0 || bytes.Equal(raw, []byte("null")) || raw[0] != '{' {
+			continue
+		}
+		var source map[string]json.RawMessage
+		if err := json.Unmarshal(raw, &source); err == nil {
+			return source
+		}
+	}
+	return nil
+}
+
 func historyWrappedPayloadJSON(fields map[string]json.RawMessage, wrappers []string, scalarDirect []string, containerDirect []string) (json.RawMessage, bool) {
 	if historyHasScalarPayload(fields, scalarDirect) || historyHasContainerPayload(fields, containerDirect) {
 		return nil, false

internal/session/history_test.go

@@ -263,6 +263,35 @@ func TestHistoryEntryAcceptsPastedContentBodyAndBase64DataAliases(t *testing.T)
 	}
 }
 
+func TestHistoryEntryAcceptsImageSourceObjectAliases(t *testing.T) {
+	var entry HistoryEntry
+	data := `{
+		"display": "restore [Image #21] [Image #22]",
+		"pastedContents": [
+			{
+				"imageID": "21",
+				"type": "input_image",
+				"fileName": "source.png",
+				"source": {"type":"base64","media_type":"image/png","data":"AAAA"}
+			},
+			{
+				"imageID": "22",
+				"kind": "pasted-image",
+				"imageSource": {"type":"url","url":"file:///tmp/photo.jpg","mimeType":"image/jpeg"}
+			}
+		]
+	}`
+	if err := json.Unmarshal([]byte(data), &entry); err != nil {
+		t.Fatal(err)
+	}
+	if got := entry.PastedContents[21]; got.ID != 21 || got.Type != PastedContentImage || got.Content != "AAAA" || got.MediaType != "image/png" || got.Filename != "source.png" {
+		t.Fatalf("source object image = %#v", got)
+	}
+	if got := entry.PastedContents[22]; got.ID != 22 || got.Type != PastedContentImage || got.Content != "" || got.MediaType != "image/jpeg" || got.SourcePath != "file:///tmp/photo.jpg" {
+		t.Fatalf("source URL image = %#v", got)
+	}
+}
+
 func TestHistoryEntryAcceptsPastedContentsArrayAndSingleObject(t *testing.T) {
 	var entry HistoryEntry
 	if err := json.Unmarshal([]byte(`{"display":"restore","pastedContents":[{"pastedContentId":"4","kind":"text","value":"array memo"},{"imageID":"5","type":"image","base64":"AAAA","mimeType":"image/png"}]}`), &entry); err != nil {
@@ -430,6 +459,34 @@ func TestLoadHistoryAcceptsStoredPastedContentsArray(t *testing.T) {
 	}
 }
 
+func TestLoadHistoryPreservesStoredImageSourceContent(t *testing.T) {
+	path := filepath.Join(t.TempDir(), "history.jsonl")
+	line := `{"display":"look [Image #23]","pasted_contents":{"23":{"imageID":"23","kind":"pasted-image","fileName":"diagram.webp","source":{"type":"base64","mediaType":"image/webp","data":"BBBB","sourceUrl":"file:///tmp/diagram.webp"}}},"timestamp":100,"project":"/repo","sessionID":"session"}`
+	if err := os.WriteFile(path, []byte(line+"\n"), 0o600); err != nil {
+		t.Fatal(err)
+	}
+
+	history, err := LoadHistory(path, "/repo", "session", MaxHistoryItems, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(history) != 1 {
+		t.Fatalf("history = %#v", history)
+	}
+	got := history[0].PastedContents[23]
+	if got.ID != 23 || got.Type != PastedContentImage || got.Content != "BBBB" || got.MediaType != "image/webp" || got.Filename != "diagram.webp" || got.SourcePath != "file:///tmp/diagram.webp" {
+		t.Fatalf("stored image source = %#v", got)
+	}
+	messages := PromptMessages(history[0].Display, history[0].PastedContents)
+	if len(messages) == 0 || len(messages[0].Content) != 2 || messages[0].Content[1].Type != contracts.ContentImage {
+		t.Fatalf("prompt messages = %#v", messages)
+	}
+	source, ok := messages[0].Content[1].Source.(contracts.ImageSource)
+	if !ok || source.MediaType != "image/webp" || source.Data != "BBBB" {
+		t.Fatalf("image source = %#v", messages[0].Content[1].Source)
+	}
+}
+
 func TestLoadHistoryAcceptsGraphQLWrappedLogEntries(t *testing.T) {
 	path := filepath.Join(t.TempDir(), "history.jsonl")
 	line := `{"edge":{"node":{"properties":{"text":"restore [Pasted text #16]","attachments":[{"edge":{"node":{"properties":{"contentID":"16","pasted_type":"input_text","content_hash":"graph_hash","contentType":"text/plain"}}}}]}}},"timestamp":100,"projectPath":"/repo","sessionID":"session"}`