Remember restored image cache paths

Author: SqlRush

docs/first-second-parity-audit.md

@@ -505,7 +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, data URL aliases, and source URL/URI/cache-path aliases; stored image entries with inline source data or a current-session image-cache file now restore base64 content into prompt image blocks instead of keeping only metadata, including same-ID cache fallback, media-type inference when history metadata omits the original MIME type, and symlink escape guards before reading cached image bytes.
+- `internal/session`: prompt-history pasted image loading now accepts content-block-style `source`/`imageSource` objects, data URL aliases, and source URL/URI/cache-path aliases; stored image entries with inline source data or a current-session image-cache file now restore base64 content into prompt image blocks instead of keeping only metadata, including same-ID cache fallback, media-type inference when history metadata omits the original MIME type, symlink escape guards before reading cached image bytes, and restored path re-indexing for later image metadata/source lookup.
 - `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_test.go

@@ -847,11 +847,14 @@ func TestLoadHistoryRestoresExistingImageCacheSourcePath(t *testing.T) {
 		t.Fatalf("history = %#v", history)
 	}
 	image := history[0].PastedContents[4]
-	if image.SourcePath != imagePath || image.MediaType != "image/webp" || image.Filename != "diagram.webp" {
+	if image.MediaType != "image/webp" || image.Filename != "diagram.webp" {
 		t.Fatalf("image = %#v, want source path %q", image, imagePath)
 	}
-	if cached, ok := GetStoredImagePath(4); !ok || cached != imagePath {
+	requireSameFile(t, image.SourcePath, imagePath)
+	if cached, ok := GetStoredImagePath(4); !ok {
 		t.Fatalf("cached image path = %q ok=%v, want %q", cached, ok, imagePath)
+	} else {
+		requireSameFile(t, cached, imagePath)
 	}
 }
 

internal/session/image_store.go

@@ -69,6 +69,7 @@ func RestoreCachedImageContent(sessionID contracts.ID, content PastedContent, so
 	if mediaType == "" {
 		mediaType = inferredMediaType
 	}
+	rememberImagePath(content.ID, localPath)
 	return base64.StdEncoding.EncodeToString(data), mediaType, localPath, true
 }
 

internal/session/image_store_test.go

@@ -158,6 +158,49 @@ func TestImagePathNormalizesMediaTypeParameters(t *testing.T) {
 	}
 }
 
+func TestRestoreCachedImageContentRemembersResolvedPath(t *testing.T) {
+	dir := t.TempDir()
+	t.Setenv("CLAUDE_CONFIG_DIR", dir)
+	ClearStoredImagePaths()
+	defer ClearStoredImagePaths()
+
+	sessionID := contracts.ID("session-remember")
+	storedPath, ok := StoreImage(sessionID, PastedContent{
+		ID:        41,
+		Type:      PastedContentImage,
+		Content:   base64.StdEncoding.EncodeToString([]byte("cached image")),
+		MediaType: "image/png",
+	})
+	if !ok {
+		t.Fatal("store image failed")
+	}
+	ClearStoredImagePaths()
+	if got, ok := GetStoredImagePath(41); ok {
+		t.Fatalf("path remained cached after clear: %q", got)
+	}
+
+	content, mediaType, restoredPath, ok := RestoreCachedImageContent(sessionID, PastedContent{
+		ID:        41,
+		Type:      PastedContentImage,
+		MediaType: "image/png",
+	}, "")
+	if !ok {
+		t.Fatal("restore cached image failed")
+	}
+	if got := string(mustDecodeBase64(t, content)); got != "cached image" {
+		t.Fatalf("restored content = %q", got)
+	}
+	if mediaType != "image/png" {
+		t.Fatalf("media type = %q", mediaType)
+	}
+	if !sameFile(t, restoredPath, storedPath) {
+		t.Fatalf("restored path = %q, want same file as %q", restoredPath, storedPath)
+	}
+	if got, ok := GetStoredImagePath(41); !ok || !sameFile(t, got, restoredPath) {
+		t.Fatalf("remembered path = %q ok=%v, want same file as %q", got, ok, restoredPath)
+	}
+}
+
 func TestRestoreCachedImageContentRejectsSymlinkEscape(t *testing.T) {
 	dir := t.TempDir()
 	t.Setenv("CLAUDE_CONFIG_DIR", dir)
@@ -182,3 +225,25 @@ func TestRestoreCachedImageContentRejectsSymlinkEscape(t *testing.T) {
 		t.Fatalf("restore symlink escape = content=%q mediaType=%q path=%q ok=%v", content, mediaType, restoredPath, ok)
 	}
 }
+
+func mustDecodeBase64(t *testing.T, value string) []byte {
+	t.Helper()
+	data, err := base64.StdEncoding.DecodeString(value)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return data
+}
+
+func sameFile(t *testing.T, a, b string) bool {
+	t.Helper()
+	aInfo, err := os.Stat(a)
+	if err != nil {
+		t.Fatal(err)
+	}
+	bInfo, err := os.Stat(b)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return os.SameFile(aInfo, bInfo)
+}