fix(ui): preserve Windows catalog root kinds

ooiuuii · ooiuuii · commit 87c1791be818 · 2026-07-21T15:02:37.000+08:00
diff --git a/ui/src/lib/sessions/catalog-project-grouping.test.ts b/ui/src/lib/sessions/catalog-project-grouping.test.ts
@@ -76,6 +76,23 @@ describe("groupCatalogSessionsByProject", () => {
     expect(result.ungrouped.map((item) => item.threadId)).toEqual(["missing", "blank"]);
   });
 
+  it("leaves Windows filesystem roots and root worktrees ungrouped", () => {
+    const result = groupCatalogSessionsByProject([
+      session("drive-root", "C:\\"),
+      session("drive-root-worktree", "c:\\.CLAUDE\\WORKTREES\\fix-1\\src"),
+      session("current-drive-root", "\\"),
+      session("current-drive-root-worktree", "\\.claude\\worktrees\\fix-2\\src"),
+    ]);
+
+    expect(result.groups).toHaveLength(0);
+    expect(result.ungrouped.map((item) => item.threadId)).toEqual([
+      "drive-root",
+      "drive-root-worktree",
+      "current-drive-root",
+      "current-drive-root-worktree",
+    ]);
+  });
+
   it.each([
     [" /Users/dev/openclaw/// ", "/Users/dev/openclaw", "openclaw"],
     ["C:\\Users\\dev\\openclaw\\", "C:\\Users\\dev\\openclaw", "openclaw"],
@@ -109,6 +126,34 @@ describe("groupCatalogSessionsByProject", () => {
     ]);
   });
 
+  it("preserves Windows root kinds while grouping equivalent UNC paths", () => {
+    const result = groupCatalogSessionsByProject([
+      session("unc-first", "\\\\Server\\Share\\Project"),
+      session("unc-second", "\\\\server\\share\\project"),
+      session("current-drive-rooted", "\\Server\\Share\\Project"),
+    ]);
+
+    expect(result.groups).toHaveLength(2);
+    expect(result.groups[0]?.sessions.map((item) => item.threadId)).toEqual([
+      "unc-first",
+      "unc-second",
+    ]);
+    expect(result.groups[1]?.sessions.map((item) => item.threadId)).toEqual([
+      "current-drive-rooted",
+    ]);
+  });
+
+  it("keeps an UNC share root groupable as a project root", () => {
+    const result = groupCatalogSessionsByProject([
+      session("first", "\\\\Server\\Share\\"),
+      session("second", "\\\\server\\share"),
+    ]);
+
+    expect(result.groups).toHaveLength(1);
+    expect(result.groups[0]?.sessions.map((item) => item.threadId)).toEqual(["first", "second"]);
+    expect(result.ungrouped).toHaveLength(0);
+  });
+
   it("folds case-varied Windows worktree paths into their origin project", () => {
     const result = groupCatalogSessionsByProject([
       session("direct", "C:\\Work\\OpenClaw"),
diff --git a/ui/src/lib/sessions/catalog-project-grouping.ts b/ui/src/lib/sessions/catalog-project-grouping.ts
@@ -13,15 +13,31 @@ type CatalogProjectGroup = {
   sessions: SessionCatalogSession[];
 };
 
+type WindowsPathRootKind = "drive" | "unc" | "rooted";
+
+function windowsPathRootKind(value: string): WindowsPathRootKind | undefined {
+  if (/^[A-Za-z]:[\\/]/.test(value)) {
+    return "drive";
+  }
+  if (value.startsWith("\\\\")) {
+    return "unc";
+  }
+  if (value.startsWith("\\")) {
+    return "rooted";
+  }
+  return undefined;
+}
+
 function isWindowsPath(value: string): boolean {
-  return /^[A-Za-z]:[\\/]/.test(value) || value.startsWith("\\");
+  return windowsPathRootKind(value) !== undefined;
 }
 
 function catalogProjectPathIdentity(value: string): string {
-  if (!isWindowsPath(value)) {
+  const rootKind = windowsPathRootKind(value);
+  if (!rootKind) {
     return value;
   }
-  return `windows:${value
+  return `windows:${rootKind}:${value
     .split(/[\\/]+/)
     .filter(Boolean)
     .map((segment) => segment.toLowerCase())
@@ -58,10 +74,11 @@ export function groupCatalogSessionsByProject(sessions: readonly SessionCatalogS
       group.sessions.push(session);
       continue;
     }
-    // Accepted tradeoff: filesystem-root cwds ("/", "C:\") are not real harness
-    // session roots; after trimming they fall to the ungrouped flat tail by design.
+    // Accepted tradeoff: local filesystem-root cwds ("/", "C:\") are not real
+    // harness session roots, so they fall to the ungrouped flat tail. UNC share
+    // roots remain groupable because the share itself can be a project root.
     let projectPath = session.cwd?.trim().replace(/[\\/]+$/, "");
-    if (!projectPath) {
+    if (!projectPath || /^[A-Za-z]:$/.test(projectPath)) {
       ungrouped.push(session);
       continue;
     }
@@ -72,7 +89,7 @@ export function groupCatalogSessionsByProject(sessions: readonly SessionCatalogS
       : /^(.*?)[\\/]\.claude[\\/]worktrees[\\/][^\\/]/;
     const worktreeMatch = projectPath.match(worktreePattern);
     projectPath = worktreeMatch?.[1] ?? projectPath;
-    if (!projectPath) {
+    if (!projectPath || /^[A-Za-z]:$/.test(projectPath)) {
       ungrouped.push(session);
       continue;
     }
