fix(images): skip CLI image cache refs

TurboTheTurtle · clawsweeper[bot] · commit f0aa2297a2cc · 2026-05-28T09:13:59.000Z
diff --git a/src/agents/cli-runner.helpers.test.ts b/src/agents/cli-runner.helpers.test.ts
@@ -39,6 +39,22 @@ describe("loadPromptRefImages", () => {
     expect(sanitizeImageBlocksSpy).not.toHaveBeenCalled();
   });
 
+  it("does not reload OpenClaw CLI image cache paths from prior prompt text", async () => {
+    const loadImageFromRefSpy = vi.spyOn(promptImageUtils, "loadImageFromRef");
+    const sanitizeImageBlocksSpy = vi.spyOn(toolImages, "sanitizeImageBlocks");
+
+    await expect(
+      loadPromptRefImages({
+        prompt:
+          'Called the Read tool with {"file_path":"/workspace/.openclaw-cli-images/stale.png"}',
+        workspaceDir: "/workspace",
+      }),
+    ).resolves.toStrictEqual([]);
+
+    expect(loadImageFromRefSpy).not.toHaveBeenCalled();
+    expect(sanitizeImageBlocksSpy).not.toHaveBeenCalled();
+  });
+
   it("passes the max-byte guardrail through load and sanitize", async () => {
     const loadedImage: ImageContent = {
       type: "image",
diff --git a/src/agents/embedded-agent-runner/run/images.test.ts b/src/agents/embedded-agent-runner/run/images.test.ts
@@ -81,6 +81,35 @@ describe("detectImageReferences", () => {
     });
   });
 
+  it("ignores OpenClaw CLI image cache paths from prior prompt transcripts", () => {
+    const refs = detectImageReferences(
+      [
+        '<system-reminder>Called the Read tool with {"file_path":"/Users/ada/.openclaw/workspace/.openclaw-cli-images/stale.png"}</system-reminder>',
+        "Compare it with /Users/ada/Pictures/current.png",
+      ].join("\n"),
+    );
+
+    expect(refs).toStrictEqual([
+      {
+        raw: "/Users/ada/Pictures/current.png",
+        type: "path",
+        resolved: "/Users/ada/Pictures/current.png",
+      },
+    ]);
+  });
+
+  it("ignores temporary OpenClaw CLI image cache paths", () => {
+    expectNoImageReferences(
+      `Prior turn wrote ${path.join(os.tmpdir(), "openclaw-cli-images", "stale.jpg")}`,
+    );
+  });
+
+  it("ignores file URLs into the OpenClaw CLI image cache", () => {
+    const stalePath = path.join(os.tmpdir(), "openclaw-cli-images", "stale.png");
+
+    expectNoImageReferences(`Prior turn wrote ${pathToFileURL(stalePath).href}`);
+  });
+
   it("detects multiple image references in a prompt", () => {
     const refs = expectImageReferenceCount(
       `
diff --git a/src/agents/embedded-agent-runner/run/images.ts b/src/agents/embedded-agent-runner/run/images.ts
@@ -102,6 +102,13 @@ function normalizeRefForDedupe(raw: string): string {
   return process.platform === "win32" ? normalizeLowercaseStringOrEmpty(raw) : raw;
 }
 
+function isOpenClawCliImageCachePath(filePath: string): boolean {
+  const normalized = filePath.replaceAll("\\", "/");
+  return normalized.split("/").some((part) => {
+    return part === ".openclaw-cli-images" || part === "openclaw-cli-images";
+  });
+}
+
 export function mergePromptAttachmentImages(params: {
   imageOrder?: PromptImageOrderEntry[];
   existingImages?: ImageContent[];
@@ -321,8 +328,11 @@ export function detectImageReferences(prompt: string): DetectedImageRef[] {
     } catch {
       return;
     }
-    seen.add(dedupeKey);
     const resolved = trimmed.startsWith("~") ? resolveUserPath(trimmed) : trimmed;
+    if (isOpenClawCliImageCachePath(resolved)) {
+      return;
+    }
+    seen.add(dedupeKey);
     refs.push({ raw: trimmed, type: "path", resolved });
   };
 
@@ -388,6 +398,9 @@ export function detectImageReferences(prompt: string): DetectedImageRef[] {
     // Use fileURLToPath for proper handling (e.g., file://localhost/path)
     try {
       const resolved = safeFileURLToPath(raw);
+      if (isOpenClawCliImageCachePath(resolved)) {
+        continue;
+      }
       refs.push({ raw, type: "path", resolved });
     } catch {
       // Skip malformed file:// URLs
