@yancyyu/openhermit 1.6.28 → 1.6.29

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

@@ -211,6 +211,7 @@ export const MessagesPanel = memo(function MessagesPanel({
     messagesState,
     loadOlderTeamMessages,
     refreshTeamMessagesHead,
+    addOptimisticTeamMessage,
   } = useStore(
     useShallow((s) => ({
       sendTeamMessage: s.sendTeamMessage,
@@ -226,6 +227,7 @@ export const MessagesPanel = memo(function MessagesPanel({
       messagesState: teamName ? s.teamMessagesByName[teamName] : undefined,
       loadOlderTeamMessages: s.loadOlderTeamMessages,
       refreshTeamMessagesHead: s.refreshTeamMessagesHead,
+      addOptimisticTeamMessage: s.addOptimisticTeamMessage,
     }))
   );
   const bootstrapHeadRefreshAttemptedForTeamRef = useRef<string | null>(null);
@@ -534,7 +536,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 +733,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 +936,7 @@ export const MessagesPanel = memo(function MessagesPanel({
         onSessionChange={setSelectedSessionKey}
         textareaRef={composerTextareaRef}
         onSend={handleSend}
+        onDispatchTask={handleDispatchTaskToTeam}
       />
       <StatusBlock
         members={members}
@@ -1065,6 +1133,7 @@ export const MessagesPanel = memo(function MessagesPanel({
               onSessionChange={setSelectedSessionKey}
               textareaRef={composerTextareaRef}
               onSend={handleSend}
+              onDispatchTask={handleDispatchTaskToTeam}
             />
             <StatusBlock
               members={members}
@@ -1352,6 +1421,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/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/store/slices/scheduleSlice.ts

@@ -39,6 +39,9 @@ export interface ScheduleSlice {
 
   /** Open a standalone Schedules tab (or focus existing) */
   openSchedulesTab(): void;
+
+  /** Open the standalone task overview tab. */
+  openTasksTab(): void;
 }
 
 // =============================================================================
@@ -246,4 +249,22 @@ export const createScheduleSlice: StateCreator<AppState, [], [], ScheduleSlice>
     // Ensure schedules are fresh when opening
     void get().fetchSchedules();
   },
+
+  openTasksTab: () => {
+    const state = get();
+    const focusedPane = state.paneLayout.panes.find((p) => p.id === state.paneLayout.focusedPaneId);
+    const existingTab = focusedPane?.tabs.find((tab) => tab.type === 'tasks');
+    if (existingTab) {
+      state.setActiveTab(existingTab.id);
+      return;
+    }
+
+    state.openTab({
+      type: 'tasks',
+      label: '任务',
+    });
+
+    void get().fetchAllTasks();
+    void get().fetchSchedules();
+  },
 });

package/src/renderer/store/slices/teamSlice.ts

@@ -2067,6 +2067,7 @@ export interface TeamSlice {
     delayMs?: number
   ) => void;
   sendTeamMessage: (teamName: string, request: SendMessageRequest) => Promise<SendMessageResult>;
+  addOptimisticTeamMessage: (teamName: string, message: InboxMessage) => void;
   crossTeamTargets: {
     teamName: string;
     displayName: string;
@@ -3988,6 +3989,39 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
   },
 
   sendTeamMessage: async (teamName: string, request: SendMessageRequest) => {
+    const optimisticMessageId =
+      request.messageId ?? `optimistic-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+    const optimisticTimestamp = request.timestamp ?? nowIso();
+    const requestWithMessageId: SendMessageRequest = {
+      ...request,
+      messageId: optimisticMessageId,
+      timestamp: optimisticTimestamp,
+    };
+    const optimisticMessage: InboxMessage = {
+      from: requestWithMessageId.from ?? 'user',
+      to: requestWithMessageId.to ?? requestWithMessageId.member,
+      text: requestWithMessageId.text,
+      timestamp: optimisticTimestamp,
+      read: true,
+      taskRefs: requestWithMessageId.taskRefs?.length ? requestWithMessageId.taskRefs : undefined,
+      actionMode: requestWithMessageId.actionMode,
+      summary: requestWithMessageId.summary,
+      color: requestWithMessageId.color,
+      messageId: optimisticMessageId,
+      relayOfMessageId: requestWithMessageId.relayOfMessageId,
+      source: requestWithMessageId.source ?? 'user_sent',
+      attachments: requestWithMessageId.attachments?.length
+        ? requestWithMessageId.attachments
+        : undefined,
+      leadSessionId: requestWithMessageId.leadSessionId,
+      conversationId: requestWithMessageId.conversationId,
+      replyToConversationId: requestWithMessageId.replyToConversationId,
+      toolSummary: requestWithMessageId.toolSummary,
+      toolCalls: requestWithMessageId.toolCalls,
+      messageKind: requestWithMessageId.messageKind,
+      slashCommand: requestWithMessageId.slashCommand,
+      commandOutput: requestWithMessageId.commandOutput,
+    };
     set({
       sendingMessage: true,
       sendMessageError: null,
@@ -3995,35 +4029,25 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
       sendMessageDebugDetails: null,
       lastSendMessageResult: null,
     });
+    set((state) => ({
+      teamMessagesByName: {
+        ...state.teamMessagesByName,
+        [teamName]: upsertOptimisticTeamMessage(
+          getTeamMessagesCacheEntry(state, teamName),
+          optimisticMessage
+        ),
+      },
+    }));
     try {
       const result = await unwrapIpc('team:sendMessage', () =>
-        api.teams.sendMessage(teamName, request)
+        api.teams.sendMessage(teamName, requestWithMessageId)
       );
       const runtimeDeliveryFailed =
         result.runtimeDelivery?.attempted === true && result.runtimeDelivery.delivered === false;
       const runtimeDeliveryDiagnostics = buildOpenCodeRuntimeDeliveryDiagnostics(result);
-      const optimisticMessage: InboxMessage = {
-        from: request.from ?? 'user',
-        to: request.to ?? request.member,
-        text: request.text,
-        timestamp: request.timestamp ?? nowIso(),
-        read: true,
-        taskRefs: request.taskRefs?.length ? request.taskRefs : undefined,
-        actionMode: request.actionMode,
-        summary: request.summary,
-        color: request.color,
+      const confirmedOptimisticMessage: InboxMessage = {
+        ...optimisticMessage,
         messageId: result.messageId,
-        relayOfMessageId: request.relayOfMessageId,
-        source: request.source ?? 'user_sent',
-        attachments: request.attachments?.length ? request.attachments : undefined,
-        leadSessionId: request.leadSessionId,
-        conversationId: request.conversationId,
-        replyToConversationId: request.replyToConversationId,
-        toolSummary: request.toolSummary,
-        toolCalls: request.toolCalls,
-        messageKind: request.messageKind,
-        slashCommand: request.slashCommand,
-        commandOutput: request.commandOutput,
       };
       set((state) => ({
         sendingMessage: false,
@@ -4035,7 +4059,7 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
           ...state.teamMessagesByName,
           [teamName]: upsertOptimisticTeamMessage(
             getTeamMessagesCacheEntry(state, teamName),
-            optimisticMessage
+            confirmedOptimisticMessage
           ),
         },
       }));
@@ -4053,6 +4077,18 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
     }
   },
 
+  addOptimisticTeamMessage: (teamName: string, message: InboxMessage) => {
+    set((state) => ({
+      teamMessagesByName: {
+        ...state.teamMessagesByName,
+        [teamName]: upsertOptimisticTeamMessage(
+          getTeamMessagesCacheEntry(state, teamName),
+          message
+        ),
+      },
+    }));
+  },
+
   fetchCrossTeamTargets: async () => {
     set({ crossTeamTargetsLoading: true });
     try {

package/src/renderer/types/tabs.ts

@@ -86,6 +86,7 @@ export interface Tab {
     | 'report'
     | 'extensions'
     | 'schedules'
+    | 'tasks'
     | 'graph';
 
   /** Session ID (required when type === 'session') */

package/src/shared/types/api.ts

@@ -46,6 +46,7 @@ import type {
   BoardTaskExactLogSummariesResponse,
   BoardTaskLogStreamResponse,
   BoardTaskLogStreamSummary,
+  CollabTask,
   CreateTaskRequest,
   CrossTeamMessage,
   CrossTeamSendRequest,
@@ -723,6 +724,33 @@ export interface CrossTeamAPI {
   getOutbox: (teamName: string) => Promise<CrossTeamMessage[]>;
 }
 
+// =============================================================================
+// Collaboration Board API
+// =============================================================================
+
+export interface CollabBoardAPI {
+  getBoard: () => Promise<{ tasks: CollabTask[] }>;
+  getTask: (dispatchId: string) => Promise<{ task: CollabTask }>;
+  getEvents: (dispatchId: string) => Promise<{ events: import('./team').CollabTaskEvent[] }>;
+  accept: (teamSlug: string, dispatchId: string) => Promise<{ ok: boolean; taskId: string }>;
+  reject: (teamSlug: string, dispatchId: string, reason?: string) => Promise<{ ok: boolean }>;
+  deliver: (teamSlug: string, dispatchId: string, result: string) => Promise<{ ok: boolean }>;
+  approve: (teamSlug: string, dispatchId: string) => Promise<{ ok: boolean }>;
+  revision: (teamSlug: string, dispatchId: string, feedback: string) => Promise<{ ok: boolean }>;
+  dispatch: (
+    fromTeam: string,
+    toTeam: string,
+    subject: string,
+    opts?: {
+      description?: string;
+      deadlineMinutes?: number;
+      needsHumanReview?: boolean;
+      messageId?: string;
+      sessionKey?: string;
+    }
+  ) => Promise<{ ok: boolean; dispatchId: string; status: string; message: string }>;
+}
+
 // =============================================================================
 // Schedule API
 // =============================================================================
@@ -1060,6 +1088,7 @@ export interface ElectronAPI extends RecentProjectsElectronApi {
 
   // Cross-Team Communication API
   crossTeam: CrossTeamAPI;
+  collab: CollabBoardAPI;
 
   // Review API
   review: ReviewAPI;

package/src/shared/types/team.ts

@@ -133,6 +133,9 @@ export type TeamReviewState = 'none' | 'review' | 'needsFix' | 'approved';
 
 export type DispatchStatus =
   | 'dispatched'
+  | 'pending_accept'
+  | 'accepted'
+  | 'rejected'
   | 'received'
   | 'in_progress'
   | 'completed'
@@ -148,6 +151,15 @@ export interface DispatchMeta {
   receivedAt?: string;
   completedAt?: string;
   remoteTaskId?: string;
+  deadline?: string;
+  acceptedAt?: string;
+  rejectedAt?: string;
+  rejectionReason?: string;
+}
+
+export interface AgentCapability {
+  skill: string;
+  description: string;
 }
 
 export interface DiscoverableTeam {
@@ -156,6 +168,9 @@ export interface DiscoverableTeam {
   location: 'local' | 'remote';
   status: 'online' | 'offline';
   collaboration: boolean;
+  capabilities?: AgentCapability[];
+  description?: string;
+  harness?: string;
 }
 
 export interface TaskBusConfig {
@@ -166,8 +181,10 @@ export interface TaskBusConfig {
     password?: string;
     db?: number;
   };
+  collaboration?: boolean;
   telemetry?: {
     enabled: boolean;
+    uploadEnabled?: boolean;
     /** Data source platform. Currently only 'claudecode'. */
     platform: 'claudecode';
   };
@@ -185,6 +202,8 @@ export interface TaskDispatchPayload {
     promptTaskRefs?: string[];
   };
   dispatchedAt: string;
+  deadline?: string;
+  needsHumanReview?: boolean;
 }
 
 export interface TaskStatusUpdate {
@@ -203,6 +222,81 @@ export interface TaskAckPayload {
   timestamp: string;
 }
 
+export interface TaskHandshakeResponse {
+  dispatchId: string;
+  type: 'task_accept' | 'task_reject' | 'task_deliver' | 'task_approve' | 'task_revision';
+  fromTeam: string;
+  toTeam: string;
+  remoteTaskId?: string;
+  reason?: string;
+  result?: string;
+  feedback?: string;
+  acceptedAt?: string;
+  rejectedAt?: string;
+  deliveredAt?: string;
+  approvedAt?: string;
+}
+
+// ---------------------------------------------------------------------------
+// Collaboration Board — global cross-team task view
+// ---------------------------------------------------------------------------
+
+export type CollabTaskStatus =
+  | 'pending_accept'
+  | 'accepted'
+  | 'delivered'
+  | 'approved'
+  | 'revision'
+  | 'rejected'
+  | 'failed';
+
+export type CollabTaskEventType =
+  | 'task_sent'
+  | 'task_accepted'
+  | 'task_rejected'
+  | 'task_delivered'
+  | 'revision_requested'
+  | 'task_approved'
+  | 'task_failed';
+
+export interface CollabTaskEvent {
+  eventId: string;
+  dispatchId: string;
+  version: number;
+  type: CollabTaskEventType;
+  actor: {
+    type: 'user' | 'team' | 'agent' | 'system';
+    id: string;
+  };
+  payload?: Record<string, unknown>;
+  createdAt: string;
+}
+
+export interface CollabTask {
+  id: string;
+  dispatchId: string;
+  subject: string;
+  description?: string;
+  fromTeam: string;
+  fromTeamDisplay: string;
+  toTeam: string;
+  toTeamDisplay: string;
+  status: CollabTaskStatus;
+  version?: number;
+  reason?: string;
+  result?: string;
+  feedback?: string;
+  deadline?: string;
+  needsHumanReview: boolean;
+  revisionCount: number;
+  createdAt: string;
+  updatedAt: string;
+  acceptedAt?: string;
+  rejectedAt?: string;
+  deliveredAt?: string;
+  approvedAt?: string;
+}
+
 export interface TaskWorkInterval {
   /** ISO timestamp when task entered in_progress */
   startedAt: string;
@@ -863,7 +957,15 @@ export type TeamLaunchAggregateState =
   | 'partial_skipped';
 export type PersistedTeamLaunchPhase = 'active' | 'finished' | 'reconciled';
 
-export type KanbanColumnId = 'todo' | 'in_progress' | 'done' | 'review' | 'approved';
+export type KanbanColumnId =
+  | 'todo'
+  | 'in_progress'
+  | 'done'
+  | 'review'
+  | 'approved'
+  | 'pending_accept'
+  | 'delivered'
+  | 'revision';
 
 export interface KanbanTaskState {
   column: Extract<KanbanColumnId, 'review' | 'approved'>;
@@ -1699,6 +1801,7 @@ export interface CrossTeamSendRequest {
   toTeam: string;
   timestamp?: string;
   messageId?: string;
+  sessionKey?: string;
   conversationId?: string;
   replyToConversationId?: string;
   text: string;