@yancyyu/openhermit 1.5.8

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

@@ -0,0 +1,495 @@
+import React, { useEffect, useMemo, useState } from 'react';
+
+import { Button } from '@renderer/components/ui/button';
+import { Checkbox } from '@renderer/components/ui/checkbox';
+import { Label } from '@renderer/components/ui/label';
+import { CUSTOM_ROLE, NO_ROLE, PRESET_ROLES } from '@renderer/constants/teamRoles';
+import { getParticipantAvatarUrlByIndex } from '@renderer/utils/memberAvatarCatalog';
+import { isTeamEffortLevel } from '@shared/utils/effortLevels';
+import { normalizeOptionalTeamProviderId } from '@shared/utils/teamProvider';
+import { GitBranch, Plus } from 'lucide-react';
+
+import { MembersJsonEditor } from '../dialogs/MembersJsonEditor';
+
+import { MemberDraftRow } from './MemberDraftRow';
+import { getNextSuggestedMemberName } from './memberNameSets';
+import {
+  buildMemberDraftColorMap,
+  buildMemberDraftSuggestions,
+  createMemberDraft,
+  getMemberDraftRole,
+  getWorkflowForExport,
+} from './membersEditorUtils';
+
+import type { MemberDraft } from './membersEditorTypes';
+import type { InlineChip } from '@renderer/types/inlineChip';
+import type { MentionSuggestion } from '@renderer/types/mention';
+import type { EffortLevel, TeamProviderId } from '@shared/types';
+
+function membersToJsonText(drafts: MemberDraft[]): string {
+  const arr = drafts
+    .filter((d) => d.name.trim())
+    .map((d) => {
+      const role = getMemberDraftRole(d);
+      const obj: Record<string, string> = { name: d.name.trim() };
+      if (role) obj.role = role;
+      const workflow = getWorkflowForExport(d);
+      if (workflow) obj.workflow = workflow;
+      if (d.isolation === 'worktree') obj.isolation = 'worktree';
+      if (d.providerId) obj.providerId = d.providerId;
+      if (d.model?.trim()) obj.model = d.model.trim();
+      if (d.effort) obj.effort = d.effort;
+      return obj;
+    });
+  return JSON.stringify(arr, null, 2);
+}
+
+function parseJsonToDrafts(text: string): MemberDraft[] {
+  const arr: unknown = JSON.parse(text);
+  if (!Array.isArray(arr)) return [];
+  return (arr as Record<string, unknown>[]).map((item) => {
+    const name = typeof item.name === 'string' ? item.name : '';
+    const role = typeof item.role === 'string' ? item.role.trim() : '';
+    const workflow = typeof item.workflow === 'string' ? item.workflow.trim() : '';
+    const isolation = item.isolation === 'worktree' ? 'worktree' : undefined;
+    const providerId = normalizeOptionalTeamProviderId(item.providerId);
+    const model = typeof item.model === 'string' ? item.model.trim() : '';
+    const effort: EffortLevel | undefined = isTeamEffortLevel(item.effort)
+      ? item.effort
+      : undefined;
+    const presetRoles: readonly string[] = PRESET_ROLES;
+    const isPreset = presetRoles.includes(role);
+    return createMemberDraft({
+      name,
+      roleSelection: role ? (isPreset ? role : CUSTOM_ROLE) : '',
+      customRole: role && !isPreset ? role : '',
+      workflow: workflow || undefined,
+      isolation,
+      providerId,
+      model,
+      effort,
+    });
+  });
+}
+
+export interface MembersEditorSectionProps {
+  members: MemberDraft[];
+  onChange: (members: MemberDraft[]) => void;
+  fieldError?: string;
+  validateMemberName?: (name: string) => string | null;
+  showWorkflow?: boolean;
+  showJsonEditor?: boolean;
+  /** Prefix for draft persistence keys (e.g. 'createTeam' or 'editTeam:team-alpha') */
+  draftKeyPrefix?: string;
+  /** Project path for @file mentions in workflow */
+  projectPath?: string | null;
+  /** Task suggestions for #task references in workflow */
+  taskSuggestions?: MentionSuggestion[];
+  /** Team suggestions for @@team mentions in workflow */
+  teamSuggestions?: MentionSuggestion[];
+  /** Extra content rendered right below the "Members" label row */
+  headerExtra?: React.ReactNode;
+  /** When true, hides member rows and action buttons (label + headerExtra still visible) */
+  hideContent?: boolean;
+  /** Existing team members — used to reserve their colors so drafts get the next available ones */
+  existingMembers?: readonly { name: string; color?: string; removedAt?: number | string | null }[];
+  /** Pre-resolved member colors from the live Team view. */
+  existingMemberColorMap?: ReadonlyMap<string, string>;
+  /** Default provider to use for newly added member rows. */
+  defaultProviderId?: TeamProviderId;
+  /** When true, provider/model controls stay read-only for existing rows. */
+  lockProviderModel?: boolean;
+  /** When true, existing teammate names stay read-only while the team is live. */
+  lockExistingMemberIdentity?: boolean;
+  identityLockReason?: string;
+  inheritedProviderId?: TeamProviderId;
+  inheritedModel?: string;
+  inheritedEffort?: EffortLevel;
+  limitContext?: boolean;
+  inheritModelSettingsByDefault?: boolean;
+  forceInheritedModelSettings?: boolean;
+  modelLockReason?: string;
+  softDeleteMembers?: boolean;
+  memberWarningById?: Record<string, string | null | undefined>;
+  disableGeminiOption?: boolean;
+  memberModelIssueById?: Record<string, string | null | undefined>;
+  disableAddMember?: boolean;
+  addMemberLockReason?: string;
+  showWorktreeIsolationControls?: boolean;
+  teammateWorktreeDefault?: boolean;
+  onTeammateWorktreeDefaultChange?: (enabled: boolean) => void;
+}
+
+export const MembersEditorSection = ({
+  members,
+  onChange,
+  fieldError,
+  validateMemberName,
+  showWorkflow = false,
+  showJsonEditor = true,
+  draftKeyPrefix,
+  projectPath,
+  taskSuggestions,
+  teamSuggestions,
+  headerExtra,
+  hideContent = false,
+  existingMembers,
+  existingMemberColorMap,
+  defaultProviderId = 'anthropic',
+  lockProviderModel = false,
+  lockExistingMemberIdentity = false,
+  identityLockReason,
+  inheritedProviderId,
+  inheritedModel,
+  inheritedEffort,
+  limitContext = false,
+  inheritModelSettingsByDefault = false,
+  forceInheritedModelSettings = false,
+  modelLockReason,
+  softDeleteMembers = false,
+  memberWarningById,
+  disableGeminiOption = false,
+  memberModelIssueById,
+  disableAddMember = false,
+  addMemberLockReason,
+  showWorktreeIsolationControls = false,
+  teammateWorktreeDefault = false,
+  onTeammateWorktreeDefaultChange,
+}: MembersEditorSectionProps): React.JSX.Element => {
+  const [jsonEditorOpen, setJsonEditorOpen] = useState(false);
+  const [jsonText, setJsonText] = useState('');
+  const [jsonError, setJsonError] = useState<string | null>(null);
+
+  const toggleJsonEditor = (): void => {
+    if (!jsonEditorOpen) {
+      setJsonText(membersToJsonText(members));
+      setJsonError(null);
+    }
+    setJsonEditorOpen((prev) => !prev);
+  };
+
+  useEffect(() => {
+    if (!jsonEditorOpen || jsonError !== null) return;
+    queueMicrotask(() => setJsonText(membersToJsonText(members)));
+  }, [members, jsonEditorOpen, jsonError]);
+
+  const handleJsonChange = (text: string): void => {
+    setJsonText(text);
+    try {
+      const drafts = parseJsonToDrafts(text);
+      onChange(drafts);
+      setJsonError(null);
+    } catch (e) {
+      setJsonError(e instanceof Error ? e.message : 'JSON 无效');
+    }
+  };
+
+  const updateMemberName = (memberId: string, name: string): void => {
+    onChange(members.map((c) => (c.id === memberId ? { ...c, name } : c)));
+  };
+
+  const updateMemberRole = (memberId: string, roleSelection: string): void => {
+    const resolvedRole = roleSelection === NO_ROLE ? '' : roleSelection;
+    onChange(
+      members.map((c) =>
+        c.id === memberId
+          ? {
+              ...c,
+              roleSelection: resolvedRole,
+              customRole: resolvedRole === CUSTOM_ROLE ? c.customRole : '',
+            }
+          : c
+      )
+    );
+  };
+
+  const updateMemberCustomRole = (memberId: string, customRole: string): void => {
+    onChange(members.map((c) => (c.id === memberId ? { ...c, customRole } : c)));
+  };
+
+  const updateMemberWorkflow = (memberId: string, workflow: string): void => {
+    onChange(members.map((c) => (c.id === memberId ? { ...c, workflow } : c)));
+  };
+
+  const updateMemberWorkflowChips = (memberId: string, workflowChips: InlineChip[]): void => {
+    onChange(members.map((c) => (c.id === memberId ? { ...c, workflowChips } : c)));
+  };
+
+  const updateMemberProvider = (memberId: string, providerId: TeamProviderId): void => {
+    onChange(
+      members.map((c) =>
+        c.id === memberId
+          ? {
+              ...c,
+              providerId,
+              model: c.providerId === providerId ? c.model : '',
+            }
+          : c
+      )
+    );
+  };
+
+  const updateMemberModel = (memberId: string, model: string): void => {
+    onChange(members.map((c) => (c.id === memberId ? { ...c, model } : c)));
+  };
+
+  const updateMemberEffort = (memberId: string, effort: string): void => {
+    onChange(
+      members.map((c) =>
+        c.id === memberId
+          ? {
+              ...c,
+              effort: isTeamEffortLevel(effort) ? effort : undefined,
+            }
+          : c
+      )
+    );
+  };
+
+  const updateMemberIsolation = (memberId: string, enabled: boolean): void => {
+    onChange(
+      members.map((c) =>
+        c.id === memberId ? { ...c, isolation: enabled ? 'worktree' : undefined } : c
+      )
+    );
+  };
+
+  const updateTeammateWorktreeDefault = (enabled: boolean): void => {
+    onTeammateWorktreeDefaultChange?.(enabled);
+    onChange(
+      members.map((member) =>
+        member.removedAt ? member : { ...member, isolation: enabled ? 'worktree' : undefined }
+      )
+    );
+  };
+
+  const removeMember = (memberId: string): void => {
+    if (!softDeleteMembers) {
+      onChange(members.filter((c) => c.id !== memberId));
+      return;
+    }
+    onChange(
+      members.map((member) =>
+        member.id === memberId ? { ...member, removedAt: member.removedAt ?? Date.now() } : member
+      )
+    );
+  };
+
+  const restoreMember = (memberId: string): void => {
+    onChange(
+      members.map((member) => (member.id === memberId ? { ...member, removedAt: null } : member))
+    );
+  };
+
+  const addMember = (): void => {
+    const suggestedName = getNextSuggestedMemberName(members.map((member) => member.name));
+    onChange([
+      ...members,
+      createMemberDraft(
+        inheritModelSettingsByDefault
+          ? {
+              name: suggestedName,
+              isolation: teammateWorktreeDefault ? 'worktree' : undefined,
+            }
+          : {
+              name: suggestedName,
+              providerId: defaultProviderId,
+              isolation: teammateWorktreeDefault ? 'worktree' : undefined,
+            }
+      ),
+    ]);
+  };
+
+  const activeMembers = members.filter((member) => !member.removedAt);
+  const removedMembers = members.filter((member) => member.removedAt);
+  const names = activeMembers.map((m) => m.name.trim().toLowerCase()).filter(Boolean);
+  const hasDuplicates = new Set(names).size !== names.length;
+  const memberColorMap = useMemo(
+    () => buildMemberDraftColorMap(members, existingMembers, existingMemberColorMap),
+    [members, existingMembers, existingMemberColorMap]
+  );
+  const worktreeDefaultControlId = useMemo(
+    () =>
+      `teammate-worktree-default-${(draftKeyPrefix ?? 'default').replace(/[^a-zA-Z0-9_-]/g, '-')}`,
+    [draftKeyPrefix]
+  );
+
+  const mentionSuggestions = useMemo(
+    () => buildMemberDraftSuggestions(members, memberColorMap),
+    [members, memberColorMap]
+  );
+
+  return (
+    <div className="space-y-1.5">
+      <div className="flex items-center justify-between">
+        <Label>成员</Label>
+        {!hideContent && (
+          <div className="flex gap-2">
+            <Button
+              variant="outline"
+              size="sm"
+              className="gap-1.5"
+              onClick={addMember}
+              disabled={disableAddMember}
+              title={disableAddMember ? addMemberLockReason : undefined}
+            >
+              <Plus className="size-3.5" />
+              添加成员
+            </Button>
+            {showJsonEditor && !jsonEditorOpen ? (
+              <Button variant="ghost" size="sm" onClick={toggleJsonEditor}>
+                以 JSON 编辑
+              </Button>
+            ) : null}
+          </div>
+        )}
+      </div>
+      {headerExtra}
+      {!hideContent && (
+        <>
+          {showWorktreeIsolationControls ? (
+            <div className="flex items-center gap-2 rounded-md border border-[var(--color-border)] bg-[var(--color-surface)] px-2.5 py-2">
+              <Checkbox
+                id={worktreeDefaultControlId}
+                checked={teammateWorktreeDefault}
+                onCheckedChange={(checked) => updateTeammateWorktreeDefault(checked === true)}
+              />
+              <Label
+                htmlFor={worktreeDefaultControlId}
+                className="flex min-w-0 cursor-pointer items-center gap-1.5 text-xs font-normal text-[var(--color-text-secondary)]"
+              >
+                <GitBranch className="size-3.5 shrink-0" />
+                <span className="truncate">在独立 worktree 中运行成员</span>
+              </Label>
+            </div>
+          ) : null}
+          {disableAddMember && addMemberLockReason ? (
+            <p className="text-[11px] text-[var(--color-text-muted)]">{addMemberLockReason}</p>
+          ) : null}
+          <div className="space-y-2">
+            {activeMembers.map((member, index) => (
+              <MemberDraftRow
+                key={member.id}
+                member={member}
+                index={index}
+                avatarSrc={getParticipantAvatarUrlByIndex(index + 1)}
+                resolvedColor={memberColorMap.get(member.id)}
+                nameError={validateMemberName?.(member.name) ?? null}
+                onNameChange={updateMemberName}
+                onRoleChange={updateMemberRole}
+                onCustomRoleChange={updateMemberCustomRole}
+                onRemove={removeMember}
+                showWorkflow={showWorkflow}
+                onWorkflowChange={showWorkflow ? updateMemberWorkflow : undefined}
+                onWorkflowChipsChange={showWorkflow ? updateMemberWorkflowChips : undefined}
+                onProviderChange={updateMemberProvider}
+                onModelChange={updateMemberModel}
+                onEffortChange={updateMemberEffort}
+                showWorktreeIsolationControls={showWorktreeIsolationControls}
+                onWorktreeIsolationChange={updateMemberIsolation}
+                inheritedProviderId={inheritedProviderId}
+                inheritedModel={inheritedModel}
+                inheritedEffort={inheritedEffort}
+                limitContext={limitContext}
+                forceInheritedModelSettings={forceInheritedModelSettings}
+                draftKeyPrefix={draftKeyPrefix}
+                projectPath={projectPath}
+                mentionSuggestions={mentionSuggestions}
+                taskSuggestions={taskSuggestions}
+                teamSuggestions={teamSuggestions}
+                lockProviderModel={lockProviderModel}
+                lockIdentity={lockExistingMemberIdentity && Boolean(member.originalName?.trim())}
+                identityLockReason={identityLockReason}
+                modelLockReason={modelLockReason}
+                warningText={memberWarningById?.[member.id] ?? null}
+                disableGeminiOption={disableGeminiOption}
+                modelIssueText={memberModelIssueById?.[member.id] ?? null}
+              />
+            ))}
+            {softDeleteMembers && removedMembers.length > 0 ? (
+              <div className="pt-2">
+                <div className="mb-2 text-[10px] text-[var(--color-text-muted)]">
+                  已移除（{removedMembers.length}）
+                </div>
+                <div className="space-y-2">
+                  {removedMembers.map((member, index) => (
+                    <MemberDraftRow
+                      key={member.id}
+                      member={member}
+                      index={activeMembers.length + index}
+                      avatarSrc={getParticipantAvatarUrlByIndex(activeMembers.length + index + 1)}
+                      resolvedColor={memberColorMap.get(member.id)}
+                      nameError={null}
+                      onNameChange={updateMemberName}
+                      onRoleChange={updateMemberRole}
+                      onCustomRoleChange={updateMemberCustomRole}
+                      onRemove={removeMember}
+                      onRestore={restoreMember}
+                      showWorkflow={showWorkflow}
+                      onWorkflowChange={showWorkflow ? updateMemberWorkflow : undefined}
+                      onWorkflowChipsChange={showWorkflow ? updateMemberWorkflowChips : undefined}
+                      onProviderChange={updateMemberProvider}
+                      onModelChange={updateMemberModel}
+                      onEffortChange={updateMemberEffort}
+                      showWorktreeIsolationControls={showWorktreeIsolationControls}
+                      onWorktreeIsolationChange={updateMemberIsolation}
+                      inheritedProviderId={inheritedProviderId}
+                      inheritedModel={inheritedModel}
+                      inheritedEffort={inheritedEffort}
+                      limitContext={limitContext}
+                      forceInheritedModelSettings={forceInheritedModelSettings}
+                      draftKeyPrefix={draftKeyPrefix}
+                      projectPath={projectPath}
+                      mentionSuggestions={mentionSuggestions}
+                      taskSuggestions={taskSuggestions}
+                      teamSuggestions={teamSuggestions}
+                      lockProviderModel
+                      modelLockReason="已移除成员会保留用于软删除历史。恢复后才能编辑设置。"
+                      isRemoved
+                      warningText={null}
+                      disableGeminiOption={disableGeminiOption}
+                      modelIssueText={null}
+                    />
+                  ))}
+                </div>
+              </div>
+            ) : null}
+            {jsonEditorOpen && showJsonEditor ? (
+              <MembersJsonEditor
+                value={jsonText}
+                onChange={handleJsonChange}
+                error={jsonError}
+                onClose={toggleJsonEditor}
+              />
+            ) : null}
+          </div>
+          {hasDuplicates ? (
+            <p className="text-[11px]" style={{ color: 'var(--field-error-text)' }}>
+              成员名称不能重复
+            </p>
+          ) : fieldError ? (
+            <p className="text-[11px]" style={{ color: 'var(--field-error-text)' }}>
+              {fieldError}
+            </p>
+          ) : null}
+        </>
+      )}
+    </div>
+  );
+};
+
+export type { MemberDraft } from './membersEditorTypes';
+export {
+  buildMemberDraftColorMap,
+  buildMemberDraftSuggestions,
+  buildMembersFromDrafts,
+  clearMemberModelOverrides,
+  createMemberDraft,
+  createMemberDraftsFromInputs,
+  filterEditableMemberInputs,
+  getMemberDraftRole,
+  normalizeLeadProviderForMode,
+  normalizeMemberDraftForProviderMode,
+  normalizeProviderForMode,
+  validateMemberNameInline,
+} from './membersEditorUtils';

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

@@ -0,0 +1,125 @@
+import { useMemo, useState } from 'react';
+
+import { MarkdownViewer } from '@renderer/components/chat/viewers/MarkdownViewer';
+import { displayMemberName } from '@renderer/utils/memberHelpers';
+import { stripAgentBlocks } from '@shared/constants/agentBlocks';
+import { format } from 'date-fns';
+import { ChevronDown, ChevronUp } from 'lucide-react';
+
+export type SubagentPreviewMessageKind =
+  | 'output'
+  | 'text'
+  | 'tool_result'
+  | 'interruption'
+  | 'plan_exit'
+  | 'teammate_message'
+  | 'user'
+  | 'unknown';
+
+export interface SubagentPreviewMessage {
+  id: string;
+  timestamp: Date;
+  kind: SubagentPreviewMessageKind;
+  /** Optional short label (e.g. tool name). */
+  label?: string;
+  content: string;
+}
+
+interface SubagentRecentMessagesPreviewProps {
+  messages: SubagentPreviewMessage[];
+  memberName?: string;
+  hasMore?: boolean;
+  onLoadMore?: () => void;
+}
+
+export const SubagentRecentMessagesPreview = ({
+  messages,
+  memberName,
+  hasMore = false,
+  onLoadMore,
+}: SubagentRecentMessagesPreviewProps): React.JSX.Element | null => {
+  const [expandedAll, setExpandedAll] = useState(false);
+
+  // Strip agent-only blocks from message content before display
+  const cleanMessages = useMemo(
+    () =>
+      messages
+        .map((m) => {
+          const cleaned = stripAgentBlocks(m.content);
+          return cleaned !== m.content ? { ...m, content: cleaned } : m;
+        })
+        .filter((m) => m.content.trim().length > 0),
+    [messages]
+  );
+
+  if (!cleanMessages.length) return null;
+
+  return (
+    <div className="mb-3 rounded-md border border-[var(--color-border)] bg-[var(--color-surface)] p-2">
+      <div className="mb-2 flex items-center gap-2">
+        <div className="min-w-0 truncate text-[11px] text-[var(--color-text-muted)]">
+          Latest messages{memberName ? ` — ${displayMemberName(memberName)}` : ''}
+        </div>
+      </div>
+
+      <div className={`${expandedAll ? 'max-h-none' : 'max-h-[200px]'} overflow-y-auto pr-1`}>
+        {cleanMessages.map((m, index) => (
+          <div
+            key={m.id}
+            className="rounded px-2 py-1.5"
+            style={index % 2 === 0 ? { backgroundColor: 'var(--card-bg-zebra)' } : undefined}
+          >
+            <div className="flex items-start gap-2">
+              <div className="min-w-0 flex-1 text-xs text-[var(--color-text)]">
+                <MarkdownViewer
+                  content={m.content}
+                  bare
+                  maxHeight="max-h-none"
+                  className="[&>div>div]:p-0 [&_ol]:my-1 [&_p]:my-1 [&_ul]:my-1"
+                />
+              </div>
+              <div className="shrink-0 text-right text-[10px] text-[var(--color-text-muted)]">
+                {format(m.timestamp, 'h:mm:ss a')}
+              </div>
+            </div>
+          </div>
+        ))}
+
+        {hasMore && onLoadMore ? (
+          <div className="flex justify-center pb-1 pt-2">
+            <button
+              type="button"
+              className="flex items-center gap-1 rounded-md border border-[var(--color-border)] bg-[var(--color-surface-raised)] px-2.5 py-1 text-[11px] text-[var(--color-text-muted)] shadow-sm transition-colors hover:bg-[var(--color-surface)] hover:text-[var(--color-text-secondary)]"
+              onClick={onLoadMore}
+            >
+              <ChevronDown size={12} />
+              Load more
+            </button>
+          </div>
+        ) : null}
+      </div>
+
+      <div className="sticky bottom-0 z-10 flex justify-end pb-1 pt-2">
+        {!expandedAll ? (
+          <button
+            type="button"
+            className="flex items-center gap-1 rounded-md border border-[var(--color-border)] bg-[var(--color-surface-raised)] px-2.5 py-1 text-[11px] text-[var(--color-text-muted)] shadow-sm transition-colors hover:bg-[var(--color-surface)] hover:text-[var(--color-text-secondary)]"
+            onClick={() => setExpandedAll(true)}
+          >
+            <ChevronDown size={12} />
+            Expand
+          </button>
+        ) : (
+          <button
+            type="button"
+            className="flex items-center gap-1 rounded-md border border-[var(--color-border)] bg-[var(--color-surface-raised)] px-2.5 py-1 text-[11px] text-[var(--color-text-muted)] shadow-sm transition-colors hover:bg-[var(--color-surface)] hover:text-[var(--color-text-secondary)]"
+            onClick={() => setExpandedAll(false)}
+          >
+            <ChevronUp size={12} />
+            Collapse
+          </button>
+        )}
+      </div>
+    </div>
+  );
+};