Merge remote-tracking branch 'upstream/dev' into ocv

Author: github-actions[bot]

packages/app/src/context/layout.tsx

@@ -391,7 +391,14 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
         ? globalSync.data.project.find((x) => x.id === projectID)
         : globalSync.data.project.find((x) => x.worktree === project.worktree)
 
-      return { ...metadata, ...project }
+      // Preserve local icon override from per-workspace localStorage cache (childStore.icon).
+      // Without this, different subdirectories of the same git repo would share the same
+      // icon from the database instead of using their individual overrides.
+      const base = { ...metadata, ...project }
+      if (childStore.icon) {
+        return { ...base, icon: { ...base.icon, override: childStore.icon } }
+      }
+      return base
     }
 
     const roots = createMemo(() => {

packages/ui/src/components/basic-tool.css

@@ -11,17 +11,6 @@
     cursor: pointer;
   }
 
-  &[data-hide-details="true"] {
-    [data-slot="basic-tool-tool-trigger-content"] {
-      flex: 1 1 auto;
-      max-width: 100%;
-    }
-
-    [data-slot="basic-tool-tool-info"] {
-      flex: 1 1 auto;
-    }
-  }
-
   [data-slot="basic-tool-tool-trigger-content"] {
     flex: 0 1 auto;
     width: auto;

packages/ui/src/components/message-part.css

@@ -1207,7 +1207,6 @@
 
   [data-slot="apply-patch-filename"] {
     color: var(--text-strong);
-    flex: 1 1 auto;
     min-width: 0;
     overflow: hidden;
     text-overflow: ellipsis;