feat: restore repository filesystem watcher (RURU-58)

apps/desktop/src-tauri/src/lib.rs

@@ -2,6 +2,7 @@ use git::AppState;
 use ipc::{
     self,
     repo_manager::{RepoManager, STORE_FILE},
+    repository_watcher::RepoContextRuntime,
     session_manager::SessionManager,
 };
 use log::LevelFilter;
@@ -37,6 +38,7 @@ pub fn run() {
         .manage(AppState {
             services: RwLock::new(HashMap::new()),
         })
+        .manage(RepoContextRuntime::default())
         .manage(Arc::new(SessionManager::new()));
 
     #[cfg(target_os = "macos")]
@@ -63,6 +65,8 @@ pub fn run() {
             ipc::commands::init_repository,
             ipc::commands::create_repo_context,
             ipc::commands::dispose_repo_context,
+            ipc::commands::dispose_repo_context_owner,
+            ipc::commands::invalidate_repo_context_caches,
             ipc::commands::open_with_app,
             ipc::repo_manager::list_repositories,
             ipc::repo_manager::add_repository,

apps/desktop/src/bootstrap/app-root.tsx

@@ -30,6 +30,7 @@ import {
   isEmbeddedRuntime,
   isGitRoutePath,
   normalizeWorkspaceRoutePath,
+  resolveRepositoryContextScope,
   SNAPSHOT_EMIT_DEBOUNCE_MS,
   sanitizeTabWebviewLabel,
   stripEmbeddedQueryFromRoutePath,
@@ -496,10 +497,16 @@ const AppRouter = () => {
     };
   }, [syncTabMetadata]);
 
-  const tabScopeId =
-    embeddedRuntime && embeddedTabId
-      ? embeddedTabId
-      : (activeRuntimeId ?? activeTabId ?? "tab-main");
+  const tabScopeId = resolveRepositoryContextScope(
+    embeddedRuntime,
+    embeddedTabId,
+    activeRuntimeId,
+    activeTabId,
+  );
+
+  if (!tabScopeId) {
+    return <RouterProvider router={router} />;
+  }
 
   return (
     <TabContextProvider scopeId={tabScopeId}>

apps/desktop/src/bootstrap/query-bridge.ts

@@ -1,5 +1,7 @@
+import { initializeRepositoryChangeBridge } from "../state/core/repository-change-bridge";
 import { initializeQueryFocusBridge } from "../state/core/state-manager";
 
 export function initializeQueryBridge() {
   initializeQueryFocusBridge();
+  initializeRepositoryChangeBridge();
 }

apps/desktop/src/bootstrap/runtime-utils.ts

@@ -45,6 +45,19 @@ export const isEmbeddedRuntime = () => {
 
 export const isDesktopHostRuntime = () => !isEmbeddedRuntime();
 
+export const resolveRepositoryContextScope = (
+  embeddedRuntime: boolean,
+  embeddedTabId: string | null,
+  activeRuntimeId: string | null,
+  activeTabId: string | null,
+) => {
+  if (!embeddedRuntime) {
+    return null;
+  }
+
+  return embeddedTabId ?? activeRuntimeId ?? activeTabId ?? "tab-main";
+};
+
 export type TabRuntimeStatePayload = {
   tabId: string;
   routePath?: string;

apps/desktop/src/components/webview-tab-host.tsx

@@ -1,7 +1,13 @@
+import { disposeRepoContextOwner } from "@gitru/commands";
 import { LogicalPosition, LogicalSize } from "@tauri-apps/api/dpi";
 import { Webview } from "@tauri-apps/api/webview";
 import { getCurrentWindow } from "@tauri-apps/api/window";
 import { useEffect, useMemo, useRef, useState } from "react";
+import {
+  sanitizeTabWebviewLabel,
+  TAB_WEBVIEW_LABEL_PREFIX,
+} from "@/bootstrap/runtime-utils";
+import { createRepoContextOwnerId } from "@/state/core/repo-context-registry";
 import { useAppStore } from "@/store/use-app-store";
 import type { WorkspaceTab } from "@/types/store";
 
@@ -14,12 +20,12 @@ type HostBounds = {
 
 type ManagedWebview = {
   tabId: string;
+  ownerId: string;
   webview: Webview;
   ready: Promise<void>;
   bounds: HostBounds;
 };
 
-const WEBVIEW_LABEL_PREFIX = "tab-webview:";
 const CREATE_TIMEOUT_MS = 1200;
 
 const managedWebviews = new Map<string, ManagedWebview>();
@@ -29,9 +35,6 @@ let visibleTabId: string | null = null;
 let liveTabIds = new Set<string>();
 let pendingCleanupTimer: number | null = null;
 
-const sanitizeWebviewLabel = (tabId: string) =>
-  `${WEBVIEW_LABEL_PREFIX}${tabId.replace(/[^a-zA-Z0-9\-/:_]/g, "_")}`;
-
 const getRoutePathname = (routePath: string) => {
   try {
     return new URL(routePath, window.location.origin).pathname;
@@ -79,7 +82,13 @@ const updateManagedBounds = async (
 };
 
 const closeManagedWebview = async (entry: ManagedWebview) => {
-  await Promise.allSettled([entry.webview.close()]);
+  try {
+    await entry.webview.close();
+  } finally {
+    await Promise.allSettled([
+      disposeRepoContextOwner({ ownerId: entry.ownerId }),
+    ]);
+  }
 };
 
 const hideUnlessActive = async (entry: ManagedWebview) => {
@@ -103,12 +112,15 @@ const ensureTabWebview = async (
 
   const task = (async (): Promise<ManagedWebview | null> => {
     const normalized = normalizeBounds(bounds);
-    const label = sanitizeWebviewLabel(tab.id);
+    const label = sanitizeTabWebviewLabel(tab.id);
+    const childScopeId = label.slice(TAB_WEBVIEW_LABEL_PREFIX.length);
+    const ownerId = createRepoContextOwnerId(label, childScopeId);
     const existingByLabel = await Webview.getByLabel(label);
 
     if (existingByLabel) {
       const reused: ManagedWebview = {
         tabId: tab.id,
+        ownerId,
         webview: existingByLabel,
         ready: Promise.resolve(),
         // Force one geometry sync because the native view can outlive a host
@@ -168,6 +180,7 @@ const ensureTabWebview = async (
       void webview.once("tauri://created", () => {
         void hideUnlessActive({
           tabId: tab.id,
+          ownerId,
           webview,
           ready: Promise.resolve(),
           bounds: normalized,
@@ -184,6 +197,7 @@ const ensureTabWebview = async (
 
     const created: ManagedWebview = {
       tabId: tab.id,
+      ownerId,
       webview,
       ready,
       bounds: normalized,
@@ -196,6 +210,7 @@ const ensureTabWebview = async (
       if (recovered) {
         const entry: ManagedWebview = {
           tabId: tab.id,
+          ownerId,
           webview: recovered,
           ready: Promise.resolve(),
           bounds: normalized,
@@ -299,7 +314,7 @@ const cleanupAllWebviews = async () => {
   ensureInFlightByTabId.clear();
   const entries = Array.from(managedWebviews.values());
   managedWebviews.clear();
-  await Promise.all(entries.map(closeManagedWebview));
+  await Promise.all(entries.map((entry) => closeManagedWebview(entry)));
 };
 
 const readHostBounds = (element: HTMLDivElement | null): HostBounds | null => {

apps/desktop/src/context/tab-context-provider.tsx

@@ -1,3 +1,4 @@
+import { getCurrentWebview } from "@tauri-apps/api/webview";
 import {
   createContext,
   type PropsWithChildren,
@@ -6,7 +7,10 @@ import {
   useMemo,
   useState,
 } from "react";
-import { repoContextRegistry } from "@/state/core/repo-context-registry";
+import {
+  createRepoContextOwnerId,
+  repoContextRegistry,
+} from "@/state/core/repo-context-registry";
 import { useAppStore } from "@/store/use-app-store";
 
 type TabContextValue = {
@@ -31,6 +35,17 @@ export function TabContextProvider({
   children,
   scopeId = "main",
 }: TabContextProviderProps) {
+  const ownerId = useMemo(() => {
+    let webviewLabel = "browser";
+
+    try {
+      webviewLabel = getCurrentWebview().label;
+    } catch {
+      // Plain browser runtimes do not expose a native webview label.
+    }
+
+    return createRepoContextOwnerId(webviewLabel, scopeId);
+  }, [scopeId]);
   const activeSessionRepositoryId = useAppStore((state) => {
     const runtimeId = state.activeSessionId ?? state.activeTabId;
     if (!runtimeId) {
@@ -72,7 +87,7 @@ export function TabContextProvider({
       setIsInitializing(true);
 
       try {
-        await repoContextRegistry.ensureScopeContext(scopeId, repoId);
+        await repoContextRegistry.ensureScopeContext(scopeId, repoId, ownerId);
       } finally {
         if (!cancelled) {
           setIsInitializing(false);
@@ -85,7 +100,7 @@ export function TabContextProvider({
     return () => {
       cancelled = true;
     };
-  }, [scopeId, activeSessionRepositoryId]);
+  }, [scopeId, ownerId, activeSessionRepositoryId]);
 
   useEffect(() => {
     return () => {