fix(app): persist local project renames in project list

Author: Chewji9875

packages/app/src/context/global-sync/utils.test.ts

@@ -5,7 +5,14 @@ import type {
   ModelListOutput,
   ProviderListOutput,
 } from "@opencode-ai/client/promise"
-import { directoryKey, normalizeAgentList, normalizePermissionRequest, normalizeProviderList } from "./utils"
+import {
+  directoryKey,
+  enrichProject,
+  mergeProjectMeta,
+  normalizeAgentList,
+  normalizePermissionRequest,
+  normalizeProviderList,
+} from "./utils"
 
 describe("normalizeAgentList", () => {
   test("adapts current agents to the app agent shape", () => {
@@ -131,3 +138,86 @@ describe("directoryKey", () => {
     expect(String(directoryKey("/"))).toBe("/")
   })
 })
+
+type Base = {
+  worktree: string
+  name?: string
+  icon?: { color?: string; override?: string }
+  commands?: { start?: string }
+}
+
+describe("mergeProjectMeta", () => {
+  test("returns base unchanged when there is no local projectMeta", () => {
+    const base: Base = { worktree: "/repo", name: "Repo" }
+    expect(mergeProjectMeta(base, undefined)).toBe(base)
+  })
+
+  test("applies local name for projects without a server registration", () => {
+    const base: Base = { worktree: "/repo" }
+    expect(mergeProjectMeta(base, { name: "MicroservicesABC" })).toEqual({
+      worktree: "/repo",
+      name: "MicroservicesABC",
+    })
+  })
+
+  test("keeps server name when local projectMeta has no name", () => {
+    const base: Base = { worktree: "/repo", name: "SOOK" }
+    expect(mergeProjectMeta(base, { icon: { color: "red" } })).toEqual({
+      worktree: "/repo",
+      name: "SOOK",
+      icon: { color: "red" },
+    })
+  })
+
+  test("preserves an empty local name (display falls back to the folder name downstream)", () => {
+    const base: Base = { worktree: "/repo" }
+    expect(mergeProjectMeta(base, { name: "" })).toEqual({ worktree: "/repo", name: "" })
+  })
+
+  test("merges icon and commands overrides", () => {
+    const base: Base = { worktree: "/repo", icon: { color: "blue" }, commands: { start: "" } }
+    expect(
+      mergeProjectMeta(base, { icon: { color: "red", override: "data:img" }, commands: { start: "bun dev" } }),
+    ).toEqual({
+      worktree: "/repo",
+      icon: { color: "red", override: "data:img" },
+      commands: { start: "bun dev" },
+    })
+  })
+})
+
+describe("enrichProject", () => {
+  test("applies the legacy icon override on top of projectMeta", () => {
+    const base: Base = { worktree: "/repo", name: "Repo" }
+    expect(enrichProject(base, { name: "Renamed", icon: { color: "red" } }, "data:legacy", false)).toEqual({
+      worktree: "/repo",
+      name: "Renamed",
+      icon: { color: "red", override: "data:legacy" },
+    })
+  })
+
+  test("returns merged base unchanged when there is no legacy icon", () => {
+    const base: Base = { worktree: "/repo" }
+    expect(enrichProject(base, { name: "Renamed" }, undefined, false)).toEqual({
+      worktree: "/repo",
+      name: "Renamed",
+    })
+  })
+
+  test("ignores stale local projectMeta for projects with a server id", () => {
+    const base: Base = { worktree: "/repo", name: "opencode_configaaa" }
+    expect(enrichProject(base, { name: "opencode_config" }, undefined, true)).toEqual({
+      worktree: "/repo",
+      name: "opencode_configaaa",
+    })
+  })
+
+  test("still applies the legacy icon override for projects with a server id", () => {
+    const base: Base = { worktree: "/repo", name: "opencode_configaaa" }
+    expect(enrichProject(base, { name: "opencode_config" }, "data:legacy", true)).toEqual({
+      worktree: "/repo",
+      name: "opencode_configaaa",
+      icon: { override: "data:legacy" },
+    })
+  })
+})

packages/app/src/context/global-sync/utils.ts

@@ -8,6 +8,7 @@ import type {
 import type { Agent, PermissionRequest, Project, Provider, ProviderListResponse } from "@opencode-ai/sdk/v2/client"
 import type { Project as CurrentProject } from "@opencode-ai/client/promise"
 import { NormalizedProviderListResponse } from "@opencode-ai/session-ui/context"
+import type { ProjectMeta } from "./types"
 export { pathKey as directoryKey, type PathKey as DirectoryKey } from "@/utils/path-key"
 
 export const cmp = (a: string, b: string) => (a < b ? -1 : a > b ? 1 : 0)
@@ -169,3 +170,36 @@ export function normalizeProjectInfo(project: Project | CurrentProject): Project
     vcs: project.vcs === "git" ? "git" : undefined,
   }
 }
+
+type ProjectMetaShape = {
+  name?: string
+  icon?: { color?: string; override?: string }
+  commands?: { start?: string }
+}
+
+// Merge local per-workspace overrides (name, commands, icon) from the localStorage
+// cache (childStore.projectMeta) over the base project, then apply the legacy
+// childStore.icon override. For projects with a server registration the server is the
+// source of truth, so their local projectMeta is ignored to avoid a stale local name
+// overriding the persisted one. Without this, projects without a server registration
+// would ignore their renamed name, startup command, and icon.
+export function enrichProject<T extends ProjectMetaShape>(
+  base: T,
+  local: ProjectMeta | undefined,
+  icon: string | undefined,
+  hasServerId: boolean,
+): T {
+  const merged = hasServerId ? base : mergeProjectMeta(base, local)
+  if (icon) return { ...merged, icon: { ...merged.icon, override: icon } }
+  return merged
+}
+
+export function mergeProjectMeta<T extends ProjectMetaShape>(base: T, local: ProjectMeta | undefined): T {
+  if (!local) return base
+  return {
+    ...base,
+    ...(local.name !== undefined ? { name: local.name } : {}),
+    ...(local.icon ? { icon: { ...base.icon, ...local.icon } } : {}),
+    ...(local.commands ? { commands: { ...base.commands, ...local.commands } } : {}),
+  }
+}

packages/app/src/context/global.tsx

@@ -6,6 +6,7 @@ import { pathKey } from "@/utils/path-key"
 import { useServerHealth } from "@/utils/server-health"
 import { createServerSdkContext } from "./server-sdk"
 import { createServerSyncContext } from "./server-sync"
+import { enrichProject } from "./global-sync/utils"
 import { getOwner } from "solid-js/web"
 import { QueryClient } from "@tanstack/solid-query"
 import type { ServerScope } from "@/utils/server-scope"
@@ -117,14 +118,10 @@ function createServerCtx(
       ? sync.data.project.find((x) => x.id === projectID)
       : sync.data.project.find((x) => x.worktree === project.worktree)
 
-    // 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.
+    // Preserve local per-workspace overrides (name, commands, icon) from the localStorage
+    // cache (childStore.projectMeta) and the legacy childStore.icon override.
     const base = { ...metadata, ...project }
-    if (childStore.icon) {
-      return { ...base, icon: { ...base.icon, override: childStore.icon } }
-    }
-    return base
+    return enrichProject(base, childStore.projectMeta, childStore.icon, Boolean(projectID) && projectID !== "global")
   }
 
   const projectsList = createMemo(() => projects.list().map(enrich))

packages/app/src/context/layout.tsx

@@ -8,7 +8,7 @@ import { useServerSDK } from "./server-sdk"
 import { RECENTLY_CLOSED_DISPLAY_LIMIT, ServerConnection, useServer } from "./server"
 import { usePlatform } from "./platform"
 import { Project } from "@opencode-ai/sdk/v2"
-import { normalizeProjectInfo } from "./global-sync/utils"
+import { enrichProject, normalizeProjectInfo } from "./global-sync/utils"
 import { Persist, persisted, removePersisted } from "@/utils/persist"
 import { pathKey } from "@/utils/path-key"
 import { decode64 } from "@/utils/base64"
@@ -449,14 +449,10 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
         ? serverSync().data.project.find((x) => x.id === projectID)
         : serverSync().data.project.find((x) => x.worktree === project.worktree)
 
-      // 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.
+      // Preserve local per-workspace overrides (name, commands, icon) from the localStorage
+      // cache (childStore.projectMeta) and the legacy childStore.icon override.
       const base = { ...metadata, ...project }
-      if (childStore.icon) {
-        return { ...base, icon: { ...base.icon, override: childStore.icon } }
-      }
-      return base
+      return enrichProject(base, childStore.projectMeta, childStore.icon, Boolean(projectID) && projectID !== "global")
     }
 
     const roots = createMemo(() => {