@yancyyu/openhermit 1.6.38 → 1.6.39

package/src/renderer/components/team/members/MemberCard.tsx

@@ -607,55 +607,22 @@ export const MemberCard = ({
               className="shrink-0"
               title={totalTasks > 0 ? `${completed}/${totalTasks} completed` : undefined}
             >
-              <Badge
-                variant="secondary"
-                className="shrink-0 px-1.5 py-0.5 text-[10px] font-normal leading-none"
-              >
-                {member.taskCount} {member.taskCount === 1 ? 'task' : 'tasks'}
-              </Badge>
               {totalTasks > 0 && (
-                <div className="mx-0.5 mt-0.5 h-[2px] rounded-full bg-[var(--color-border)]">
-                  <div
-                    className="h-full rounded-full bg-emerald-500 transition-all duration-500"
-                    style={{ width: `${progressPercent}%` }}
-                  />
-                </div>
-              )}
-              {/* NOTE: lead context bar disabled — usage formula is inaccurate */}
-            </div>
-          )}
-          {!isRemoved && (
-            <div className="flex shrink-0 items-center gap-0.5">
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <button
-                    type="button"
-                    className="rounded p-1 text-[var(--color-text-muted)] transition-colors hover:bg-[var(--color-surface)] hover:text-[var(--color-text)]"
-                    onClick={(e) => {
-                      e.stopPropagation();
-                      onSendMessage?.();
-                    }}
-                  >
-                    <MessageSquare size={13} />
-                  </button>
-                </TooltipTrigger>
-                <TooltipContent side="bottom">发送消息</TooltipContent>
-              </Tooltip>
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <button
-                    type="button"
-                    className="rounded p-1 text-[var(--color-text-muted)] transition-colors hover:bg-[var(--color-surface)] hover:text-[var(--color-text)]"
-                    onClick={(e) => {
-                      e.stopPropagation();
-                      onAssignTask?.();
-                    }}
+                <>
+                  <Badge
+                    variant="secondary"
+                    className="shrink-0 px-1.5 py-0.5 text-[10px] font-normal leading-none"
                   >
-                    <Plus size={13} />
-                  </button>
-                </TooltipTrigger>
-                <TooltipContent side="bottom">分配任务</TooltipContent>
-              </Tooltip>
+                    {completed}/{totalTasks}
+                  </Badge>
+                  <div className="mx-0.5 mt-0.5 h-[2px] rounded-full bg-[var(--color-border)]">
+                    <div
+                      className="h-full rounded-full bg-emerald-500 transition-all duration-500"
+                      style={{ width: `${progressPercent}%` }}
+                    />
+                  </div>
+                </>
+              )}
             </div>
           )}
         </div>

package/src/renderer/components/team/members/MemberDetailDialog.tsx

@@ -1,11 +1,7 @@
 import { useEffect, useMemo, useState } from 'react';
 
-import { Button } from '@renderer/components/ui/button';
 import { Dialog, DialogContent, DialogFooter, DialogHeader } from '@renderer/components/ui/dialog';
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@renderer/components/ui/tabs';
 import { useMemberStats } from '@renderer/hooks/useMemberStats';
-import { useStore } from '@renderer/store';
-import { selectMemberMessagesForTeamMember } from '@renderer/store/slices/teamSlice';
 import {
   buildMemberLaunchDiagnosticsPayload,
   getMemberLaunchDiagnosticsErrorMessage,
@@ -17,16 +13,10 @@ import {
   resolveMemberRuntimeSummary,
 } from '@renderer/utils/memberRuntimeSummary';
 import { isLeadMember } from '@shared/utils/leadDetection';
-import { BarChart3, FolderOpen, Loader2 } from 'lucide-react';
 
-import { buildMemberActivityEntries } from './memberActivityEntries';
 import { MemberDetailHeader } from './MemberDetailHeader';
 import { MemberDetailStats } from './MemberDetailStats';
-import { type MemberActivityFilter, type MemberDetailTab } from './memberDetailTypes';
 import { MemberLaunchDiagnosticsButton } from './MemberLaunchDiagnosticsButton';
-import { MemberMessagesTab } from './MemberMessagesTab';
-import { MemberStatsTab } from './MemberStatsTab';
-import { MemberWorkspaceTab } from './MemberWorkspaceTab';
 
 import type { TeamLaunchParams } from '@renderer/store/slices/teamSlice';
 import type {
@@ -43,8 +33,6 @@ interface MemberDetailDialogProps {
   teamName: string;
   members: ResolvedTeamMember[];
   tasks: TeamTaskWithKanban[];
-  initialTab?: MemberDetailTab;
-  initialActivityFilter?: MemberActivityFilter;
   isTeamAlive?: boolean;
   isTeamProvisioning?: boolean;
   isLaunchSettling?: boolean;
@@ -72,8 +60,6 @@ export const MemberDetailDialog = ({
   teamName,
   members,
   tasks,
-  initialTab = 'tasks',
-  initialActivityFilter = 'all',
   isTeamAlive,
   isTeamProvisioning,
   isLaunchSettling,
@@ -90,25 +76,6 @@ export const MemberDetailDialog = ({
   updatingRole,
   onViewMemberChanges,
 }: MemberDetailDialogProps): React.JSX.Element | null => {
-  const memberMessages = useStore((state) =>
-    selectMemberMessagesForTeamMember(state, teamName, member?.name ?? null)
-  );
-  const memberActivityCount = useMemo(() => {
-    if (!member) {
-      return 0;
-    }
-    return buildMemberActivityEntries({
-      teamName,
-      memberName: member.name,
-      members,
-      tasks,
-      messages: memberMessages,
-    }).length;
-  }, [member, memberMessages, members, tasks, teamName]);
-
-  const [activeTab, setActiveTab] = useState<MemberDetailTab>(
-    initialTab === 'tasks' ? 'workspace' : initialTab
-  );
   const [restarting, setRestarting] = useState(false);
   const [restartError, setRestartError] = useState<string | null>(null);
 
@@ -149,10 +116,9 @@ export const MemberDetailDialog = ({
     if (!open || !member) {
       return;
     }
-    setActiveTab(initialTab);
     setRestartError(null);
     setRestarting(false);
-  }, [initialTab, member, open]);
+  }, [member, open]);
 
   const {
     stats: memberStats,
@@ -160,8 +126,6 @@ export const MemberDetailDialog = ({
     error: statsError,
   } = useMemberStats(teamName, member?.name ?? null);
 
-  const totalTokens = memberStats ? memberStats.inputTokens + memberStats.outputTokens : null;
-
   if (!member) return null;
 
   return (
@@ -189,68 +153,12 @@ export const MemberDetailDialog = ({
           </DialogHeader>
 
           <MemberDetailStats
-            totalTasks={0}
-            inProgressTasks={0}
-            totalTokens={totalTokens}
+            stats={memberStats}
             statsLoading={statsLoading}
-            statsComputedAt={memberStats?.computedAt}
-            onTabChange={setActiveTab}
+            statsError={statsError}
           />
         </div>
 
-        <Tabs
-          value={activeTab}
-          onValueChange={(v) => setActiveTab(v as MemberDetailTab)}
-          className="min-w-0 overflow-hidden"
-        >
-          <TabsList className="w-full">
-            <TabsTrigger value="workspace" className="flex-1 gap-1.5">
-              <FolderOpen size={12} />
-              Workspace
-            </TabsTrigger>
-            <TabsTrigger value="activity" className="flex-1 gap-1.5">
-              Activity
-              {memberActivityCount > 0 && (
-                <span className="rounded-full bg-[var(--color-surface)] px-1.5 text-[10px]">
-                  {memberActivityCount}
-                </span>
-              )}
-            </TabsTrigger>
-            <TabsTrigger value="stats" className="flex-1 gap-1.5">
-              <BarChart3 size={12} />
-              Stats
-            </TabsTrigger>
-          </TabsList>
-          <TabsContent value="workspace">
-            <MemberWorkspaceTab
-              teamName={teamName}
-              memberName={member.name}
-              onFileClick={(filePath) => onViewMemberChanges?.(member.name, filePath)}
-              onViewAllChanges={() => onViewMemberChanges?.(member.name)}
-            />
-          </TabsContent>
-          <TabsContent value="activity">
-            <MemberMessagesTab
-              teamName={teamName}
-              memberName={member.name}
-              members={members}
-              tasks={tasks}
-              initialFilter={initialActivityFilter}
-            />
-          </TabsContent>
-          <TabsContent value="stats">
-            <MemberStatsTab
-              teamName={teamName}
-              memberName={member.name}
-              prefetchedStats={memberStats}
-              prefetchedLoading={statsLoading}
-              prefetchedError={statsError}
-              onFileClick={(filePath) => onViewMemberChanges?.(member.name, filePath)}
-              onShowAllFiles={() => onViewMemberChanges?.(member.name)}
-            />
-          </TabsContent>
-        </Tabs>
-
         <DialogFooter>
           {restartError ? (
             <div className="text-xs text-red-400">{restartError}</div>

package/src/renderer/components/team/members/MemberDetailStats.tsx

@@ -1,80 +1,65 @@
-import { formatRelativeTime, formatTokensCompact } from '@renderer/utils/formatters';
+import { formatDuration, formatTokensCompact } from '@renderer/utils/formatters';
 
-import type { MemberDetailTab } from './memberDetailTypes';
+import type { MemberFullStats } from '@shared/types';
 
 interface MemberDetailStatsProps {
-  totalTasks: number;
-  inProgressTasks: number;
-  totalTokens: number | null;
+  stats: MemberFullStats | null;
   statsLoading?: boolean;
-  statsComputedAt?: string;
-  onTabChange?: (tab: MemberDetailTab) => void;
+  statsError?: string | null;
 }
 
-const baseClasses =
-  'rounded-md border border-[var(--color-border)] bg-[var(--color-surface-raised)] px-2.5 py-1.5';
-const clickableClasses =
-  'cursor-pointer transition-colors hover:border-[var(--color-border-emphasis)] hover:bg-[var(--color-surface-overlay)]';
-
-const StatBlock = ({
-  label,
-  value,
-  sub,
-  onClick,
-}: {
-  label: string;
-  value: string | number;
-  sub?: string;
-  onClick?: () => void;
-}): React.JSX.Element => {
-  const classes = onClick ? `${baseClasses} ${clickableClasses}` : baseClasses;
-  const content = (
-    <>
-      <p className="text-base font-semibold leading-tight text-[var(--color-text)]">{value}</p>
-      <p className="text-[10px] text-[var(--color-text-muted)]">{label}</p>
-      {sub && <p className="mt-0.5 text-[9px] text-[var(--color-text-muted)]">{sub}</p>}
-    </>
-  );
-  if (onClick) {
-    return (
-      <button type="button" className={classes} onClick={onClick}>
-        {content}
-      </button>
-    );
-  }
-  return <div className={classes}>{content}</div>;
-};
+function formatDurationShort(ms: number): string {
+  if (ms < 60_000) return `${Math.round(ms / 1000)}s`;
+  const minutes = Math.floor(ms / 60_000);
+  if (minutes < 60) return `${minutes}m`;
+  const hours = Math.floor(minutes / 60);
+  const remainMin = minutes % 60;
+  if (hours < 24) return `${hours}h ${remainMin}m`;
+  const days = Math.floor(hours / 24);
+  return `${days}d ${hours % 24}h`;
+}
 
 export const MemberDetailStats = ({
-  totalTasks,
-  inProgressTasks,
-  totalTokens,
+  stats,
   statsLoading,
-  statsComputedAt,
-  onTabChange,
 }: MemberDetailStatsProps): React.JSX.Element => {
-  const tokensValue = statsLoading
-    ? '...'
-    : totalTokens != null
-      ? formatTokensCompact(totalTokens)
-      : '—';
-  const tokensSub =
-    !statsLoading && statsComputedAt ? `updated ${formatRelativeTime(statsComputedAt)}` : undefined;
+  const totalTokens = stats ? stats.inputTokens + stats.outputTokens : 0;
+
+  const items = [
+    {
+      label: 'Sessions',
+      value: statsLoading ? '...' : String(stats?.sessionCount ?? 0),
+      sub: !statsLoading && stats ? `${stats.messageCount} messages` : undefined,
+    },
+    {
+      label: 'Tokens',
+      value: statsLoading ? '...' : formatTokensCompact(totalTokens),
+    },
+    {
+      label: 'Duration',
+      value: statsLoading ? '...' : stats?.totalDurationMs ? formatDurationShort(stats.totalDurationMs) : '—',
+      sub: !statsLoading && stats?.tasksCompleted ? `${stats.tasksCompleted} completed` : undefined,
+    },
+  ];
 
   return (
-    <div className="grid min-w-0 flex-1 grid-cols-2 gap-1.5">
-      <StatBlock
-        label="Tasks"
-        value={totalTasks}
-        sub={inProgressTasks > 0 ? `进行中: ${inProgressTasks}` : undefined}
-        onClick={onTabChange ? () => onTabChange('tasks') : undefined}
-      />
-      <StatBlock
-        label="Tokens"
-        value={tokensValue}
-        sub={tokensSub}
-        onClick={onTabChange ? () => onTabChange('stats') : undefined}
-      />
+    <div className="grid min-w-0 flex-1 grid-cols-3 gap-1.5">
+      {items.map((item) => (
+        <div
+          key={item.label}
+          className="rounded-md border border-[var(--color-border)] bg-[var(--color-surface-raised)] px-2.5 py-1.5"
+        >
+          <div className="flex items-baseline gap-1.5">
+            <span className="text-sm font-semibold tabular-nums text-[var(--color-text)]">
+              {item.value}
+            </span>
+            <span className="text-[10px] text-[var(--color-text-muted)]">{item.label}</span>
+          </div>
+          {item.sub && (
+            <span className="block text-[9px] text-[var(--color-text-muted)]">{item.sub}</span>
+          )}
+        </div>
+      ))}
     </div>
   );
 };

package/src/renderer/components/team/messages/MessageComposer.tsx

@@ -33,14 +33,12 @@ import {
   normalizeOptionalTeamProviderId,
 } from '@shared/utils/teamProvider';
 import { AlertCircle, Check, ChevronDown, Mic, Paperclip, Search, Send } from 'lucide-react';
-import { useShallow } from 'zustand/react/shallow';
 
 import type { MentionSuggestion } from '@renderer/types/mention';
 import type { OpenCodeRuntimeDeliveryDebugDetails } from '@renderer/utils/openCodeRuntimeDeliveryDiagnostics';
 import type {
   AgentActionMode,
   AttachmentPayload,
-  CcSession,
   ResolvedTeamMember,
   SendMessageResult,
   TaskRef,
@@ -56,9 +54,6 @@ interface MessageComposerProps {
   sendWarning?: string | null;
   sendDebugDetails?: OpenCodeRuntimeDeliveryDebugDetails | null;
   lastResult?: SendMessageResult | null;
-  sessions?: CcSession[];
-  selectedSessionKey?: string | null;
-  onSessionChange?: (sessionKey: string | null) => void;
   /** Ref to the underlying textarea element for external focus management. */
   textareaRef?: React.Ref<HTMLTextAreaElement>;
   onSend: (
@@ -86,9 +81,6 @@ export const MessageComposer = ({
   sendWarning,
   sendDebugDetails,
   lastResult,
-  sessions = [],
-  selectedSessionKey = null,
-  onSessionChange,
   textareaRef: externalTextareaRef,
   onSend,
   onDispatchTask,
@@ -118,7 +110,6 @@ export const MessageComposer = ({
   const [fileRestrictionError, setFileRestrictionError] = useState<string | null>(null);
   const fileRestrictionTimerRef = useRef(0);
   const dismissMentionsRef = useRef<(() => void) | null>(null);
-  const [teamSelectorOpen, setTeamSelectorOpen] = useState(false);
 
   // Members load async with team data; keep recipient stable if valid, otherwise default to lead/first.
   useEffect(() => {
@@ -135,6 +126,9 @@ export const MessageComposer = ({
   const projectPath = useStore((s) =>
     s.selectedTeamName === teamName ? (s.selectedTeamData?.config.projectPath ?? null) : null
   );
+  const skillsUserCatalog = useStore((s) => s.skillsUserCatalog);
+  const skillsProjectCatalogByProjectPath = useStore((s) => s.skillsProjectCatalogByProjectPath);
+  const fetchSkillsCatalog = useStore((s) => s.fetchSkillsCatalog);
   const currentTeamColor = useStore((s) => {
     if (s.selectedTeamName !== teamName) {
       return nameColorSet(teamName).border;
@@ -146,17 +140,6 @@ export const MessageComposer = ({
   });
   const isProvisioning = useStore((s) => isTeamProvisioningActive(s, teamName));
   const draft = useComposerDraft(teamName);
-  const selectedSession = useMemo(
-    () => sessions.find((session) => session.sessionKey === selectedSessionKey) ?? null,
-    [selectedSessionKey, sessions]
-  );
-  const selectedSessionLabel =
-    selectedSession?.chatName ||
-    selectedSession?.title ||
-    selectedSession?.userName ||
-    selectedSession?.sessionKey ||
-    '选择会话';
-
   const colorMap = useMemo(() => buildMemberColorMap(members), [members]);
 
   const mentionSuggestions = useMemo<MentionSuggestion[]>(
@@ -176,29 +159,22 @@ export const MessageComposer = ({
     );
   }, [members]);
 
-  const { suggestions: teamMentionSuggestions } = useTeamSuggestions(teamName);
-  const { suggestions: taskSuggestions } = useTaskSuggestions(teamName);
-  // Project skills as slash command suggestions
-  const projectSkills = useStore(
-    useShallow((s) => (projectPath ? (s.skillsProjectCatalogByProjectPath[projectPath] ?? []) : []))
-  );
-  const userSkills = useStore(useShallow((s) => s.skillsUserCatalog));
-  const fetchSkillsCatalog = useStore((s) => s.fetchSkillsCatalog);
-
-  // Fetch skills catalog for the team's project on mount / project change
   useEffect(() => {
     void fetchSkillsCatalog(projectPath ?? undefined);
   }, [fetchSkillsCatalog, projectPath]);
 
+  const { suggestions: teamMentionSuggestions } = useTeamSuggestions(teamName);
+  const { suggestions: taskSuggestions } = useTaskSuggestions(teamName);
+  const projectSkills = projectPath ? (skillsProjectCatalogByProjectPath[projectPath] ?? []) : [];
   const slashCommandSuggestions = useMemo<MentionSuggestion[]>(
     () =>
       buildSlashCommandSuggestions(
         getSuggestedSlashCommandsForProvider(leadProviderId),
         projectSkills,
-        userSkills,
+        skillsUserCatalog,
         leadProviderId
       ),
-    [leadProviderId, projectSkills, userSkills]
+    [leadProviderId, projectSkills, skillsUserCatalog]
   );
 
   const trimmed = stripEncodedTaskReferenceMetadata(draft.text).trim();
@@ -473,84 +449,6 @@ export const MessageComposer = ({
                 'border-[var(--color-border)]'
               )}
             >
-              <Popover open={teamSelectorOpen} onOpenChange={setTeamSelectorOpen}>
-                <PopoverTrigger asChild>
-                  <button
-                    type="button"
-                    className={cn(
-                      'inline-flex items-center gap-1.5 border-r border-r-[var(--color-border)] px-2.5 py-1 text-xs transition-colors',
-                      shouldDockRecipientSelector
-                        ? 'rounded-bl-none rounded-tl-[1.35rem]'
-                        : 'rounded-l-full',
-                      'hover:bg-[var(--color-surface-raised)]'
-                    )}
-                  >
-                    {currentTeamColor ? (
-                      <span
-                        className="inline-block size-2 shrink-0 rounded-full"
-                        style={{ backgroundColor: currentTeamColor }}
-                      />
-                    ) : null}
-                    <span className="max-w-[120px] truncate text-[var(--color-text-secondary)]">
-                      {selectedSessionLabel}
-                    </span>
-                    <ChevronDown size={12} className="shrink-0 text-[var(--color-text-muted)]" />
-                  </button>
-                </PopoverTrigger>
-                <PopoverContent align="end" className="w-56 p-1.5">
-                  <div className="max-h-48 space-y-0.5 overflow-y-auto">
-                    {sessions.length > 0 && (
-                      <>
-                        <div className="px-2 py-1 text-[10px] font-medium uppercase tracking-wide text-[var(--color-text-muted)]">
-                          会话
-                        </div>
-                        {sessions.map((session) => {
-                          const isSelected = selectedSessionKey === session.sessionKey;
-                          const label =
-                            session.chatName ||
-                            session.title ||
-                            session.userName ||
-                            session.sessionKey;
-                          return (
-                            <button
-                              key={session.sessionKey}
-                              type="button"
-                              className={cn(
-                                'flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-left text-xs transition-colors hover:bg-[var(--color-surface-raised)]',
-                                isSelected && 'bg-[var(--color-surface-raised)]'
-                              )}
-                              onClick={() => {
-                                onSessionChange?.(session.sessionKey);
-                                setTeamSelectorOpen(false);
-                              }}
-                            >
-                              <span
-                                className={cn(
-                                  'inline-block size-2 shrink-0 rounded-full',
-                                  session.live && 'animate-pulse'
-                                )}
-                                style={{
-                                  backgroundColor: session.live ? '#22c55e' : currentTeamColor,
-                                }}
-                              />
-                              <span className="min-w-0 flex-1 truncate text-[var(--color-text)]">
-                                {label}
-                              </span>
-                              <span className="shrink-0 text-[10px] text-[var(--color-text-muted)]">
-                                {session.platform}
-                              </span>
-                              {isSelected ? (
-                                <Check size={12} className="ml-auto shrink-0 text-blue-400" />
-                              ) : null}
-                            </button>
-                          );
-                        })}
-                      </>
-                    )}
-                  </div>
-                </PopoverContent>
-              </Popover>
-
               <Popover open={recipientOpen} onOpenChange={setRecipientOpen}>
                 <PopoverTrigger asChild>
                   <button