@yancyyu/openhermit 1.6.41 → 1.6.43

package/src/renderer/components/team/dialogs/__tests__/CreateTeamDialog.chineseRepro.test.tsx

@@ -0,0 +1,253 @@
+/**
+ * Reproduction harness for the user-reported create-team bug:
+ *   "输入中文 → 英文自动出 → 团队名称已存在 → 英文框红 → 但还能创建"
+ *
+ * Static analysis says the symptom (English-box red + create still possible) is
+ * impossible in a single render, because `isBindProjectTaken` both red-flags the
+ * box AND disables the create button. So the only way the user can see red and
+ * still create is a TRANSIENT flicker driven by the background `fetchTeams()`
+ * refresh (TeamListView schedules one at +1200ms / +3500ms). These tests pin
+ * the dialog's behavior across that refresh with the user's REAL team data.
+ */
+import React, { act } from 'react';
+import { createRoot } from 'react-dom/client';
+
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import { CreateTeamDialog } from '../CreateTeamDialog';
+
+// Live, mutable draft state so a test can "type" by mutating teamName between
+// rerenders — mirroring how a real user types while a background refresh fires.
+const draftState = vi.hoisted(() => ({
+  teamName: '',
+  customCwd: '/tmp/project',
+}));
+
+vi.mock('@renderer/hooks/useCreateTeamDraft', () => ({
+  useCreateTeamDraft: () => ({
+    teamName: draftState.teamName,
+    setTeamName: (v: string) => {
+      draftState.teamName = v;
+    },
+    cwdMode: 'custom' as const,
+    setCwdMode: () => undefined,
+    selectedProjectPath: '',
+    setSelectedProjectPath: () => undefined,
+    customCwd: draftState.customCwd,
+    setCustomCwd: () => undefined,
+    teamColor: '',
+    setTeamColor: () => undefined,
+    isLoaded: true,
+    clearDraft: () => undefined,
+  }),
+}));
+
+vi.mock('@renderer/hooks/useTheme', () => ({ useTheme: () => ({ isLight: false }) }));
+vi.mock('@renderer/lib/utils', () => ({
+  cn: (...args: Array<unknown>): string =>
+    args.filter((a): a is string => typeof a === 'string' && a.length > 0).join(' '),
+}));
+vi.mock('@renderer/utils/pathNormalize', () => ({ normalizePath: (p: string) => p }));
+vi.mock('@shared/utils/ephemeralProjectPath', () => ({ isEphemeralProjectPath: () => false }));
+vi.mock('@renderer/api', () => ({ api: { getProjects: async () => [] } }));
+vi.mock('@renderer/api/providers', () => ({
+  providersApi: { list: async () => ({ providers: [] }) },
+}));
+vi.mock('@renderer/components/ui/button', () => ({
+  Button: ({
+    children,
+    onClick,
+    disabled,
+  }: {
+    children: React.ReactNode;
+    onClick?: React.MouseEventHandler<HTMLButtonElement>;
+    disabled?: boolean;
+  }) =>
+    React.createElement(
+      'button',
+      { type: 'button', onClick, disabled: Boolean(disabled), 'data-testid': 'btn' },
+      children
+    ),
+}));
+vi.mock('@renderer/components/ui/dialog', () => ({
+  Dialog: ({ children }: { children: React.ReactNode }) =>
+    React.createElement(React.Fragment, null, children),
+  DialogContent: ({ children }: { children: React.ReactNode }) =>
+    React.createElement('div', null, children),
+  DialogDescription: ({ children }: { children: React.ReactNode }) =>
+    React.createElement('div', null, children),
+  DialogFooter: ({ children }: { children: React.ReactNode }) =>
+    React.createElement('div', null, children),
+  DialogHeader: ({ children }: { children: React.ReactNode }) =>
+    React.createElement('div', null, children),
+  DialogTitle: ({ children }: { children: React.ReactNode }) =>
+    React.createElement('div', null, children),
+}));
+vi.mock('@renderer/components/ui/input', () => ({
+  Input: (props: Record<string, unknown>) =>
+    React.createElement('input', {
+      id: props.id as string,
+      value: (props.value as string) ?? '',
+      onChange: props.onChange as React.ChangeEventHandler<HTMLInputElement>,
+      className: props.className as string,
+      placeholder: props.placeholder as string,
+      'data-testid': props.id === 'team-bind-project' ? 'bind-project' : props.id,
+    }),
+}));
+vi.mock('@renderer/components/ui/label', () => ({
+  Label: ({ children }: { children: React.ReactNode }) =>
+    React.createElement('label', null, children),
+}));
+vi.mock('../../HarnessCards', () => ({ AGENT_TYPE_LABELS: {} as Record<string, string> }));
+vi.mock('../../HarnessSelect', () => ({ HarnessSelect: () => React.createElement('div') }));
+vi.mock('../ProjectPathSelector', () => ({
+  ProjectPathSelector: () => React.createElement('div'),
+}));
+
+interface RenderHandle {
+  host: HTMLDivElement;
+  rerender: (props: Record<string, unknown>) => Promise<void>;
+  unmount: () => Promise<void>;
+}
+
+async function renderDialog(props: Record<string, unknown>): Promise<RenderHandle> {
+  vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+  const host = document.createElement('div');
+  document.body.appendChild(host);
+  const root = createRoot(host);
+  const renderOnce = async (p: Record<string, unknown>) => {
+    await act(async () => {
+      root.render(React.createElement(CreateTeamDialog, p as never));
+      await Promise.resolve();
+    });
+  };
+  await renderOnce(props);
+  return {
+    host,
+    rerender: (p) => renderOnce(p),
+    unmount: async () => {
+      await act(async () => {
+        root.unmount();
+        await Promise.resolve();
+      });
+    },
+  };
+}
+
+// The user's REAL team data (read live from ~/.hermit/teams/*/team.json). Kept in sync
+// with disk so the regression guard reflects reality, not a stale snapshot — the bug is a
+// flicker that only surfaces against the actual collision context the user hits. Note the
+// real data even carries non-ASCII bindProjects (汇报/产品经理团队/hermit开发) and a duplicate
+// 'my-project'; the auto-slug must stay collision-free against all of it.
+const REAL_BIND_PROJECTS = [
+  '汇报',
+  '产品经理团队',
+  'hermit开发',
+  '212121-og3z',
+  '222-11io',
+  'aads-e487',
+  'boss-1sxv',
+  'my-project',
+  'team-2kclb4',
+  'team-aztc',
+  'team-jcve',
+];
+const REAL_DISPLAY_NAMES = [
+  '汇报',
+  '产品经理团队',
+  'hermit开发',
+  '212121',
+  '你好222',
+  '测试aads',
+  'boss',
+  'Helm Loop',
+  'my-project',
+  '爬虫',
+  '呜呜呜欧',
+  '测试',
+];
+
+const baseProps = (
+  existingBindProjects: string[],
+  existingDisplayNames: string[]
+): Record<string, unknown> => ({
+  open: true,
+  canCreate: true,
+  provisioningErrorsByTeam: {},
+  clearProvisioningError: () => undefined,
+  existingTeamNames: [],
+  existingBindProjects,
+  existingDisplayNames,
+  provisioningTeamNames: [],
+  activeTeams: [],
+  onClose: () => undefined,
+  onCreate: async () => undefined,
+  onOpenTeam: () => undefined,
+});
+
+const findCreateButton = (host: HTMLElement): HTMLButtonElement | null =>
+  Array.from(host.querySelectorAll<HTMLButtonElement>('button')).find((b) =>
+    b.textContent?.includes('创建数字员工')
+  ) ?? null;
+
+const bindProjectInput = (host: HTMLElement): HTMLInputElement | null =>
+  host.querySelector<HTMLInputElement>('[data-testid="bind-project"]');
+const nameInput = (host: HTMLElement): HTMLInputElement | null =>
+  host.querySelector<HTMLInputElement>('#team-name');
+
+describe('CreateTeamDialog — Chinese-name repro (user-reported bug)', () => {
+  afterEach(() => {
+    document.body.innerHTML = '';
+    draftState.teamName = '';
+    draftState.customCwd = '/tmp/project';
+  });
+
+  it('a fresh Chinese name never shows "已存在" and the box is never red', async () => {
+    draftState.teamName = '全新员工甲';
+    const { host, unmount } = await renderDialog(baseProps(REAL_BIND_PROJECTS, REAL_DISPLAY_NAMES));
+
+    expect(host.textContent).not.toContain('该名称已存在');
+    expect(host.textContent).not.toContain('该项目标识已存在');
+    expect(bindProjectInput(host)?.className ?? '').not.toContain('field-error-border');
+    expect(nameInput(host)?.className ?? '').not.toContain('field-error-border');
+    expect(findCreateButton(host)?.disabled).toBe(false);
+
+    await unmount();
+  });
+
+  it('does NOT flicker "已存在" when the background refresh repopulates the list', async () => {
+    // Frame 1: dialog open, teams not yet loaded (empty list), user already typed.
+    draftState.teamName = '全新员工甲';
+    const { host, rerender, unmount } = await renderDialog(baseProps([], []));
+
+    expect(host.textContent).not.toContain('该名称已存在');
+    expect(host.textContent).not.toContain('该项目标识已存在');
+    expect(findCreateButton(host)?.disabled).toBe(false);
+
+    // Frame 2: background fetchTeams() at +1200ms delivers the full real list.
+    await rerender(baseProps(REAL_BIND_PROJECTS, REAL_DISPLAY_NAMES));
+
+    expect(host.textContent).not.toContain('该名称已存在');
+    expect(host.textContent).not.toContain('该项目标识已存在');
+    expect(bindProjectInput(host)?.className ?? '').not.toContain('field-error-border');
+    expect(nameInput(host)?.className ?? '').not.toContain('field-error-border');
+    expect(findCreateButton(host)?.disabled).toBe(false);
+
+    await unmount();
+  });
+
+  it('auto-slug stays collision-free across many distinct Chinese names (no reshuffle red)', async () => {
+    const { rerender, host, unmount } = await renderDialog(
+      baseProps(REAL_BIND_PROJECTS, REAL_DISPLAY_NAMES)
+    );
+
+    for (const name of ['一号员工', '二号员工', '三号员工', '四号员工', '呜呜呜欧']) {
+      draftState.teamName = name;
+      await rerender(baseProps(REAL_BIND_PROJECTS, REAL_DISPLAY_NAMES));
+      expect(host.textContent).not.toContain('该项目标识已存在');
+      expect(bindProjectInput(host)?.className ?? '').not.toContain('field-error-border');
+    }
+
+    await unmount();
+  });
+});

package/src/renderer/components/team/dialogs/platformAllowUtils.ts

@@ -0,0 +1,91 @@
+const FEISHU_LARK_KEYS = new Set(['feishu', 'lark']);
+
+export function readStringRecord(value: unknown): Record<string, string> {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return {};
+  return Object.fromEntries(
+    Object.entries(value as Record<string, unknown>)
+      .map(([key, entry]) => [key.trim(), typeof entry === 'string' ? entry.trim() : ''] as const)
+      .filter(([key, entry]) => key.length > 0 && entry.length > 0)
+  );
+}
+
+export function getFeishuLarkAllowValue(record: Record<string, string>): string {
+  return record.lark ?? record.feishu ?? '';
+}
+
+function getFeishuLarkWriteKey(record: Record<string, string>): 'feishu' | 'lark' {
+  if (record.lark !== undefined) return 'lark';
+  if (record.feishu !== undefined) return 'feishu';
+  return 'feishu';
+}
+
+function hasFeishuLarkKey(record: Record<string, string>): boolean {
+  return record.feishu !== undefined || record.lark !== undefined;
+}
+
+export function withFeishuLarkAllowValue(
+  base: Record<string, string>,
+  value: string
+): Record<string, string> {
+  const source = readStringRecord(base);
+  const next = { ...source };
+  const trimmed = value.trim();
+  const aliasKey = getFeishuLarkWriteKey(source);
+
+  delete next.feishu;
+  delete next.lark;
+
+  if (trimmed) {
+    next[aliasKey] = trimmed;
+  }
+
+  return next;
+}
+
+export function buildFeishuLarkAllowUpdatePayload(
+  base: Record<string, string>,
+  value: string
+): Record<string, string> | undefined {
+  const source = readStringRecord(base);
+  const next = withFeishuLarkAllowValue(source, value);
+  const trimmed = value.trim();
+
+  if (trimmed) return next;
+
+  if (hasFeishuLarkKey(source)) {
+    return {
+      ...next,
+      feishu: '',
+      lark: '',
+    };
+  }
+
+  return undefined;
+}
+
+export function buildPlatformAllowUpdatePayload(
+  base: Record<string, string>,
+  values: Record<string, string>
+): Record<string, string> | undefined {
+  const source = readStringRecord(base);
+  const next = readStringRecord(values);
+
+  const keys = new Set([...Object.keys(source), ...Object.keys(values)]);
+  const changed = [...keys].some((key) => (source[key] ?? '') !== (next[key] ?? ''));
+
+  return changed ? next : undefined;
+}
+
+export function omitEmptyAllowMap(
+  record: Record<string, string>
+): Record<string, string> | undefined {
+  return Object.keys(record).length > 0 ? record : undefined;
+}
+
+export function hasFeishuLarkDeleteMarker(value: unknown): boolean {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return false;
+  return Object.entries(value as Record<string, unknown>).some(
+    ([key, entry]) =>
+      FEISHU_LARK_KEYS.has(key.trim()) && (typeof entry !== 'string' || entry.trim().length === 0)
+  );
+}

package/src/renderer/components/team/dialogs/teammateRuntimeCompatibility.tsx

@@ -93,7 +93,7 @@ export function analyzeTeammateRuntimeCompatibility({
     blocksSubmission: false,
     checking: false,
     title: '已切换为进程内成员运行',
-    message: `当前团队会通过 ${getProviderLabel(leadProviderId)} 负责人会话启动成员，不再依赖 tmux。`,
+    message: `当前 Loop runtime 会通过 ${getProviderLabel(leadProviderId)} Loop Lead 会话启动成员，不再依赖 tmux。`,
     details: ['自定义 CLI 参数里的 --teammate-mode tmux 会被忽略，并改为 in-process。'],
     tmuxDetail: null,
     memberWarningById: {},

package/src/renderer/components/team/kanban/KanbanTaskCard.test.tsx

@@ -196,4 +196,45 @@ describe('KanbanTaskCard change badge', () => {
       await Promise.resolve();
     });
   });
+
+  it('renders in-progress tasks as agent-controlled without manual action buttons', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+
+    await act(async () => {
+      root.render(
+        React.createElement(KanbanTaskCard, {
+          task: baseTask,
+          teamName: 'my-team',
+          columnId: 'in_progress',
+          hasReviewers: true,
+          compact: false,
+          taskMap: new Map(),
+          memberColorMap: new Map([['alice', 'blue']]),
+          onRequestReview: noop,
+          onApprove: noop,
+          onRequestChanges: noop,
+          onMoveBackToDone: noop,
+          onStartTask: noop,
+          onCompleteTask: noop,
+          onCancelTask: noop,
+          onDeleteTask: noop,
+          onViewChanges: noop,
+        })
+      );
+      await Promise.resolve();
+    });
+
+    expect(host.textContent).toContain('Agent 处理中');
+    expect(host.querySelector('[aria-label="完成"]')).toBeNull();
+    expect(host.querySelector('[aria-label="取消任务 task-1"]')).toBeNull();
+    expect(host.querySelector('[aria-label="删除任务"]')).toBeNull();
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
 });

package/src/renderer/components/team/kanban/KanbanTaskCard.tsx

@@ -3,7 +3,6 @@ import { memo, useCallback, useMemo, useRef, useState } from 'react';
 import { MemberBadge } from '@renderer/components/team/MemberBadge';
 import { UnreadCommentsBadge } from '@renderer/components/team/UnreadCommentsBadge';
 import { Button } from '@renderer/components/ui/button';
-import { Popover, PopoverContent, PopoverTrigger } from '@renderer/components/ui/popover';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/components/ui/tooltip';
 import { useTheme } from '@renderer/hooks/useTheme';
 import { useUnreadCommentCount } from '@renderer/hooks/useUnreadCommentCount';
@@ -23,7 +22,6 @@ import {
   Play,
   Send,
   Trash2,
-  XCircle,
 } from 'lucide-react';
 
 import type { DispatchMeta } from '@shared/types/team';
@@ -63,8 +61,26 @@ const DISPATCH_STATUS_STYLE: Record<string, { bg: string; text: string; label: s
     text: 'text-yellow-600 dark:text-yellow-400',
     label: '已派发',
   },
-  received: { bg: 'bg-indigo-500/15', text: 'text-indigo-600 dark:text-indigo-400', label: '已接收' },
-  in_progress: { bg: 'bg-indigo-500/15', text: 'text-indigo-600 dark:text-indigo-400', label: '执行中' },
+  pending_accept: {
+    bg: 'bg-yellow-500/15',
+    text: 'text-yellow-600 dark:text-yellow-400',
+    label: '待启动',
+  },
+  received: {
+    bg: 'bg-yellow-500/15',
+    text: 'text-yellow-600 dark:text-yellow-400',
+    label: '待启动',
+  },
+  accepted: {
+    bg: 'bg-indigo-500/15',
+    text: 'text-indigo-600 dark:text-indigo-400',
+    label: '已启动',
+  },
+  in_progress: {
+    bg: 'bg-indigo-500/15',
+    text: 'text-indigo-600 dark:text-indigo-400',
+    label: '执行中',
+  },
   completed: {
     bg: 'bg-emerald-500/15',
     text: 'text-emerald-600 dark:text-emerald-400',
@@ -75,18 +91,26 @@ const DISPATCH_STATUS_STYLE: Record<string, { bg: string; text: string; label: s
     text: 'text-emerald-600 dark:text-emerald-400',
     label: '已同步',
   },
+  rejected: { bg: 'bg-red-500/15', text: 'text-red-600 dark:text-red-400', label: '已拒绝' },
   failed: { bg: 'bg-red-500/15', text: 'text-red-600 dark:text-red-400', label: '失败' },
 };
 
-const DispatchBadge = ({ meta }: { meta: DispatchMeta }): React.JSX.Element => {
+const DispatchBadge = ({
+  meta,
+  teamName,
+}: {
+  meta: DispatchMeta;
+  teamName: string;
+}): React.JSX.Element => {
   const style = DISPATCH_STATUS_STYLE[meta.status] ?? DISPATCH_STATUS_STYLE.dispatched;
-  const target = meta.targetTeam;
+  const direction =
+    meta.targetTeam === teamName ? `来自 ${meta.originTeam}` : `发往 ${meta.targetTeam}`;
   return (
     <span
       className={`mt-1 inline-flex items-center gap-1 rounded-full px-1.5 py-0.5 text-[10px] font-medium ${style.bg} ${style.text}`}
     >
       <Send size={10} />
-      {style.label} → {target}
+      {style.label} · {direction}
     </span>
   );
 };
@@ -160,63 +184,6 @@ const TruncatedTitle = ({
   );
 };
 
-const CancelTaskButton = ({
-  taskId,
-  onConfirm,
-}: {
-  taskId: string;
-  onConfirm: (taskId: string) => void;
-}): React.JSX.Element => {
-  const [open, setOpen] = useState(false);
-
-  return (
-    <Popover open={open} onOpenChange={setOpen}>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <PopoverTrigger asChild>
-            <Button
-              variant="destructive"
-              size="icon"
-              className="size-6 rounded-full shadow-sm"
-              aria-label={`取消任务 ${taskId}`}
-              onClick={(e) => e.stopPropagation()}
-            >
-              <XCircle size={11} />
-            </Button>
-          </PopoverTrigger>
-        </TooltipTrigger>
-        <TooltipContent side="top">取消</TooltipContent>
-      </Tooltip>
-      <PopoverContent
-        className="w-56 p-3"
-        side="top"
-        align="start"
-        onClick={(e) => e.stopPropagation()}
-      >
-        <p className="mb-3 text-xs text-[var(--color-text-secondary)]">
-          将此任务移回“待处理”并通知团队吗？
-        </p>
-        <div className="flex gap-2">
-          <Button
-            variant="destructive"
-            size="sm"
-            className="flex-1"
-            onClick={() => {
-              setOpen(false);
-              onConfirm(taskId);
-            }}
-          >
-            确认
-          </Button>
-          <Button variant="outline" size="sm" className="flex-1" onClick={() => setOpen(false)}>
-            保持不变
-          </Button>
-        </div>
-      </PopoverContent>
-    </Popover>
-  );
-};
-
 interface TaskActionIconButtonProps {
   label: string;
   icon: React.ReactNode;
@@ -263,7 +230,6 @@ export const KanbanTaskCard = memo(
     memberColorMap,
     onStartTask,
     onCompleteTask,
-    onCancelTask,
     onScrollToTask,
     onTaskClick,
     onViewChanges,
@@ -307,7 +273,7 @@ export const KanbanTaskCard = memo(
           </span>
         ) : null}
         <UnreadCommentsBadge unreadCount={unreadCount} totalCount={task.comments?.length ?? 0} />
-        {onDeleteTask ? (
+        {onDeleteTask && task.status !== 'in_progress' ? (
           <TaskActionIconButton
             label="删除任务"
             icon={<Trash2 size={11} />}
@@ -369,7 +335,9 @@ export const KanbanTaskCard = memo(
               {REVIEW_STATE_DISPLAY.needsFix.label}
             </span>
           ) : null}
-          {task.dispatchMeta ? <DispatchBadge meta={task.dispatchMeta} /> : null}
+          {task.dispatchMeta ? (
+            <DispatchBadge meta={task.dispatchMeta} teamName={teamName} />
+          ) : null}
           {compact && <TruncatedTitle text={task.subject} className="mt-1" />}
         </div>
 
@@ -435,25 +403,12 @@ export const KanbanTaskCard = memo(
             ) : null}
 
             {columnId === 'in_progress' ? (
-              isScheduleTask ? (
-                <div className="flex min-w-0 flex-1 items-center gap-1.5">
-                  <Loader2 size={11} className="animate-spin text-emerald-400" />
-                  <span className="whitespace-nowrap text-[11px] text-emerald-400">执行中</span>
-                </div>
-              ) : (
-                <>
-                  <TaskActionIconButton
-                    label="完成"
-                    icon={<CheckCircle2 size={11} />}
-                    className="border-emerald-500/40 text-emerald-400 hover:bg-emerald-500/10 hover:text-emerald-300"
-                    onClick={(e) => {
-                      e.stopPropagation();
-                      onCompleteTask(task.id);
-                    }}
-                  />
-                  <CancelTaskButton taskId={task.id} onConfirm={onCancelTask} />
-                </>
-              )
+              <div className="flex min-w-0 flex-1 items-center gap-1.5">
+                <Loader2 size={11} className="animate-spin text-emerald-400" />
+                <span className="whitespace-nowrap text-[11px] text-emerald-400">
+                  {isScheduleTask ? '执行中' : 'Agent 处理中'}
+                </span>
+              </div>
             ) : null}
           </div>