fix(ui): preserve legacy assistant avatar override across agent-scoped storage (#90932)

xydigit-sj · xydigit-sj · commit 11bfcdb169a8 · 2026-06-15T21:31:30.000+08:00
diff --git a/ui/src/ui/controllers/assistant-identity.test.ts b/ui/src/ui/controllers/assistant-identity.test.ts
@@ -116,6 +116,25 @@ describe("setAssistantAvatarOverride", () => {
     expect(loadLocalAssistantIdentity("agent-1").avatar).toBeNull();
   });
 
+  it("falls back to the legacy flat key when no agent-scoped override exists", () => {
+    const storage = createStorageMock();
+    storage.setItem(
+      "openclaw.control.assistant.v1",
+      JSON.stringify({ avatar: "data:image/png;base64,bGVnYWN5" }),
+    );
+    vi.stubGlobal("localStorage", storage);
+
+    expect(loadLocalAssistantIdentity("agent-1").avatar).toBe("data:image/png;base64,bGVnYWN5");
+    expect(loadLocalAssistantIdentity("agent-2").avatar).toBe("data:image/png;base64,bGVnYWN5");
+    // Scoped key still takes precedence over the flat key.
+    storage.setItem(
+      "openclaw.control.assistant.v1:agent-1",
+      JSON.stringify({ avatar: "data:image/png;base64,c2NvcGVk" }),
+    );
+    expect(loadLocalAssistantIdentity("agent-1").avatar).toBe("data:image/png;base64,c2NvcGVk");
+    expect(loadLocalAssistantIdentity("agent-2").avatar).toBe("data:image/png;base64,bGVnYWN5");
+  });
+
   it("applies the agent-scoped local override when loading identity", async () => {
     const request = vi
       .fn()
diff --git a/ui/src/ui/storage.ts b/ui/src/ui/storage.ts
@@ -360,7 +360,13 @@ function localAssistantIdentityKey(agentId?: string | null): string {
 export function loadLocalAssistantIdentity(agentId?: string | null): LocalAssistantIdentity {
   const storage = getSafeLocalStorage();
   try {
-    const raw = storage?.getItem(localAssistantIdentityKey(agentId));
+    let raw = storage?.getItem(localAssistantIdentityKey(agentId));
+    // Preserve legacy flat assistant avatar overrides for users upgrading from
+    // the unscoped key. When no agent-scoped value exists, fall back to the
+    // flat key so the visible override is not silently lost after upgrade.
+    if (!raw && agentId) {
+      raw = storage?.getItem(localAssistantIdentityKey());
+    }
     if (!raw) {
       return { avatar: null };
     }
