fix: resolve project name for deleted nested worktrees (#125)

## Summary

When a Claude Code session's working directory was a git worktree that
has since been deleted, project name resolution falls back to
`filepath.Base(cwd)`. For nested worktrees stored as subdirectories of a
project container (e.g.
`.superset/worktrees/agentsview/tauri-packaging/`), the base name is
just the branch name, so `trimBranchSuffix` can't recover the real
project name.

### Superset and Conductor worktree path pattern detection

Recognizes the directory layout conventions used by Superset and
Conductor worktree managers to extract project names structurally,
without needing filesystem or git metadata:

- **Superset**: `.superset/worktrees/$PROJECT/$BRANCH[/...]`
- **Conductor**: `conductor/workspaces/$PROJECT/$BRANCH[/...]`

When a cwd matches one of these patterns, the `$PROJECT` component is
extracted directly. This is the primary fix for sessions like `8e5207bb`
where the worktree at `.superset/worktrees/agentsview/tauri-packaging`
was deleted — it now resolves to `agentsview` instead of
`tauri_packaging`.

### Sibling-based git root discovery

Adds `repoRootFromSiblings` to `findGitRepoRoot`, which scans sibling
directories for linked-worktree `.git` files and follows them to
discover the true repo root. Safeguards:
- Walks up to the first existing ancestor before scanning (handles
deeply nested deleted paths)
- Only accepts linked worktrees (`.git/worktrees/`), skips submodules
(`.git/modules/`)
- Includes `.git` directory children as votes in the unanimity check
(supports same-repo layouts where a main checkout sits beside its own
worktrees)
- Bails out when candidates disagree (mixed-project containers)
- Normalizes `gitdir` paths with `filepath.Clean` for Windows
compatibility

### Sidebar fixes

- Auto-scrolls the sidebar to show the selected session when navigating
from the command palette search results
- Expands collapsed agent groups when the target session is hidden
inside one

### Stale filter data after resync

- Refreshes the "All Projects" and agent dropdowns after sync/resync
completes by calling `invalidateFilterCaches()` alongside
`sessions.load()`

Closes #33

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: wesm

frontend/src/lib/components/layout/AppHeader.svelte

@@ -286,7 +286,7 @@
     <button
       class="header-btn"
       class:syncing={sync.syncing}
-      onclick={() => sync.triggerSync(() => sessions.load())}
+      onclick={() => sync.triggerSync()}
       disabled={sync.syncing}
       title="Sync sessions (r)"
       aria-label="Sync sessions"

frontend/src/lib/components/modals/ResyncModal.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
   import { ui } from "../../stores/ui.svelte.js";
   import { sync } from "../../stores/sync.svelte.js";
-  import { sessions } from "../../stores/sessions.svelte.js";
 
   type View = "confirm" | "progress" | "done" | "error";
 
@@ -12,7 +11,6 @@
     const started = sync.triggerResync(
       () => {
         view = "done";
-        sessions.load();
       },
       (err) => {
         errorMessage = err.message;

frontend/src/lib/components/sidebar/SessionList.svelte

@@ -212,6 +212,58 @@
     });
   }
 
+  // Scroll to the active session when it changes (e.g. from
+  // the command palette). Expands collapsed agent groups and
+  // scrolls the item into view. Only fires on selection
+  // changes, not on displayItems rebuilds, so collapsing a
+  // group containing the active session stays collapsed.
+  let prevRevealedId: string | null = null;
+  $effect(() => {
+    const activeId = sessions.activeSessionId;
+    if (!activeId) {
+      prevRevealedId = null;
+      return;
+    }
+    if (activeId === prevRevealedId) return;
+    if (!containerRef) return;
+    // Read displayItems inside the effect so Svelte tracks
+    // it — needed to re-run after a group expansion.
+    const items = displayItems;
+    const item = items.find(
+      (it) =>
+        it.type === "session" &&
+        it.group?.sessions.some((s) => s.id === activeId),
+    );
+    if (!item) {
+      // Session may be hidden in a collapsed agent group.
+      // Expand it — the effect will re-run when displayItems
+      // updates, and prevRevealedId is still unset so the
+      // second pass will proceed to scroll.
+      if (!groupByAgent) return;
+      for (const section of agentSections) {
+        const owns = section.groups.some((g) =>
+          g.sessions.some((s) => s.id === activeId),
+        );
+        if (owns && collapsedAgents.has(section.agent)) {
+          toggleAgent(section.agent);
+          return;
+        }
+      }
+      return;
+    }
+    // Item found — mark as revealed so subsequent
+    // displayItems rebuilds don't re-trigger.
+    prevRevealedId = activeId;
+    const itemBottom = item.top + item.height;
+    const viewTop = containerRef.scrollTop;
+    const viewBottom = viewTop + containerRef.clientHeight;
+    if (item.top >= viewTop && itemBottom <= viewBottom) return;
+    containerRef.scrollTop = Math.max(
+      0,
+      item.top - containerRef.clientHeight / 2 + item.height / 2,
+    );
+  });
+
   onDestroy(() => {
     if (scrollRaf !== null) {
       cancelAnimationFrame(scrollRaf);

frontend/src/lib/stores/sessions.svelte.ts

@@ -646,3 +646,10 @@ export function buildSessionGroups(sessions: Session[]): SessionGroup[] {
 }
 
 export const sessions = createSessionsStore();
+
+// Refresh project/agent dropdowns whenever a sync completes
+// (local trigger or detected via status polling).
+sync.onSyncComplete(() => {
+  sessions.invalidateFilterCaches();
+  sessions.load();
+});

frontend/src/lib/stores/sync.svelte.ts

@@ -7,6 +7,8 @@ import type {
   UpdateCheck,
 } from "../api/types.js";
 
+type SyncCompleteListener = () => void;
+
 const POLL_INTERVAL_MS = 10_000;
 
 /**
@@ -49,17 +51,41 @@ class SyncStore {
   private lastStatsParams: { include_one_shot?: boolean } =
     {};
   private statsVersion = 0;
+  private syncCompleteListeners: SyncCompleteListener[] = [];
+  private statusHydrated = false;
+  private pendingHydration = false;
+
+  /** Register a callback invoked after any sync completes. */
+  onSyncComplete(listener: SyncCompleteListener) {
+    this.syncCompleteListeners.push(listener);
+  }
+
+  private notifySyncComplete() {
+    for (const fn of this.syncCompleteListeners) {
+      fn();
+    }
+  }
 
   async loadStatus() {
     try {
       const status = await api.getSyncStatus();
       const newLastSync = status.last_sync || null;
+      const isInitial = !this.statusHydrated;
+      this.statusHydrated = true;
       const changed =
         newLastSync !== null && newLastSync !== this.lastSync;
       this.lastSync = newLastSync;
       this.lastSyncStats = status.stats;
-      if (changed) this.loadStats();
+      // Suppress notifications on initial hydration and
+      // when a local sync just completed (pendingHydration).
+      if (this.pendingHydration) {
+        this.pendingHydration = false;
+      } else if (changed && !isInitial) {
+        this.loadStats();
+        this.notifySyncComplete();
+      }
     } catch (error) {
+      this.pendingHydration = false;
       console.warn("Failed to load sync status:", error);
     }
   }
@@ -163,9 +189,14 @@ class SyncStore {
     handle.done
       .then((s: SyncStats) => {
         this.lastSyncStats = s;
-        this.lastSync = new Date().toISOString();
         this.loadStats();
         finalizeSync();
+        this.notifySyncComplete();
+        // Hydrate the authoritative server timestamp.
+        // pendingHydration suppresses the notification so
+        // the poll path won't double-fire.
+        this.pendingHydration = true;
+        this.loadStatus();
         onComplete?.();
       })
       .catch((err: unknown) => {

frontend/src/lib/utils/keyboard.ts

@@ -87,7 +87,7 @@ export function registerShortcuts(
       },
       o: () => ui.toggleSort(),
       l: () => ui.cycleLayout(),
-      r: () => sync.triggerSync(() => sessions.load()),
+      r: () => sync.triggerSync(),
       e: () => {
         if (sessions.activeSessionId) {
           window.open(

internal/parser/discovery.go

@@ -1008,7 +1008,6 @@ func isContainedIn(child, root string) bool {
 		!strings.HasPrefix(rel, ".."+string(filepath.Separator))
 }
 
-
 // DiscoverVSCodeCopilotSessions traverses the VSCode
 // workspaceStorage directory to find chatSessions/*.json
 // and *.jsonl files. When both formats exist for the same

internal/parser/iflow.go

@@ -451,4 +451,4 @@ func isIflowSystemMessage(content string) bool {
 		}
 	}
 	return false
-}
+}

internal/parser/iflow_parser_test.go

@@ -9,16 +9,16 @@ import (
 
 func TestParseIflowSession(t *testing.T) {
 	tests := []struct {
-		name            string
-		filename        string
-		expectID        string
+		name               string
+		filename           string
+		expectID           string
 		expectMessageCount int
 		expectFirstMessage string
 	}{
 		{
-			name:            "basic iFlow session",
-			filename:        "testdata/iflow/session-5de701fc-7454-4858-a249-95cac4fd3b51.jsonl",
-			expectID:        "iflow:5de701fc-7454-4858-a249-95cac4fd3b51",
+			name:               "basic iFlow session",
+			filename:           "testdata/iflow/session-5de701fc-7454-4858-a249-95cac4fd3b51.jsonl",
+			expectID:           "iflow:5de701fc-7454-4858-a249-95cac4fd3b51",
 			expectMessageCount: 11,
 			expectFirstMessage: "启动app时确保环境变量 DOCKER_API_VERSION=\"1.46\"",
 		},
@@ -437,4 +437,4 @@ func TestIflowSessionIDExtraction(t *testing.T) {
 			}
 		})
 	}
-}
+}