Merge branch 'cv-main-xx1jlt'

src/components/layout/aux-panel-file-tree-tab.tsx

@@ -13,6 +13,7 @@ import { revealItemInDir } from "@tauri-apps/plugin-opener"
 import ignore from "ignore"
 import { Check, ChevronRight } from "lucide-react"
 import { useTranslations } from "next-intl"
+import { toErrorMessage } from "@/lib/app-error"
 import { toast } from "sonner"
 import { useFolderContext } from "@/contexts/folder-context"
 import { useAuxPanelContext } from "@/contexts/aux-panel-context"
@@ -947,7 +948,7 @@ export function FileTreeTab() {
           setGitStatusByPath(new Map())
         }
       } catch (e) {
-        setError(e instanceof Error ? e.message : String(e))
+        setError(toErrorMessage(e))
       } finally {
         if (!silent && !loadingReleased) setLoading(false)
       }

src/components/layout/aux-panel-git-log-tab.tsx

@@ -83,6 +83,7 @@ import {
 } from "@/lib/tauri"
 import type { GitBranchList, GitLogEntry, GitLogFileChange } from "@/lib/types"
 import { toast } from "sonner"
+import { toErrorMessage } from "@/lib/app-error"
 
 function formatRelativeTime(
   dateStr: string,
@@ -684,7 +685,7 @@ export function GitLogTab() {
       } catch (e) {
         setBranchesError((prev) => ({
           ...prev,
-          [fullHash]: e instanceof Error ? e.message : String(e),
+          [fullHash]: toErrorMessage(e),
         }))
       } finally {
         setBranchesLoading((prev) => ({ ...prev, [fullHash]: false }))
@@ -727,7 +728,7 @@ export function GitLogTab() {
           )
         }
       } catch (e) {
-        setError(e instanceof Error ? e.message : String(e))
+        setError(toErrorMessage(e))
       } finally {
         if (inline) {
           setRefreshing(false)

src/contexts/folder-context.tsx

@@ -10,6 +10,7 @@ import {
   useRef,
   type ReactNode,
 } from "react"
+import { toErrorMessage } from "@/lib/app-error"
 import { getFolder, listFolderConversations } from "@/lib/tauri"
 import type {
   AgentType,
@@ -174,7 +175,7 @@ export function FolderProvider({
     } catch (e) {
       if (!mountedRef.current) return
       if (!cached) {
-        setError(e instanceof Error ? e.message : String(e))
+        setError(toErrorMessage(e))
       }
     } finally {
       if (mountedRef.current) {