@yancyyu/openhermit 1.5.8 → 1.5.9

package/src/renderer/components/sidebar/SidebarSessions.tsx

@@ -13,7 +13,17 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { api } from '@renderer/api';
 import { useStore } from '@renderer/store';
 import { formatDistanceToNowStrict } from 'date-fns';
-import { AlertCircle, ChevronDown, ChevronRight, Loader2, MessageSquare, Radio, RefreshCw, Search, X } from 'lucide-react';
+import {
+  AlertCircle,
+  ChevronDown,
+  ChevronRight,
+  Loader2,
+  MessageSquare,
+  Radio,
+  RefreshCw,
+  Search,
+  X,
+} from 'lucide-react';
 
 import type { CcSession, CcSessionDetail, TeamSummary } from '@shared/types';
 
@@ -55,50 +65,53 @@ export const SidebarSessions = (): React.JSX.Element => {
   // 优先使用当前激活的团队 Tab，避免 selectedTeamName 在多标签下滞后导致串团队。
   const scopedTeamName = activeTeamTabName ?? selectedTeamName ?? null;
 
-  const fetchAll = useCallback(async (opts: { silent?: boolean } = {}) => {
-    if (refreshInFlightRef.current) return;
-    const { silent = false } = opts;
-    refreshInFlightRef.current = true;
-    if (!silent) {
-      setLoading(true);
-    }
-    setError(null);
-    try {
-      const teamList = await api.teams.list();
-      const scopedTeams: TeamSummary[] = scopedTeamName
-        ? teamList.filter((team) => team.teamName === scopedTeamName)
-        : teamList;
-
-      const results = await Promise.allSettled(
-        scopedTeams.map(async (t) => {
-          try {
-            const sessions = await api.teams.getTeamSessions(t.teamName);
-            return sessions.map((s) => ({
-              ...s,
-              teamName: t.teamName,
-              teamDisplayName: t.displayName || t.teamName,
-            }));
-          } catch {
-            return [] as TaggedSession[];
-          }
-        })
-      );
-
-      const merged: TaggedSession[] = [];
-      for (const r of results) {
-        if (r.status === 'fulfilled') merged.push(...r.value);
-      }
-      setAllSessions(merged);
-      setExpandedId((prev) => (prev && merged.some((s) => s.id === prev) ? prev : null));
-    } catch (err) {
-      setError(err instanceof Error ? err.message : '加载失败');
-    } finally {
-      refreshInFlightRef.current = false;
+  const fetchAll = useCallback(
+    async (opts: { silent?: boolean } = {}) => {
+      if (refreshInFlightRef.current) return;
+      const { silent = false } = opts;
+      refreshInFlightRef.current = true;
       if (!silent) {
-        setLoading(false);
+        setLoading(true);
       }
-    }
-  }, [scopedTeamName]);
+      setError(null);
+      try {
+        const teamList = await api.teams.list();
+        const scopedTeams: TeamSummary[] = scopedTeamName
+          ? teamList.filter((team) => team.teamName === scopedTeamName)
+          : teamList;
+
+        const results = await Promise.allSettled(
+          scopedTeams.map(async (t) => {
+            try {
+              const sessions = await api.teams.getTeamSessions(t.teamName);
+              return sessions.map((s) => ({
+                ...s,
+                teamName: t.teamName,
+                teamDisplayName: t.displayName || t.teamName,
+              }));
+            } catch {
+              return [] as TaggedSession[];
+            }
+          })
+        );
+
+        const merged: TaggedSession[] = [];
+        for (const r of results) {
+          if (r.status === 'fulfilled') merged.push(...r.value);
+        }
+        setAllSessions(merged);
+        setExpandedId((prev) => (prev && merged.some((s) => s.id === prev) ? prev : null));
+      } catch (err) {
+        setError(err instanceof Error ? err.message : '加载失败');
+      } finally {
+        refreshInFlightRef.current = false;
+        if (!silent) {
+          setLoading(false);
+        }
+      }
+    },
+    [scopedTeamName]
+  );
 
   useEffect(() => {
     void fetchAll();
@@ -151,12 +164,9 @@ export const SidebarSessions = (): React.JSX.Element => {
     [expandedId]
   );
 
-  const handleExpand = useCallback(
-    (teamName: string, sessionId: string) => {
-      setExpandedId((prev) => (prev === sessionId ? null : sessionId));
-    },
-    []
-  );
+  const handleExpand = useCallback((teamName: string, sessionId: string) => {
+    setExpandedId((prev) => (prev === sessionId ? null : sessionId));
+  }, []);
 
   // Filter + sort
   const filtered = allSessions.filter((s) => {
@@ -360,7 +370,9 @@ const SessionRow = ({
         }
       }
     })();
-    return () => { cancelled = true; };
+    return () => {
+      cancelled = true;
+    };
   }, [historyLimit, isExpanded, session.teamName, session.id]);
 
   const handleLoadMoreHistory = useCallback(() => {
@@ -390,7 +402,7 @@ const SessionRow = ({
         {/* Status */}
         <div className="mt-0.5 shrink-0">
           {session.live ? (
-            <Radio size={12} className="text-emerald-400 animate-pulse" />
+            <Radio size={12} className="animate-pulse text-emerald-400" />
           ) : (
             <MessageSquare size={12} className="text-[var(--color-text-muted)] opacity-50" />
           )}
@@ -414,7 +426,13 @@ const SessionRow = ({
 
           {session.lastMessage?.content && (
             <p className="mt-1 truncate text-[10px] text-[var(--color-text-muted)]">
-              <span className={session.lastMessage.role === 'user' ? 'text-blue-400' : 'text-[var(--color-text-muted)]'}>
+              <span
+                className={
+                  session.lastMessage.role === 'user'
+                    ? 'text-blue-400'
+                    : 'text-[var(--color-text-muted)]'
+                }
+              >
                 {session.lastMessage.role === 'user' ? '用户' : 'Agent'}：
               </span>
               {session.lastMessage.content.slice(0, 80)}
@@ -427,7 +445,7 @@ const SessionRow = ({
         {session.live && (
           <button
             type="button"
-            className="absolute right-2 top-2 shrink-0 rounded p-1 opacity-0 transition-opacity group-hover:opacity-100 hover:bg-red-500/10 hover:text-red-400 disabled:opacity-50"
+            className="absolute right-2 top-2 shrink-0 rounded p-1 opacity-0 transition-opacity hover:bg-red-500/10 hover:text-red-400 disabled:opacity-50 group-hover:opacity-100"
             onClick={(e) => {
               e.stopPropagation();
               onCancel(session.teamName, session.id);
@@ -442,12 +460,15 @@ const SessionRow = ({
 
       {/* Inline expanded messages */}
       {isExpanded && (
-        <div className="border-l-2 border-[var(--color-border)] ml-5">
+        <div className="ml-5 border-l-2 border-[var(--color-border)]">
           {loadingDetail && !detail && (
             <div className="px-3 py-3">
               <div className="space-y-2">
                 {[1, 2, 3].map((i) => (
-                  <div key={i} className="h-3 animate-pulse rounded bg-[var(--color-surface-raised)]" />
+                  <div
+                    key={i}
+                    className="h-3 animate-pulse rounded bg-[var(--color-surface-raised)]"
+                  />
                 ))}
               </div>
             </div>
@@ -458,13 +479,15 @@ const SessionRow = ({
                 <div className="px-3 py-3 text-xs text-[var(--color-text-muted)]">暂无消息</div>
               ) : (
                 <>
-                  <div className="max-h-64 overflow-y-auto divide-y divide-[var(--color-border)]/50">
-                  {[...detail.history].reverse().map((msg, i) => (
+                  <div className="divide-[var(--color-border)]/50 max-h-64 divide-y overflow-y-auto">
+                    {[...detail.history].reverse().map((msg, i) => (
                       <div key={i} className="px-3 py-2 text-[11px]">
                         <div className="flex items-center gap-2">
                           <span
                             className={`shrink-0 text-[10px] font-medium ${
-                              msg.role === 'user' ? 'text-blue-400' : 'text-[var(--color-text-muted)]'
+                              msg.role === 'user'
+                                ? 'text-blue-400'
+                                : 'text-[var(--color-text-muted)]'
                             }`}
                           >
                             {msg.role === 'user' ? '用户' : 'Agent'}
@@ -481,7 +504,7 @@ const SessionRow = ({
                     ))}
                   </div>
                   {hasMoreHistory && (
-                    <div className="border-t border-[var(--color-border)]/50 px-3 py-2">
+                    <div className="border-[var(--color-border)]/50 border-t px-3 py-2">
                       <button
                         type="button"
                         className="inline-flex items-center gap-1 text-xs text-[var(--color-text-muted)] transition-colors hover:text-[var(--color-text)] disabled:cursor-not-allowed disabled:opacity-50"
@@ -494,7 +517,10 @@ const SessionRow = ({
                             正在加载更早消息...
                           </>
                         ) : (
-                          <>加载更早消息 ({Math.max(detail.historyCount - detail.history.length, 0)} 条)</>
+                          <>
+                            加载更早消息 ({Math.max(detail.historyCount - detail.history.length, 0)}{' '}
+                            条)
+                          </>
                         )}
                       </button>
                     </div>
@@ -513,13 +539,20 @@ function formatShortTime(date: Date): string {
   try {
     const distance = formatDistanceToNowStrict(date, { addSuffix: false });
     return distance
-      .replace(' seconds', 's').replace(' second', 's')
-      .replace(' minutes', 'm').replace(' minute', 'm')
-      .replace(' hours', 'h').replace(' hour', 'h')
-      .replace(' days', 'd').replace(' day', 'd')
-      .replace(' weeks', 'w').replace(' week', 'w')
-      .replace(' months', 'mo').replace(' month', 'mo')
-      .replace(' years', 'y').replace(' year', 'y');
+      .replace(' seconds', 's')
+      .replace(' second', 's')
+      .replace(' minutes', 'm')
+      .replace(' minute', 'm')
+      .replace(' hours', 'h')
+      .replace(' hour', 'h')
+      .replace(' days', 'd')
+      .replace(' day', 'd')
+      .replace(' weeks', 'w')
+      .replace(' week', 'w')
+      .replace(' months', 'mo')
+      .replace(' month', 'mo')
+      .replace(' years', 'y')
+      .replace(' year', 'y');
   } catch {
     return '';
   }

package/src/renderer/components/sidebar/WorkspaceBrowser.tsx

@@ -3,14 +3,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { api } from '@renderer/api';
 import { FileIcon } from '@renderer/components/team/editor/FileIcon';
 import { useStore } from '@renderer/store';
-import {
-  Folder,
-  FolderOpen,
-  ChevronRight,
-  ChevronDown,
-  ArrowUp,
-  HardDrive,
-} from 'lucide-react';
+import { Folder, FolderOpen, ChevronRight, ChevronDown, ArrowUp, HardDrive } from 'lucide-react';
 import { useShallow } from 'zustand/react/shallow';
 
 import type { WorkspaceFileEntry, WorkspaceListResponse } from '@shared/types/editor';
@@ -55,9 +48,8 @@ interface TeamWorkspaceProps {
 
 function joinWorkspacePath(basePath: string, entryName: string): string {
   const separator = basePath.includes('\\') && !basePath.includes('/') ? '\\' : '/';
-  const normalizedBase = basePath.endsWith('/') || basePath.endsWith('\\')
-    ? basePath.slice(0, -1)
-    : basePath;
+  const normalizedBase =
+    basePath.endsWith('/') || basePath.endsWith('\\') ? basePath.slice(0, -1) : basePath;
   return `${normalizedBase}${separator}${entryName}`;
 }
 
@@ -73,28 +65,25 @@ const TeamWorkspace = ({
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
-  const loadDir = useCallback(
-    async (dirPath: string) => {
-      setLoading(true);
-      setError(null);
-      try {
-        const res: WorkspaceListResponse = await api.workspace.list(dirPath);
-        if (res.error) {
-          setError(res.error);
-          setEntries([]);
-        } else {
-          setEntries(res.files);
-          setCurrentDir(res.path);
-        }
-      } catch (err) {
-        setError(err instanceof Error ? err.message : '加载失败');
+  const loadDir = useCallback(async (dirPath: string) => {
+    setLoading(true);
+    setError(null);
+    try {
+      const res: WorkspaceListResponse = await api.workspace.list(dirPath);
+      if (res.error) {
+        setError(res.error);
         setEntries([]);
-      } finally {
-        setLoading(false);
+      } else {
+        setEntries(res.files);
+        setCurrentDir(res.path);
       }
-    },
-    []
-  );
+    } catch (err) {
+      setError(err instanceof Error ? err.message : '加载失败');
+      setEntries([]);
+    } finally {
+      setLoading(false);
+    }
+  }, []);
 
   // Load root when expanded
   useEffect(() => {
@@ -179,10 +168,7 @@ const TeamWorkspace = ({
               {breadcrumb.map((crumb, i) => (
                 <span key={crumb.path} className="flex items-center gap-0.5">
                   {i > 0 && (
-                    <ChevronRight
-                      size={10}
-                      className="text-[var(--color-text-muted)] opacity-50"
-                    />
+                    <ChevronRight size={10} className="text-[var(--color-text-muted)] opacity-50" />
                   )}
                   <button
                     type="button"
@@ -233,24 +219,21 @@ const TeamWorkspace = ({
                   type="button"
                   className={`flex w-full items-center gap-2 px-3 py-1.5 text-left text-xs transition-colors ${
                     entry.isDirectory
-                      ? 'hover:bg-[var(--color-surface-raised)] cursor-pointer'
+                      ? 'cursor-pointer hover:bg-[var(--color-surface-raised)]'
                       : onFileClick
-                        ? 'hover:bg-[var(--color-surface-raised)] cursor-pointer'
-                        : 'cursor-default hover:bg-[var(--color-surface-raised)]/50'
+                        ? 'cursor-pointer hover:bg-[var(--color-surface-raised)]'
+                        : 'hover:bg-[var(--color-surface-raised)]/50 cursor-default'
                   }`}
                   onClick={() => handleEntryClick(entry)}
                 >
                   {entry.isDirectory ? (
-                    <FolderOpen
-                      size={14}
-                      className="shrink-0 text-[var(--color-text-muted)]"
-                    />
+                    <FolderOpen size={14} className="shrink-0 text-[var(--color-text-muted)]" />
                   ) : (
                     <FileIcon fileName={entry.name} className="size-3.5 shrink-0" />
                   )}
                   <span className="min-w-0 flex-1 truncate">{entry.name}</span>
                   {!entry.isDirectory && entry.size > 0 && (
-                    <span className="shrink-0 text-[10px] text-[var(--color-text-muted)] tabular-nums">
+                    <span className="shrink-0 text-[10px] tabular-nums text-[var(--color-text-muted)]">
                       {formatSize(entry.size)}
                     </span>
                   )}

package/src/renderer/components/team/CcSessionsSection.tsx

@@ -11,7 +11,16 @@
 
 import { useState } from 'react';
 import { formatDistanceToNowStrict } from 'date-fns';
-import { AlertCircle, Loader2, MessageSquare, Monitor, Radio, Wifi, WifiOff, X } from 'lucide-react';
+import {
+  AlertCircle,
+  Loader2,
+  MessageSquare,
+  Monitor,
+  Radio,
+  Wifi,
+  WifiOff,
+  X,
+} from 'lucide-react';
 
 import type { CcSession } from '@shared/types';
 
@@ -129,7 +138,7 @@ function CcSessionRow({
       {/* 状态指示 */}
       <div className="mt-0.5 shrink-0">
         {session.live ? (
-          <Radio size={12} className="text-emerald-400 animate-pulse" />
+          <Radio size={12} className="animate-pulse text-emerald-400" />
         ) : session.active ? (
           <Wifi size={12} className="text-blue-400" />
         ) : (
@@ -154,14 +163,18 @@ function CcSessionRow({
             {session.historyCount}
           </span>
           <span className="tabular-nums">{timeAgo}</span>
-          {session.live && (
-            <span className="text-emerald-500 dark:text-emerald-400">进行中</span>
-          )}
+          {session.live && <span className="text-emerald-500 dark:text-emerald-400">进行中</span>}
         </div>
 
         {session.lastMessage && (
           <p className="mt-1 truncate text-[10px] text-[var(--color-text-muted)]">
-            <span className={session.lastMessage.role === 'user' ? 'text-blue-400' : 'text-[var(--color-text-muted)]'}>
+            <span
+              className={
+                session.lastMessage.role === 'user'
+                  ? 'text-blue-400'
+                  : 'text-[var(--color-text-muted)]'
+              }
+            >
               {session.lastMessage.role === 'user' ? '用户' : 'Agent'}：
             </span>
             {session.lastMessage.content.slice(0, 80)}
@@ -174,7 +187,7 @@ function CcSessionRow({
       {session.live && onCancel && (
         <button
           type="button"
-          className="absolute right-2 top-2 shrink-0 rounded p-1 opacity-0 transition-opacity group-hover:opacity-100 hover:bg-red-500/10 hover:text-red-400"
+          className="absolute right-2 top-2 shrink-0 rounded p-1 opacity-0 transition-opacity hover:bg-red-500/10 hover:text-red-400 group-hover:opacity-100"
           onClick={() => onCancel(session.id)}
           title="终止会话"
         >
@@ -189,13 +202,20 @@ function formatShortTime(date: Date): string {
   try {
     const distance = formatDistanceToNowStrict(date, { addSuffix: false });
     return distance
-      .replace(' seconds', 's').replace(' second', 's')
-      .replace(' minutes', 'm').replace(' minute', 'm')
-      .replace(' hours', 'h').replace(' hour', 'h')
-      .replace(' days', 'd').replace(' day', 'd')
-      .replace(' weeks', 'w').replace(' week', 'w')
-      .replace(' months', 'mo').replace(' month', 'mo')
-      .replace(' years', 'y').replace(' year', 'y');
+      .replace(' seconds', 's')
+      .replace(' second', 's')
+      .replace(' minutes', 'm')
+      .replace(' minute', 'm')
+      .replace(' hours', 'h')
+      .replace(' hour', 'h')
+      .replace(' days', 'd')
+      .replace(' day', 'd')
+      .replace(' weeks', 'w')
+      .replace(' week', 'w')
+      .replace(' months', 'mo')
+      .replace(' month', 'mo')
+      .replace(' years', 'y')
+      .replace(' year', 'y');
   } catch {
     return '';
   }