@yancyyu/openhermit 1.6.28 → 1.6.30

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

@@ -208,9 +208,11 @@ export const MessagesPanel = memo(function MessagesPanel({
     teams,
     openTeamTab,
     messages,
-    messagesState,
+    hasMore,
+    loadingOlderMessages,
     loadOlderTeamMessages,
     refreshTeamMessagesHead,
+    addOptimisticTeamMessage,
   } = useStore(
     useShallow((s) => ({
       sendTeamMessage: s.sendTeamMessage,
@@ -223,24 +225,30 @@ export const MessagesPanel = memo(function MessagesPanel({
       teams: s.teams,
       openTeamTab: s.openTeamTab,
       messages: selectTeamMessages(s, teamName),
-      messagesState: teamName ? s.teamMessagesByName[teamName] : undefined,
+      // Subscribe to only the primitive flags the panel renders. The full
+      // cache entry object is rebuilt on every (even no-op) head refresh —
+      // selecting it wholesale would re-render this heavy panel every poll.
+      hasMore: teamName ? (s.teamMessagesByName[teamName]?.hasMore ?? false) : false,
+      loadingOlderMessages: teamName
+        ? (s.teamMessagesByName[teamName]?.loadingOlder ?? false)
+        : false,
       loadOlderTeamMessages: s.loadOlderTeamMessages,
       refreshTeamMessagesHead: s.refreshTeamMessagesHead,
+      addOptimisticTeamMessage: s.addOptimisticTeamMessage,
     }))
   );
   const bootstrapHeadRefreshAttemptedForTeamRef = useRef<string | null>(null);
 
   const loadOlderMessages = useCallback(async () => {
-    if (!messagesState?.hasMore || messagesState.loadingHead || messagesState.loadingOlder) {
+    // Read the live cache entry instead of subscribing to it — loadingHead
+    // toggles on every background head refresh and must not re-render us.
+    const entry = useStore.getState().teamMessagesByName[teamName];
+    if (!entry?.hasMore || entry.loadingHead || entry.loadingOlder) {
       return;
     }
     await loadOlderTeamMessages(teamName);
-  }, [loadOlderTeamMessages, messagesState, teamName]);
+  }, [loadOlderTeamMessages, teamName]);
 
-  const messagesLoading =
-    (messagesState?.loadingHead ?? false) || (messagesState?.loadingOlder ?? false);
-  const loadingOlderMessages = messagesState?.loadingOlder ?? false;
-  const hasMore = messagesState?.hasMore ?? false;
   const effectiveMessages = messages;
   const loadedMessageCount = effectiveMessages.length;
   const autoLoadOlderLockRef = useRef(false);
@@ -269,12 +277,11 @@ export const MessagesPanel = memo(function MessagesPanel({
 
   const maybeAutoLoadOlderMessages = useCallback(
     (scrollTop: number) => {
-      if (
-        scrollTop > AUTO_LOAD_OLDER_SCROLL_TOP_PX ||
-        !hasMore ||
-        messagesState?.loadingHead ||
-        loadingOlderMessages
-      ) {
+      if (scrollTop > AUTO_LOAD_OLDER_SCROLL_TOP_PX || !hasMore || loadingOlderMessages) {
+        return;
+      }
+      // loadingHead is read live (not subscribed) to avoid per-poll re-renders.
+      if (useStore.getState().teamMessagesByName[teamName]?.loadingHead) {
         return;
       }
       if (autoLoadOlderLockRef.current) {
@@ -283,7 +290,7 @@ export const MessagesPanel = memo(function MessagesPanel({
       autoLoadOlderLockRef.current = true;
       void loadOlderMessages();
     },
-    [hasMore, loadOlderMessages, loadingOlderMessages, messagesState?.loadingHead]
+    [hasMore, loadOlderMessages, loadingOlderMessages, teamName]
   );
 
   useEffect(() => {
@@ -377,7 +384,9 @@ export const MessagesPanel = memo(function MessagesPanel({
     return () => {
       cancelled = true;
     };
-  }, [teamName]);
+    // Refetch when the lead session id changes (e.g. a new session is spawned)
+    // so the session list/selector reflects the updated id without a remount.
+  }, [teamName, currentLeadSessionId]);
 
   const selectedSession = useMemo(
     () => teamSessions.find((session) => session.sessionKey === selectedSessionKey) ?? null,
@@ -453,7 +462,10 @@ export const MessagesPanel = memo(function MessagesPanel({
       bootstrapHeadRefreshAttemptedForTeamRef.current = null;
       return;
     }
-    if (messagesState?.loadingHead || messagesState?.loadingOlder) {
+    // Read loading flags live rather than subscribing — they toggle on every
+    // background head refresh and must not drive this bootstrap effect.
+    const entry = useStore.getState().teamMessagesByName[teamName];
+    if (entry?.loadingHead || entry?.loadingOlder) {
       return;
     }
     if (bootstrapHeadRefreshAttemptedForTeamRef.current === teamName) {
@@ -461,13 +473,7 @@ export const MessagesPanel = memo(function MessagesPanel({
     }
     bootstrapHeadRefreshAttemptedForTeamRef.current = teamName;
     void refreshTeamMessagesHead(teamName).catch(() => undefined);
-  }, [
-    effectiveMessages.length,
-    messagesState?.loadingHead,
-    messagesState?.loadingOlder,
-    refreshTeamMessagesHead,
-    teamName,
-  ]);
+  }, [effectiveMessages.length, refreshTeamMessagesHead, teamName]);
 
   useLayoutEffect(() => {
     if (position !== 'sidebar') return;
@@ -534,7 +540,7 @@ export const MessagesPanel = memo(function MessagesPanel({
   const sessionScopedMessages = useMemo(() => {
     const newestFirst = (items: InboxMessage[]) =>
       [...items].sort((a, b) => Date.parse(b.timestamp) - Date.parse(a.timestamp));
-    if (!selectedSessionKey) return [];
+    if (!selectedSessionKey) return newestFirst(effectiveMessages);
     if (selectedSession && !selectedIsHermitLocalSession) {
       if (!selectedSessionDetail) {
         return [];
@@ -731,12 +737,77 @@ export const MessagesPanel = memo(function MessagesPanel({
         fromMember: 'user',
         toTeam,
         text,
+        sessionKey:
+          selectedSessionKey && selectedSessionKey !== '__unassigned__'
+            ? selectedSessionKey
+            : undefined,
         taskRefs,
         actionMode,
         summary,
       });
     },
-    [teamName, sendCrossTeamMessage]
+    [teamName, selectedSessionKey, sendCrossTeamMessage]
+  );
+
+  const handleDispatchTaskToTeam = useCallback(
+    async (toTeam: string, subject: string, description: string) => {
+      const now = Date.now();
+      const optimisticMessageId = `optimistic-cross-team-${now}`;
+      addOptimisticTeamMessage(teamName, {
+        from: 'user',
+        to: toTeam,
+        text: `@${toTeam} ${subject}`,
+        timestamp: new Date(now).toISOString(),
+        read: true,
+        messageId: optimisticMessageId,
+        source: 'cross_team_sent',
+        session:
+          selectedSessionKey && selectedSessionKey !== '__unassigned__'
+            ? { key: selectedSessionKey }
+            : undefined,
+      });
+      try {
+        await sendCrossTeamMessage({
+          fromTeam: teamName,
+          fromMember: 'user',
+          toTeam,
+          text: description,
+          messageId: optimisticMessageId,
+        });
+      } catch (error) {
+        const rawMessage = error instanceof Error ? error.message : '跨团队任务派发失败';
+        const readableMessage = rawMessage.includes('Redis not configured')
+          ? '无法派发给其他团队：Redis 未配置或未连接。请先在设置里开启团队总线并配置 Redis。'
+          : rawMessage.includes('Distributed collaboration is not enabled')
+            ? '无法派发给其他团队：团队总线/分布式团队协作未开启。请先在设置里开启。'
+            : `无法派发给 ${toTeam}：${rawMessage}`;
+        addOptimisticTeamMessage(teamName, {
+          from: 'system',
+          to: 'user',
+          text: readableMessage,
+          timestamp: new Date(Date.now()).toISOString(),
+          read: true,
+          messageId: `optimistic-cross-team-error-${Date.now()}`,
+          source: 'system_notification',
+        });
+        window.dispatchEvent(new CustomEvent('collab:refresh'));
+        await refreshTeamMessagesHead(teamName);
+        return false;
+      }
+      window.dispatchEvent(new CustomEvent('collab:refresh'));
+      await refreshTeamMessagesHead(teamName);
+      window.setTimeout(() => {
+        void refreshTeamMessagesHead(teamName);
+      }, 300);
+      return true;
+    },
+    [
+      addOptimisticTeamMessage,
+      teamName,
+      refreshTeamMessagesHead,
+      selectedSessionKey,
+      sendCrossTeamMessage,
+    ]
   );
 
   const moveToInline = useCallback(() => {
@@ -869,6 +940,7 @@ export const MessagesPanel = memo(function MessagesPanel({
         onSessionChange={setSelectedSessionKey}
         textareaRef={composerTextareaRef}
         onSend={handleSend}
+        onDispatchTask={handleDispatchTaskToTeam}
       />
       <StatusBlock
         members={members}
@@ -1065,6 +1137,7 @@ export const MessagesPanel = memo(function MessagesPanel({
               onSessionChange={setSelectedSessionKey}
               textareaRef={composerTextareaRef}
               onSend={handleSend}
+              onDispatchTask={handleDispatchTaskToTeam}
             />
             <StatusBlock
               members={members}
@@ -1352,6 +1425,7 @@ export const MessagesPanel = memo(function MessagesPanel({
                     onSessionChange={setSelectedSessionKey}
                     textareaRef={composerTextareaRef}
                     onSend={handleSend}
+                    onDispatchTask={handleDispatchTaskToTeam}
                   />
                 </div>
               </div>

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

@@ -3,7 +3,6 @@ import { useEffect, useMemo, useState } from 'react';
 import { computePendingCrossTeamReplies } from '@renderer/utils/crossTeamPendingReplies';
 import { ChevronRight } from 'lucide-react';
 
-import { ActiveTasksBlock } from '../activity/ActiveTasksBlock';
 import { PendingRepliesBlock } from '../activity/PendingRepliesBlock';
 
 import type { InboxMessage, ResolvedTeamMember, TeamTaskWithKanban } from '@shared/types';
@@ -29,13 +28,10 @@ interface StatusBlockProps {
  */
 export const StatusBlock = ({
   members,
-  tasks,
   messages,
   pendingRepliesByMember,
-  position,
   layout = 'overlay',
   onMemberClick,
-  onTaskClick,
 }: StatusBlockProps): React.JSX.Element | null => {
   const [collapsed, setCollapsed] = useState(false);
   const [nowMs, setNowMs] = useState(() => Date.now());
@@ -50,21 +46,11 @@ export const StatusBlock = ({
     );
     return hasMemberPendingReplies || pendingCrossTeamReplies.length > 0;
   }, [members, pendingRepliesByMember, pendingCrossTeamReplies.length]);
-  const hasActiveTasks = useMemo(() => {
-    const tMap = new Map(tasks.map((t) => [t.id, t]));
-    return members.some((m) => {
-      if (!m.currentTaskId) return false;
-      const task = tMap.get(m.currentTaskId);
-      if (task && (task.reviewState === 'approved' || task.status === 'completed')) return false;
-      return true;
-    });
-  }, [members, tasks]);
 
   /** Whether the Status block has any visible items. */
   const hasItems = useMemo(() => {
-    if (hasPendingReplies) return true;
-    return hasActiveTasks;
-  }, [hasActiveTasks, hasPendingReplies]);
+    return hasPendingReplies;
+  }, [hasPendingReplies]);
 
   // Only run the 1-second timer when the block actually has content to show.
   useEffect(() => {
@@ -111,14 +97,6 @@ export const StatusBlock = ({
               onMemberClick={onMemberClick}
             />
           ) : null}
-          <ActiveTasksBlock
-            members={members}
-            tasks={tasks}
-            defaultCollapsed={position === 'sidebar'}
-            headerRight={!hasPendingReplies ? flowInlineToggle : undefined}
-            onMemberClick={onMemberClick}
-            onTaskClick={onTaskClick}
-          />
         </div>
       )}
     </>

package/src/renderer/components/team/schedule/ScheduleEmptyState.tsx

@@ -8,7 +8,7 @@ export const ScheduleEmptyState = (): React.JSX.Element => (
     <div className="space-y-1">
       <p className="text-xs font-medium text-[var(--color-text-secondary)]">暂无定时计划</p>
       <p className="text-[11px] text-[var(--color-text-muted)]">
-        创建计划后，可按 cron 时间自动运行团队任务。
+        创建计划后，可按 cron 时间自动运行团队。
       </p>
     </div>
   </div>

package/src/renderer/components/terminal/TerminalPanel.tsx

@@ -0,0 +1,156 @@
+/**
+ * TerminalPanel — a good-looking, read-only terminal-style panel for rendering
+ * command / CLI output faithfully.
+ *
+ * Unlike the structured markdown renderers, this preserves the raw terminal feel:
+ *   - full ANSI color / decoration fidelity (via `anser`)
+ *   - monospace, whitespace-exact output
+ *   - carriage-return (\r) overwrite handling so progress bars settle to their
+ *     final frame instead of dumping every intermediate line
+ *   - optional `$ command` prompt line so a Bash call reads like a real terminal
+ *
+ * It is intentionally lightweight (no xterm.js / node-pty): the session view is a
+ * read-only viewer of recorded output, so we only need faithful rendering, not a
+ * live PTY.
+ */
+
+import { useMemo, useState } from 'react';
+
+import Anser, { type AnserJsonEntry } from 'anser';
+import { Check, Copy } from 'lucide-react';
+
+interface TerminalPanelProps {
+  /** Raw output text, may contain ANSI escape sequences. */
+  text: string;
+  /** Optional command to render as a `$ command` prompt line above the output. */
+  command?: string;
+  /** Optional label shown in the header bar (e.g. a short description). */
+  title?: string;
+  /** Max body height in px before scrolling. Defaults to 384. */
+  maxHeight?: number;
+  className?: string;
+}
+
+/**
+ * Collapse carriage-return overwrites within each line and strip non-color
+ * escape sequences (cursor moves, screen clears, OSC) that would otherwise
+ * render as garbage. SGR color codes are left intact for `anser`.
+ */
+function normalizeTerminalText(raw: string): string {
+  // Strip OSC sequences: ESC ] ... BEL  or  ESC ] ... ESC \
+  let out = raw.replace(/\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g, '');
+  // Strip CSI sequences that are NOT SGR ("m"): cursor movement, erase, etc.
+  out = out.replace(/\x1b\[[0-9;?]*[A-Za-ln-z]/g, '');
+  // Collapse \r overwrites per line: later segments overwrite earlier from col 0.
+  out = out
+    .split('\n')
+    .map((line) => {
+      if (!line.includes('\r')) return line;
+      let acc = '';
+      for (const seg of line.split('\r')) {
+        acc = seg.length >= acc.length ? seg : seg + acc.slice(seg.length);
+      }
+      return acc;
+    })
+    .join('\n');
+  return out;
+}
+
+function styleForSegment(seg: AnserJsonEntry): React.CSSProperties {
+  const style: React.CSSProperties = {};
+  if (seg.fg) style.color = `rgb(${seg.fg})`;
+  if (seg.bg) style.backgroundColor = `rgb(${seg.bg})`;
+  const decorations = seg.decorations ?? [];
+  if (decorations.includes('bold')) style.fontWeight = 600;
+  if (decorations.includes('italic')) style.fontStyle = 'italic';
+  if (decorations.includes('underline')) style.textDecoration = 'underline';
+  if (decorations.includes('dim')) style.opacity = 0.6;
+  return style;
+}
+
+const MONO_FONT =
+  'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace';
+
+export const TerminalPanel = ({
+  text,
+  command,
+  title,
+  maxHeight = 384,
+  className,
+}: TerminalPanelProps): React.JSX.Element => {
+  const [copied, setCopied] = useState(false);
+
+  const segments = useMemo<AnserJsonEntry[]>(
+    () =>
+      Anser.ansiToJson(normalizeTerminalText(text ?? ''), {
+        json: true,
+        use_classes: false,
+        remove_empty: false,
+      }),
+    [text]
+  );
+
+  const handleCopy = (): void => {
+    const payload = command ? `$ ${command}\n${text ?? ''}` : (text ?? '');
+    void navigator.clipboard?.writeText(payload).then(() => {
+      setCopied(true);
+      setTimeout(() => setCopied(false), 1500);
+    });
+  };
+
+  return (
+    <div
+      className={`overflow-hidden rounded-lg border ${className ?? ''}`}
+      style={{ borderColor: 'rgba(255,255,255,0.08)', backgroundColor: '#0c0c0f' }}
+    >
+      {/* Header / window chrome */}
+      <div
+        className="flex items-center gap-2 px-3 py-1.5"
+        style={{
+          backgroundColor: '#16161b',
+          borderBottom: '1px solid rgba(255,255,255,0.06)',
+        }}
+      >
+        <span className="flex items-center gap-1.5">
+          <span className="size-2.5 rounded-full" style={{ backgroundColor: '#ff5f57' }} />
+          <span className="size-2.5 rounded-full" style={{ backgroundColor: '#febc2e' }} />
+          <span className="size-2.5 rounded-full" style={{ backgroundColor: '#28c840' }} />
+        </span>
+        <span
+          className="ml-1 flex-1 truncate text-[11px]"
+          style={{ color: 'rgba(255,255,255,0.45)', fontFamily: MONO_FONT }}
+        >
+          {title ?? (command ? command : 'terminal')}
+        </span>
+        <button
+          type="button"
+          onClick={handleCopy}
+          className="flex items-center gap-1 rounded px-1.5 py-0.5 text-[10px] transition-colors"
+          style={{ color: 'rgba(255,255,255,0.45)' }}
+          title="复制"
+        >
+          {copied ? <Check className="size-3" /> : <Copy className="size-3" />}
+          {copied ? '已复制' : '复制'}
+        </button>
+      </div>
+
+      {/* Body */}
+      <pre
+        className="overflow-auto whitespace-pre-wrap break-all px-3 py-2.5 text-xs leading-relaxed"
+        style={{ maxHeight, fontFamily: MONO_FONT, color: '#d4d4d4', margin: 0 }}
+      >
+        {command && (
+          <div className="mb-1">
+            <span style={{ color: '#28c840' }}>$ </span>
+            <span style={{ color: '#e8e8e8' }}>{command}</span>
+          </div>
+        )}
+        {segments.map((seg, i) => (
+          <span key={i} style={styleForSegment(seg)}>
+            {seg.content}
+          </span>
+        ))}
+      </pre>
+    </div>
+  );
+};

package/src/renderer/components/ui/MentionableTextarea.tsx

@@ -1069,7 +1069,6 @@ export const MentionableTextarea = React.forwardRef<HTMLTextAreaElement, Mention
     const rotatingTips = React.useMemo(
       () => [
         'Tips：输入 @ 可提及成员、团队或文件，输入 # 可引用任务。',
-        'Tips：输入“创建任务”可以把事项加入任务看板。',
         'Tips：不要把所有工作都堆给团队负责人，可以让负责人分配给合适的成员。',
         ...extraTips,
       ],

package/src/renderer/hooks/useExtensionsTabState.ts

@@ -16,7 +16,7 @@ import type {
   PluginSortField,
 } from '@shared/types/extensions';
 
-export type ExtensionsSubTab = 'plugins' | 'mcp-servers' | 'skills' | 'api-keys';
+export type ExtensionsSubTab = 'plugins' | 'mcp-servers' | 'skills' | 'env-vars';
 export type SkillsSortState = 'name-asc' | 'recent-desc';
 
 interface PluginSortState {
@@ -33,7 +33,7 @@ const DEFAULT_FILTERS: PluginFilters = {
 
 export function useExtensionsTabState() {
   // ── Sub-tab navigation ──
-  const [activeSubTab, setActiveSubTab] = useState<ExtensionsSubTab>('mcp-servers');
+  const [activeSubTab, setActiveSubTab] = useState<ExtensionsSubTab>('plugins');
 
   // ── Plugin filters & sort ──
   const [pluginFilters, setPluginFilters] = useState<PluginFilters>(DEFAULT_FILTERS);