@yancyyu/openhermit 1.6.42 → 1.6.43

package/src/renderer/components/team/loop-console/useLoopConsoleController.ts

@@ -0,0 +1,266 @@
+import { useCallback, useState } from 'react';
+
+import { api } from '@renderer/api';
+import { useStore } from '@renderer/store';
+import { SYSTEM_MANAGER_TEAM_NAME } from '@shared/types/team';
+import { useShallow } from 'zustand/react/shallow';
+
+import type { LoopSendIntent } from './loopSendIntent';
+import type { DiscoverableWorker, InboxMessage } from '@shared/types';
+
+interface UseLoopConsoleControllerOptions {
+  teamName: string;
+  sessionKey?: string | null;
+  onPendingReplyChange: (updater: (prev: Record<string, number>) => Record<string, number>) => void;
+}
+
+interface UseLoopConsoleControllerResult {
+  sending: boolean;
+  statusMessage: string | null;
+  submitIntent: (intent: LoopSendIntent) => Promise<boolean>;
+}
+
+function currentIso(): string {
+  return new Date().toISOString();
+}
+
+function buildOptimisticSystemMessage(text: string, to: string = 'user'): InboxMessage {
+  return {
+    from: 'system',
+    to,
+    text,
+    timestamp: currentIso(),
+    read: true,
+    messageId: `loop-console-${Date.now().toString(36)}`,
+    source: 'system_notification',
+  };
+}
+
+function normalizeSessionKey(sessionKey?: string | null): string | undefined {
+  return sessionKey && sessionKey !== '__unassigned__' ? sessionKey : undefined;
+}
+
+function formatWorkersList(workers: DiscoverableWorker[]): string {
+  if (!workers.length) return '当前没有可用数字员工。';
+  const lines = workers.map((worker) => {
+    const status = worker.status === 'online' ? 'online' : 'offline';
+    const workDir = worker.workDir ? ` · ${worker.workDir}` : '';
+    const harness = worker.harness ? ` · ${worker.harness}` : '';
+    const description = worker.description ? ` — ${worker.description}` : '';
+    return `- @${worker.workerId} ${worker.name} · ${status}${workDir}${harness}${description}`;
+  });
+  return [
+    '当前数字员工：',
+    ...lines,
+    '',
+    '在指令台输入 `@workerId 任务内容` 可直接调用对应员工。',
+  ].join('\n');
+}
+
+export function useLoopConsoleController({
+  teamName,
+  sessionKey,
+  onPendingReplyChange,
+}: UseLoopConsoleControllerOptions): UseLoopConsoleControllerResult {
+  const [localSending, setLocalSending] = useState(false);
+  const [statusMessage, setStatusMessage] = useState<string | null>(null);
+  const { sendTeamMessage, addOptimisticTeamMessage, refreshTeamMessagesHead, sendingMessage } =
+    useStore(
+      useShallow((s) => ({
+        sendTeamMessage: s.sendTeamMessage,
+        addOptimisticTeamMessage: s.addOptimisticTeamMessage,
+        refreshTeamMessagesHead: s.refreshTeamMessagesHead,
+        sendingMessage: s.sendingMessage,
+      }))
+    );
+
+  const submitIntent = useCallback(
+    async (intent: LoopSendIntent): Promise<boolean> => {
+      const routedSessionKey = normalizeSessionKey(sessionKey);
+      setStatusMessage(null);
+
+      if (intent.kind === 'message') {
+        const sentAtMs = Date.now();
+        onPendingReplyChange((prev) => ({ ...prev, [intent.recipient]: sentAtMs }));
+        try {
+          const result = await sendTeamMessage(teamName, {
+            member: intent.recipient,
+            text: intent.text,
+            summary: intent.summary,
+            attachments: intent.attachments,
+            taskRefs: intent.taskRefs,
+            slashCommand: intent.slashCommand,
+            sessionKey: routedSessionKey,
+          });
+          if (
+            result.runtimeDelivery?.attempted === true &&
+            result.runtimeDelivery.delivered === false
+          ) {
+            onPendingReplyChange((prev) => {
+              if (prev[intent.recipient] !== sentAtMs) return prev;
+              const next = { ...prev };
+              delete next[intent.recipient];
+              return next;
+            });
+          }
+          return true;
+        } catch (error) {
+          onPendingReplyChange((prev) => {
+            if (prev[intent.recipient] !== sentAtMs) return prev;
+            const next = { ...prev };
+            delete next[intent.recipient];
+            return next;
+          });
+          setStatusMessage(error instanceof Error ? error.message : '指令发送失败');
+          return false;
+        }
+      }
+
+      if (intent.kind === 'workers-list') {
+        setLocalSending(true);
+        try {
+          const result = await api.workers.list();
+          addOptimisticTeamMessage(
+            teamName,
+            buildOptimisticSystemMessage(formatWorkersList(result.workers))
+          );
+          return true;
+        } catch (error) {
+          const message = error instanceof Error ? error.message : '获取数字员工列表失败';
+          setStatusMessage(message);
+          addOptimisticTeamMessage(teamName, buildOptimisticSystemMessage(message));
+          return false;
+        } finally {
+          setLocalSending(false);
+        }
+      }
+
+      if (intent.kind === 'cross-team-task') {
+        const now = Date.now();
+        const optimisticMessageId = `loop-cross-team-${now}`;
+        addOptimisticTeamMessage(teamName, {
+          from: 'user',
+          to: intent.toTeam,
+          text: `@${intent.toTeam} ${intent.subject}`,
+          timestamp: new Date(now).toISOString(),
+          read: true,
+          messageId: optimisticMessageId,
+          source: 'cross_team_sent',
+          session: routedSessionKey ? { key: routedSessionKey } : undefined,
+        });
+        if (teamName === SYSTEM_MANAGER_TEAM_NAME) {
+          try {
+            const result = await api.workers.invoke(intent.toTeam, {
+              fromTeam: teamName,
+              text: intent.subject,
+              summary: intent.summary,
+              sessionName: intent.toTeam,
+              reuse: true,
+              sessionKey: routedSessionKey,
+            });
+            const verb = result.reused ? '已复用' : '已创建';
+            addOptimisticTeamMessage(
+              teamName,
+              buildOptimisticSystemMessage(
+                `${verb} ${result.worker.name} 的 Loop 会话并直接下发指令，无需审批。`
+              )
+            );
+            await refreshTeamMessagesHead(teamName).catch(() => undefined);
+            return true;
+          } catch (error) {
+            const message = error instanceof Error ? error.message : '调用数字员工失败';
+            addOptimisticTeamMessage(
+              teamName,
+              buildOptimisticSystemMessage(`无法调用 ${intent.toTeam}：${message}`)
+            );
+            await refreshTeamMessagesHead(teamName).catch(() => undefined);
+            setStatusMessage(message);
+            return false;
+          }
+        }
+        try {
+          const result = await api.crossTeam.send({
+            fromTeam: teamName,
+            fromMember: 'user',
+            toTeam: intent.toTeam,
+            text: intent.text,
+            summary: intent.summary,
+            taskRefs: intent.taskRefs,
+            messageId: optimisticMessageId,
+            sessionKey: routedSessionKey,
+          });
+          if ('ok' in result && result.ok === false) {
+            const errorMessage =
+              'error' in result && typeof result.error === 'string'
+                ? result.error
+                : '跨团队任务派发失败';
+            throw new Error(errorMessage);
+          }
+          window.dispatchEvent(new CustomEvent('collab:refresh'));
+          await refreshTeamMessagesHead(teamName);
+          return true;
+        } catch (error) {
+          const message = error instanceof Error ? error.message : '跨团队任务派发失败';
+          addOptimisticTeamMessage(
+            teamName,
+            buildOptimisticSystemMessage(`无法派发给 ${intent.toTeam}：${message}`)
+          );
+          await refreshTeamMessagesHead(teamName).catch(() => undefined);
+          setStatusMessage(message);
+          return false;
+        }
+      }
+
+      setLocalSending(true);
+      try {
+        if (intent.kind === 'runtime') {
+          await api.teams.processSend(teamName, intent.text);
+          addOptimisticTeamMessage(
+            teamName,
+            buildOptimisticSystemMessage(
+              `已注入 runtime（不写入消息看板）：${intent.summary ?? intent.text}`
+            )
+          );
+          return true;
+        }
+
+        const response = await api.teams.createLoopSession(teamName, {
+          sessionName: intent.sessionName,
+          message: intent.text,
+          reuse: intent.reuse,
+        });
+        const verb = response.reused ? '已复用' : '已创建';
+        addOptimisticTeamMessage(
+          teamName,
+          buildOptimisticSystemMessage(
+            `${verb} Loop 会话「${response.session.title || response.session.sessionKey}」并下发初始指令。`,
+            'cc'
+          )
+        );
+        await refreshTeamMessagesHead(teamName).catch(() => undefined);
+        return true;
+      } catch (error) {
+        const message = error instanceof Error ? error.message : 'Loop runtime 操作失败';
+        setStatusMessage(message);
+        addOptimisticTeamMessage(teamName, buildOptimisticSystemMessage(message));
+        return false;
+      } finally {
+        setLocalSending(false);
+      }
+    },
+    [
+      addOptimisticTeamMessage,
+      onPendingReplyChange,
+      refreshTeamMessagesHead,
+      sendTeamMessage,
+      sessionKey,
+      teamName,
+    ]
+  );
+
+  return {
+    sending: localSending || sendingMessage,
+    statusMessage,
+    submitIntent,
+  };
+}

package/src/renderer/components/team/members/LeadModelRow.test.tsx

@@ -22,7 +22,7 @@ vi.mock('@renderer/components/team/dialogs/TeamModelSelector', () => ({
   getTeamProviderLabel: (providerId: string) => providerId,
   OPENCODE_TEAM_LEAD_DISABLED_BADGE_LABEL: '侧路',
   OPENCODE_TEAM_LEAD_DISABLED_REASON:
-    '当前阶段 OpenCode 只能作为成员运行。请使用 Anthropic、Codex 或 Gemini 作为团队负责人，再把 OpenCode 添加为成员。',
+    '当前阶段 OpenCode 只能作为成员运行。请使用 Anthropic、Codex 或 Gemini 作为 Loop Lead，再把 OpenCode 添加为成员。',
   TeamModelSelector: () => React.createElement('div', null, 'team-model-selector'),
 }));
 

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

@@ -88,8 +88,10 @@ export const LeadModelRow = ({
             loading="lazy"
           />
           <div className="flex h-8 min-w-0 items-center gap-3">
-            <span className="truncate text-sm font-medium text-[var(--color-text)]">负责人</span>
-            <span className="shrink-0 text-xs text-[var(--color-text-secondary)]">团队负责人</span>
+            <span className="truncate text-sm font-medium text-[var(--color-text)]">Loop Lead</span>
+            <span className="shrink-0 text-xs text-[var(--color-text-secondary)]">
+              运行时负责人
+            </span>
           </div>
         </div>
       </div>
@@ -173,7 +175,7 @@ export const LeadModelRow = ({
           <div className="flex items-start gap-2 rounded-md border border-sky-500/20 bg-sky-500/5 px-3 py-2">
             <Info className="mt-0.5 size-3.5 shrink-0 text-sky-400" />
             <p className="text-[11px] leading-relaxed text-sky-300">
-              这些设置控制团队负责人，并作为未单独覆盖设置的成员默认运行时。
+              这些设置控制 Loop Lead，并作为未单独覆盖设置的成员默认运行时。
             </p>
           </div>
         </div>

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

@@ -126,6 +126,15 @@ export const MemberDetailDialog = ({
     error: statsError,
   } = useMemberStats(teamName, member?.name ?? null);
 
+  const memberActivityCount = useMemo(() => {
+    if (!member) return 0;
+    const authoredComments = tasks.reduce((count, task) => {
+      const comments = Array.isArray(task.comments) ? task.comments : [];
+      return count + comments.filter((comment) => comment.author === member.name).length;
+    }, 0);
+    return Math.max(member.messageCount ?? 0, authoredComments);
+  }, [member, tasks]);
+
   if (!member) return null;
 
   return (
@@ -156,7 +165,9 @@ export const MemberDetailDialog = ({
             stats={memberStats}
             statsLoading={statsLoading}
             statsError={statsError}
+            activityCount={memberActivityCount}
           />
+          <span className="sr-only">Activity{memberActivityCount}</span>
         </div>
 
         <DialogFooter>

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

@@ -6,6 +6,7 @@ interface MemberDetailStatsProps {
   stats: MemberFullStats | null;
   statsLoading?: boolean;
   statsError?: string | null;
+  activityCount?: number;
 }
 
 function formatDurationShort(ms: number): string {
@@ -22,8 +23,9 @@ function formatDurationShort(ms: number): string {
 export const MemberDetailStats = ({
   stats,
   statsLoading,
+  activityCount,
 }: MemberDetailStatsProps): React.JSX.Element => {
-  const totalTokens = stats ? stats.inputTokens + stats.outputTokens : 0;
+  const totalTokens = stats?.totalTokens ?? 0;
 
   const items = [
     {
@@ -37,13 +39,21 @@ export const MemberDetailStats = ({
     },
     {
       label: 'Duration',
-      value: statsLoading ? '...' : stats?.totalDurationMs ? formatDurationShort(stats.totalDurationMs) : '—',
+      value: statsLoading
+        ? '...'
+        : stats?.totalDurationMs
+          ? formatDurationShort(stats.totalDurationMs)
+          : '—',
       sub: !statsLoading && stats?.tasksCompleted ? `${stats.tasksCompleted} completed` : undefined,
     },
+    {
+      label: 'Activity',
+      value: String(activityCount ?? stats?.messageCount ?? 0),
+    },
   ];
 
   return (
-    <div className="grid min-w-0 flex-1 grid-cols-3 gap-1.5">
+    <div className="grid min-w-0 flex-1 grid-cols-4 gap-1.5">
       {items.map((item) => (
         <div
           key={item.label}

package/src/renderer/components/team/members/MemberDraftRow.test.tsx

@@ -158,7 +158,7 @@ describe('MemberDraftRow', () => {
       lockProviderModel: false,
       forceInheritedModelSettings: false,
       modelLockReason:
-        '该成员当前与团队负责人模型保持同步。关闭同步后可单独设置提供商、模型或推理强度。',
+        '该成员当前与 Loop Lead 模型保持同步。关闭同步后可单独设置提供商、模型或推理强度。',
     });
 
     expect(host.textContent).not.toBeNull();

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

@@ -214,7 +214,7 @@ export const MemberDraftRow = ({
   const modelButtonAriaLabel = `${getTeamProviderLabel(effectiveProviderId)} 提供商，${modelButtonLabel}`;
   const canOpenLockedModelPanel = lockProviderModel && !isRemoved && Boolean(lockedModelAction);
   const modelTooltipText = forceInheritedModelSettings
-    ? '同步开启时，提供商、模型和推理强度会继承团队负责人设置。'
+    ? '同步开启时，提供商、模型和推理强度会继承 Loop Lead 设置。'
     : lockProviderModel
       ? (lockedModelAction?.description ?? modelLockReason)
       : undefined;

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

@@ -32,7 +32,7 @@ interface MemberMessagesTabProps {
 const MAX_MESSAGES = 100;
 const FILTER_OPTIONS: readonly { value: MemberActivityFilter; label: string }[] = [
   { value: 'all', label: 'All' },
-  { value: 'messages', label: 'Messages' },
+  { value: 'messages', label: 'Loop events' },
   { value: 'comments', label: 'Comments' },
 ];
 
@@ -227,7 +227,7 @@ export const MemberMessagesTab = ({
               disabled={loadingOlderMessages}
               onClick={() => void loadOlderMessages()}
             >
-              Load older messages
+              Load older Loop events
             </Button>
           </div>
         )}

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

@@ -96,7 +96,7 @@ export const MemberStatsTab = ({
     );
   }
 
-  const totalTokens = stats.inputTokens + stats.outputTokens;
+  const totalTokens = stats.totalTokens;
   const totalToolCalls = Object.values(stats.toolUsage).reduce((sum, c) => sum + c, 0);
 
   return (