@yancyyu/openhermit 1.6.28 → 1.6.29

package/src/main/services/teams-mvp/TeamProvisioningService.ts

@@ -24,6 +24,26 @@ import {
 } from './TeamWorkspaceService';
 
 const logger = createLogger('TeamProvisioningService');
+const TEAM_INSTRUCTIONS_BEGIN = '<!-- hermit:team-collaboration:start -->';
+const TEAM_INSTRUCTIONS_END = '<!-- hermit:team-collaboration:end -->';
+
+function removeSectionByHeading(content: string, heading: string): string {
+  const escapedHeading = heading.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  return content.replace(
+    new RegExp(`\\n{0,2}## ${escapedHeading}\\n[\\s\\S]*?(?=\\n## |\\s*$)`, 'g'),
+    ''
+  );
+}
+
+function removeManagedTeamInstructions(content: string): string {
+  let next = content.replace(
+    new RegExp(`\\n{0,2}${TEAM_INSTRUCTIONS_BEGIN}[\\s\\S]*?${TEAM_INSTRUCTIONS_END}\\n?`, 'g'),
+    '\n'
+  );
+  next = removeSectionByHeading(next, 'Agent Collaboration (Hermit)');
+  next = removeSectionByHeading(next, 'Cross-Team Task Dispatch (Hermit)');
+  return next.replace(/\n{3,}/g, '\n\n').trimEnd();
+}
 
 export class TeamProvisioningService {
   private readonly workspace: TeamWorkspaceService;
@@ -77,8 +97,6 @@ export class TeamProvisioningService {
       }
     }
 
-    await this.injectTeamInstructions(manifest.workDir, slug);
-
     return { slug, manifest };
   }
 
@@ -244,25 +262,33 @@ export class TeamProvisioningService {
 
   async injectTeamInstructions(workDir: string, teamSlug: string): Promise<void> {
     const mdPath = path.join(workDir, 'CLAUDE.md');
+    const teams = await this.workspace.listTeams().catch(() => []);
+    const availableTeams = teams
+      .filter((team) => team.slug !== teamSlug)
+      .map((team) => {
+        const label =
+          team.displayName && team.displayName !== team.slug
+            ? `${team.slug} (${team.displayName})`
+            : team.slug;
+        return team.description ? `- ${label}: ${team.description}` : `- ${label}`;
+      });
     const section = `
 
-## Cross-Team Task Dispatch (Hermit)
+${TEAM_INSTRUCTIONS_BEGIN}
 
-You can dispatch tasks to other teams via the Hermit local API:
-
-- **List available teams**: \`curl -s http://127.0.0.1:5680/api/cross-team/targets\`
-- **Dispatch a task**: \`curl -s -X POST http://127.0.0.1:5680/api/cross-team/send -H 'Content-Type: application/json' -d '{"fromTeam":"${teamSlug}","toTeam":"TARGET_TEAM","subject":"Task title","description":"Optional description"}'\`
+## Hermit Team Context
 
 Current team slug: \`${teamSlug}\`
 
-When to dispatch:
-- Task requires access to a different codebase/project
-- Task explicitly mentions another team's domain
-- Task is blocked by work owned by another team
+Available teams:
+${availableTeams.length > 0 ? availableTeams.join('\n') : '- No other teams currently registered.'}
+
+Cross-team work is routed by Hermit itself. If the user mentions another team with \`@team\`,
+Hermit will create and track the cross-team collaboration task automatically.
 
-Do NOT dispatch:
-- Task is within current team's project scope
-- Task can be completed with available tools
+Do not call cross-team dispatch APIs yourself and do not invent dispatch IDs.
+You may use the team list only to understand which teams exist and when a user is referring to one.
+${TEAM_INSTRUCTIONS_END}
 `;
 
     try {
@@ -273,11 +299,8 @@ Do NOT dispatch:
         // File doesn't exist yet
       }
 
-      if (existing.includes('Cross-Team Task Dispatch (Hermit)')) {
-        return;
-      }
-
-      await fs.promises.writeFile(mdPath, existing + section, 'utf8');
+      const cleaned = removeManagedTeamInstructions(existing);
+      await fs.promises.writeFile(mdPath, `${cleaned}${section}`, 'utf8');
       logger.info(`injected team instructions → ${mdPath}`);
     } catch (err) {
       logger.warn(
@@ -285,4 +308,20 @@ Do NOT dispatch:
       );
     }
   }
+
+  async removeTeamInstructions(workDir: string): Promise<void> {
+    const mdPath = path.join(workDir, 'CLAUDE.md');
+    try {
+      const existing = await fs.promises.readFile(mdPath, 'utf8');
+      const cleaned = removeManagedTeamInstructions(existing);
+      if (cleaned === existing.trimEnd()) return;
+      await fs.promises.writeFile(mdPath, cleaned ? `${cleaned}\n` : '', 'utf8');
+      logger.info(`removed team instructions → ${mdPath}`);
+    } catch (err) {
+      if ((err as NodeJS.ErrnoException).code === 'ENOENT') return;
+      logger.warn(
+        `Team instructions removal failed: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  }
 }

package/src/main/services/teams-mvp/TeamWorkspaceService.ts

@@ -224,7 +224,23 @@ export class TeamWorkspaceService {
   async readTeamManifest(teamSlug: string): Promise<TeamManifest> {
     const root = teamRoot(teamSlug);
     const manifest = await readJson<TeamManifest | null>(path.join(root, 'team.json'), null);
-    if (!manifest) throw new Error(`团队 "${teamSlug}" 不存在 (${root})`);
+    if (!manifest) {
+      if (!(await pathExists(root))) {
+        throw new Error(`团队 "${teamSlug}" 不存在 (${root})`);
+      }
+      const stat = await fs.promises.stat(root).catch(() => null);
+      return {
+        schemaVersion: 2,
+        slug: teamSlug,
+        displayName: teamSlug,
+        bindProject: teamSlug,
+        harness: 'claudecode',
+        workDir: '',
+        collaboration: true,
+        rootPath: root,
+        createdAt: (stat?.birthtime ?? stat?.mtime ?? new Date()).toISOString(),
+      };
+    }
     return manifest;
   }
 
@@ -359,7 +375,13 @@ export class TeamWorkspaceService {
 
   async createTask(
     teamSlug: string,
-    payload: { title: string; description?: string; assignee?: string | null; status?: TaskStatus }
+    payload: {
+      title: string;
+      description?: string;
+      assignee?: string | null;
+      status?: TaskStatus;
+      dispatchMeta?: import('@shared/types/team').DispatchMeta;
+    }
   ): Promise<Task> {
     if (!payload?.title) throw new Error('title is required');
     const board = await this.readBoard(teamSlug);
@@ -378,6 +400,7 @@ export class TeamWorkspaceService {
       createdAt: now,
       updatedAt: now,
       order,
+      dispatchMeta: payload.dispatchMeta,
     };
     board.tasks = [...(board.tasks || []), task];
     await this.writeBoard(teamSlug, board);

package/src/main/services/teams-mvp/index.ts

@@ -4,6 +4,7 @@
  * 设计：一个 Team = 一个 cc-connect project，无 Member 子层级。
  * - TeamWorkspaceService: 本地目录管理（team.json / messages / tasks/board.json）
  * - TeamProvisioningService: 组合 cc-connect，含 Task Dispatcher
+ * - CollaborationBoardService: 全局协作看板数据管理
  */
 
 export {
@@ -24,3 +25,5 @@ export type {
 } from './TeamWorkspaceService';
 
 export { TeamProvisioningService } from './TeamProvisioningService';
+
+export { CollaborationBoardService } from './CollaborationBoardService';

package/src/renderer/App.tsx

@@ -52,6 +52,8 @@ function buildPathForTab(activeTab: Tab | null): string {
       return '/extensions';
     case 'schedules':
       return '/schedules';
+    case 'tasks':
+      return '/tasks';
     case 'dashboard':
       return '/dashboard';
     case 'session': {
@@ -149,6 +151,9 @@ function useTabPathPersistence() {
       case 'schedules':
         state.openSchedulesTab();
         break;
+      case 'tasks':
+        state.openTasksTab();
+        break;
       case 'dashboard':
         state.openDashboard();
         break;

package/src/renderer/api/httpClient.ts

@@ -99,6 +99,7 @@ import type {
   TeamAgentRuntimeSnapshot,
   CcSession,
   CcSessionDetail,
+  CollabTask,
 } from '@shared/types';
 
 import type {
@@ -1632,6 +1633,72 @@ export class HttpAPIClient implements ElectronAPI {
       this.get<CrossTeamMessage[]>(`/api/cross-team/outbox/${encodeURIComponent(teamName)}`),
   };
 
+  // Collaboration board API
+  collab = {
+    getBoard: () => this.get<{ tasks: CollabTask[] }>('/api/collab/board'),
+    getTask: (dispatchId: string) =>
+      this.get<{ task: CollabTask }>(`/api/collab/board/${encodeURIComponent(dispatchId)}`),
+    getEvents: (dispatchId: string) =>
+      this.get<{ events: import('@shared/types/team').CollabTaskEvent[] }>(
+        `/api/collab/board/${encodeURIComponent(dispatchId)}/events`
+      ),
+    accept: (teamSlug: string, dispatchId: string) =>
+      this.post<{ ok: boolean; taskId: string }>('/api/cross-team/accept', {
+        team_slug: teamSlug,
+        dispatch_id: dispatchId,
+      }),
+    reject: (teamSlug: string, dispatchId: string, reason?: string) =>
+      this.post<{ ok: boolean }>('/api/cross-team/reject', {
+        team_slug: teamSlug,
+        dispatch_id: dispatchId,
+        reason,
+      }),
+    deliver: (teamSlug: string, dispatchId: string, result: string) =>
+      this.post<{ ok: boolean }>('/api/cross-team/deliver', {
+        team_slug: teamSlug,
+        dispatch_id: dispatchId,
+        result,
+      }),
+    approve: (teamSlug: string, dispatchId: string) =>
+      this.post<{ ok: boolean }>('/api/cross-team/approve', {
+        team_slug: teamSlug,
+        dispatch_id: dispatchId,
+      }),
+    revision: (teamSlug: string, dispatchId: string, feedback: string) =>
+      this.post<{ ok: boolean }>('/api/cross-team/revision', {
+        team_slug: teamSlug,
+        dispatch_id: dispatchId,
+        feedback,
+      }),
+    dispatch: (
+      fromTeam: string,
+      toTeam: string,
+      subject: string,
+      opts?: {
+        description?: string;
+        deadlineMinutes?: number;
+        needsHumanReview?: boolean;
+        messageId?: string;
+        sessionKey?: string;
+      }
+    ) =>
+      this.post<{
+        ok: boolean;
+        dispatchId: string;
+        status: string;
+        message: string;
+      }>('/api/cross-team/send', {
+        fromTeam,
+        toTeam,
+        subject,
+        description: opts?.description,
+        deadlineMinutes: opts?.deadlineMinutes,
+        needsHumanReview: opts?.needsHumanReview,
+        messageId: opts?.messageId,
+        sessionKey: opts?.sessionKey,
+      }),
+  };
+
   // Review API
   review = {
     getAgentChanges: async (teamName: string, memberName: string) => {

package/src/renderer/components/layout/PaneContent.tsx

@@ -12,6 +12,7 @@ import { NotificationsView } from '../notifications/NotificationsView';
 import { SessionReportTab } from '../report/SessionReportTab';
 import { SchedulesView } from '../schedules/SchedulesView';
 import { SettingsView } from '../settings/SettingsView';
+import { TasksView } from '../tasks/TasksView';
 import { TeamDetailView } from '../team/TeamDetailView';
 import { TeamListView } from '../team/TeamListView';
 
@@ -67,6 +68,7 @@ export const PaneContent = ({ pane, isPaneFocused }: PaneContentProps): React.JS
               </TabUIProvider>
             )}
             {tab.type === 'schedules' && <SchedulesView />}
+            {tab.type === 'tasks' && <TasksView />}
             {tab.type === 'graph' && (
               <TabUIProvider tabId={tab.id}>
                 <TeamGraphTab

package/src/renderer/components/layout/SortableTab.tsx

@@ -59,6 +59,7 @@ const TAB_ICONS = {
   report: Activity,
   extensions: Puzzle,
   schedules: Calendar,
+  tasks: Calendar,
   graph: Network,
 } as const;
 

package/src/renderer/components/layout/TabBarActions.tsx

@@ -9,7 +9,7 @@ import { useMemo, useState } from 'react';
 import { api } from '@renderer/api';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/components/ui/tooltip';
 import { useStore } from '@renderer/store';
-import { Calendar, PanelRight, Puzzle, Users } from 'lucide-react';
+import { ListTodo, PanelRight, Puzzle, Users } from 'lucide-react';
 import { useShallow } from 'zustand/react/shallow';
 
 import { MoreMenu } from './MoreMenu';
@@ -18,7 +18,7 @@ export const TabBarActions = (): React.JSX.Element => {
   const {
     unreadCount,
     openExtensionsTab,
-    openSchedulesTab,
+    openTasksTab,
     openTeamsTab,
     activeTabId,
     openTabs,
@@ -29,7 +29,7 @@ export const TabBarActions = (): React.JSX.Element => {
     useShallow((s) => ({
       unreadCount: s.unreadCount,
       openExtensionsTab: s.openExtensionsTab,
-      openSchedulesTab: s.openSchedulesTab,
+      openTasksTab: s.openTasksTab,
       openTeamsTab: s.openTeamsTab,
       activeTabId: s.activeTabId,
       openTabs: s.openTabs,
@@ -42,7 +42,7 @@ export const TabBarActions = (): React.JSX.Element => {
   // Hover states for buttons
   const [teamsHover, setTeamsHover] = useState(false);
   const [extensionsHover, setExtensionsHover] = useState(false);
-  const [schedulesHover, setSchedulesHover] = useState(false);
+  const [tasksHover, setTasksHover] = useState(false);
   const [githubHover, setGithubHover] = useState(false);
   const [expandHover, setExpandHover] = useState(false);
 
@@ -102,20 +102,20 @@ export const TabBarActions = (): React.JSX.Element => {
       <Tooltip>
         <TooltipTrigger asChild>
           <button
-            onClick={openSchedulesTab}
-            onMouseEnter={() => setSchedulesHover(true)}
-            onMouseLeave={() => setSchedulesHover(false)}
+            onClick={openTasksTab}
+            onMouseEnter={() => setTasksHover(true)}
+            onMouseLeave={() => setTasksHover(false)}
             className="rounded-md p-2 transition-colors"
             style={{
-              color: schedulesHover ? 'var(--color-text)' : 'var(--color-text-muted)',
-              backgroundColor: schedulesHover ? 'var(--color-surface-raised)' : 'transparent',
+              color: tasksHover ? 'var(--color-text)' : 'var(--color-text-muted)',
+              backgroundColor: tasksHover ? 'var(--color-surface-raised)' : 'transparent',
             }}
-            aria-label="定时任务"
+            aria-label="任务"
           >
-            <Calendar className="size-4" />
+            <ListTodo className="size-4" />
           </button>
         </TooltipTrigger>
-        <TooltipContent side="bottom">定时任务</TooltipContent>
+        <TooltipContent side="bottom">任务</TooltipContent>
       </Tooltip>
 
       {/* GitHub link */}

package/src/renderer/components/schedules/SchedulesView.tsx

@@ -74,9 +74,9 @@ const ScheduleListItem = ({
   }, [expanded, runs.length, runsLoading, fetchRunHistory, schedule.id]);
 
   return (
-    <div className="rounded-lg border border-[var(--color-border)] bg-[var(--color-surface)] font-sans">
+    <div className="rounded-xl border border-[var(--color-border-subtle)] bg-white/[0.025] font-sans shadow-[0_14px_32px_rgba(0,0,0,0.14)] transition-colors hover:border-[var(--color-border-emphasis)] hover:bg-white/[0.04]">
       {/* Main row */}
-      <div className="flex items-center gap-3 px-4 py-3">
+      <div className="flex items-center gap-3 px-4 py-3.5">
         {/* Expand toggle */}
         <button
           type="button"
@@ -106,7 +106,7 @@ const ScheduleListItem = ({
         {/* Team badge */}
         <button
           type="button"
-          className="flex shrink-0 items-center gap-1.5 rounded-md border border-[var(--color-border)] px-2 py-0.5 text-xs text-[var(--color-text-secondary)] transition-colors hover:border-[var(--color-border-emphasis)] hover:text-[var(--color-text)]"
+          className="flex shrink-0 items-center gap-1.5 rounded-full border border-white/10 bg-white/[0.04] px-2.5 py-1 text-xs text-[var(--color-text-secondary)] transition-colors hover:border-[var(--color-border-emphasis)] hover:text-[var(--color-text)]"
           onClick={() => onTeamClick(schedule.teamName)}
         >
           <span className="size-2 shrink-0 rounded-full" style={{ backgroundColor: teamColor }} />
@@ -116,7 +116,7 @@ const ScheduleListItem = ({
         {/* Next run */}
         <Tooltip>
           <TooltipTrigger asChild>
-            <span className="shrink-0 text-xs text-[var(--color-text-muted)]">
+            <span className="shrink-0 rounded-full bg-white/[0.035] px-2 py-1 text-xs text-[var(--color-text-muted)]">
               下次：{formatNextRun(schedule.nextRunAt)}
             </span>
           </TooltipTrigger>
@@ -194,7 +194,7 @@ const ScheduleListItem = ({
 
       {/* Expanded: Run history */}
       {expanded ? (
-        <div className="border-t border-[var(--color-border)]">
+        <div className="border-t border-white/[0.06] bg-black/10">
           {runsLoading ? (
             <div className="flex items-center justify-center py-4 text-xs text-[var(--color-text-muted)]">
               正在加载运行历史...
@@ -328,6 +328,16 @@ export const SchedulesView = (): React.JSX.Element => {
     });
   }, [getTeamDisplayName, schedules, teamFilter, searchQuery]);
 
+  const scheduleStats = useMemo(
+    () => ({
+      total: schedules.length,
+      active: schedules.filter((schedule) => schedule.status === 'active').length,
+      paused: schedules.filter((schedule) => schedule.status === 'paused').length,
+      teams: new Set(schedules.map((schedule) => schedule.teamName)).size,
+    }),
+    [schedules]
+  );
+
   const handleEdit = useCallback((schedule: Schedule) => {
     setEditingSchedule(schedule);
     setDialogOpen(true);
@@ -367,18 +377,38 @@ export const SchedulesView = (): React.JSX.Element => {
 
   return (
     <div className="h-full overflow-y-auto bg-[var(--color-surface)]">
-      <div className="mx-auto w-full max-w-5xl px-6 py-8">
+      <div className="mx-auto w-full max-w-6xl px-6 py-8">
         {/* Header */}
-        <div className="mb-4">
-          <div className="flex items-center justify-between">
-            <div className="flex items-center gap-3">
-              <Calendar className="size-5 text-[var(--color-text-muted)]" />
-              <h1 className="text-lg font-semibold text-[var(--color-text)]">计划任务</h1>
-              {schedules.length > 0 && (
-                <span className="rounded-full bg-[var(--color-surface-raised)] px-2 py-0.5 text-xs text-[var(--color-text-muted)]">
-                  {schedules.length}
+        <div className="mb-5 rounded-2xl border border-[var(--color-border-subtle)] bg-white/[0.025] p-4 shadow-[0_18px_42px_rgba(0,0,0,0.12)]">
+          <div className="flex flex-wrap items-start justify-between gap-4">
+            <div>
+              <div className="flex items-center gap-3">
+                <span className="flex size-9 items-center justify-center rounded-xl bg-blue-500/10 text-blue-400">
+                  <Calendar className="size-4" />
                 </span>
-              )}
+                <div>
+                  <h1 className="text-lg font-semibold text-[var(--color-text)]">定时任务</h1>
+                  <p className="mt-0.5 text-xs text-[var(--color-text-muted)]">
+                    集中管理所有团队的 Cron 计划、运行状态和历史记录。
+                  </p>
+                </div>
+              </div>
+              {schedules.length > 0 ? (
+                <div className="mt-4 flex flex-wrap gap-2">
+                  <span className="rounded-full border border-white/10 bg-white/[0.04] px-2.5 py-1 text-xs text-[var(--color-text-secondary)]">
+                    全部 {scheduleStats.total}
+                  </span>
+                  <span className="rounded-full border border-emerald-400/15 bg-emerald-400/10 px-2.5 py-1 text-xs text-emerald-400">
+                    运行中 {scheduleStats.active}
+                  </span>
+                  <span className="rounded-full border border-yellow-400/15 bg-yellow-400/10 px-2.5 py-1 text-xs text-yellow-400">
+                    已暂停 {scheduleStats.paused}
+                  </span>
+                  <span className="rounded-full border border-white/10 bg-white/[0.04] px-2.5 py-1 text-xs text-[var(--color-text-secondary)]">
+                    团队 {scheduleStats.teams}
+                  </span>
+                </div>
+              ) : null}
             </div>
             <Button size="sm" className="gap-1.5" onClick={handleCreate}>
               <Plus className="size-3.5" />
@@ -388,9 +418,9 @@ export const SchedulesView = (): React.JSX.Element => {
 
           {/* Filters row */}
           {schedules.length > 0 && (
-            <div className="mt-3 flex items-center gap-3">
+            <div className="mt-4 flex flex-wrap items-center gap-3 rounded-xl border border-white/[0.06] bg-black/10 p-2">
               {/* Search */}
-              <div className="relative max-w-xs flex-1">
+              <div className="relative min-w-[220px] flex-1">
                 <Search className="absolute left-2.5 top-1/2 size-3.5 -translate-y-1/2 text-[var(--color-text-muted)]" />
                 <Input
                   placeholder="搜索计划..."
@@ -470,12 +500,14 @@ export const SchedulesView = (): React.JSX.Element => {
           </div>
         ) : schedules.length === 0 ? (
           /* Global empty state */
-          <div className="flex flex-col items-center justify-center gap-3 py-16 text-center">
-            <Calendar className="size-12 text-[var(--color-text-muted)]" />
+          <div className="flex flex-col items-center justify-center gap-3 rounded-2xl border border-dashed border-[var(--color-border)] bg-white/[0.02] py-16 text-center">
+            <div className="flex size-14 items-center justify-center rounded-2xl bg-blue-500/10 text-blue-400">
+              <Calendar className="size-7" />
+            </div>
             <div className="space-y-1.5">
-              <p className="text-sm font-medium text-[var(--color-text-secondary)]">暂无计划任务</p>
+              <p className="text-sm font-medium text-[var(--color-text-secondary)]">暂无定时任务</p>
               <p className="max-w-sm text-xs text-[var(--color-text-muted)]">
-                在任意团队中创建计划，即可使用 Cron 表达式自动执行团队任务。
+                在任意团队中创建计划，即可使用 Cron 表达式自动运行团队。
                 所有团队的计划都会显示在这里。
               </p>
             </div>
@@ -486,7 +518,7 @@ export const SchedulesView = (): React.JSX.Element => {
           </div>
         ) : filteredSchedules.length === 0 ? (
           /* No results for current filters */
-          <div className="flex flex-col items-center justify-center gap-2 py-12 text-center">
+          <div className="flex flex-col items-center justify-center gap-2 rounded-xl border border-dashed border-[var(--color-border)] bg-white/[0.02] py-12 text-center">
             <Search className="size-8 text-[var(--color-text-muted)]" />
             <p className="text-sm text-[var(--color-text-muted)]">没有符合当前筛选条件的计划</p>
             <button

package/src/renderer/components/settings/sections/AdvancedSection.tsx

@@ -240,7 +240,7 @@ export const AdvancedSection = ({}: AdvancedSectionProps): React.JSX.Element =>
             Version {version || '...'}
           </p>
           <p className="mt-2 text-xs leading-relaxed" style={{ color: 'var(--color-text-muted)' }}>
-            渠道与模型供应商由后端服务统一管理；团队任务通过 MCP 协议分发。
+            渠道与模型供应商由后端服务统一管理；团队内部任务由 harness 自主管理。
           </p>
         </div>
       </div>