@yancyyu/openhermit 1.6.25 → 1.6.27

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yancyyu/openhermit",
   "type": "module",
-  "version": "1.6.25",
+  "version": "1.6.27",
   "description": "openHermit: team-oriented agent management workbench atop cc-connect.",
   "license": "AGPL-3.0",
   "author": {
@@ -107,7 +107,7 @@
     "@tiptap/pm": "^3.20.4",
     "@tiptap/react": "^3.20.4",
     "@tiptap/starter-kit": "^3.20.4",
-    "cc-connect": "^1.3.3-beta.2",
+    "cc-connect": "1.3.3-beta.3",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "1.0.4",

package/src/main/server.ts

@@ -50,16 +50,6 @@ import { TaskDispatchService } from './services/teams-mvp/TaskDispatchService';
 import type { TaskBusConfig } from '@shared/types/team';
 import { UpdateService } from './services/UpdateService';
 
-process.on('uncaughtException', (err) => {
-  console.error('[openHermit:server] uncaughtException', err);
-  process.exit(1);
-});
-
-process.on('unhandledRejection', (reason) => {
-  console.error('[openHermit:server] unhandledRejection', reason);
-  process.exit(1);
-});
-
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const pkg = JSON.parse(readFileSync(path.join(__dirname, '../../package.json'), 'utf-8'));
 const REPO_ROOT = path.resolve(__dirname, '..', '..');
@@ -692,7 +682,17 @@ app.patch<{ Body: Record<string, unknown> }>('/api/cc-settings', async (request)
 app.post('/api/cc-restart', async () => {
   try {
     await cc.restart();
-    return { ok: true };
+    // Wait for cc-connect to come back (restart only signals, process respawns async)
+    for (let i = 0; i < 30; i++) {
+      await new Promise((r) => setTimeout(r, 1000));
+      try {
+        await cc.listProjects();
+        return { ok: true };
+      } catch {
+        /* not back yet */
+      }
+    }
+    return reply500(new Error('cc-connect did not come back within 30s'));
   } catch (err) {
     return reply500(err);
   }
@@ -774,7 +774,9 @@ app.get('/api/teams', async () => {
         };
       })
     );
-    return summaries.filter((team) => team.pendingDelete !== true);
+    return summaries.filter(
+      (team) => team.pendingDelete !== true && team.teamName !== 'my-project'
+    );
   } catch {
     return [];
   }
@@ -816,6 +818,16 @@ app.post('/api/teams/create', async (request, reply) => {
       request.log.warn({ err, teamName: name }, 'failed to persist local team metadata');
     }
 
+    // Bind provider refs if specified
+    const providerRefs = Array.isArray(body.providerRefs) ? (body.providerRefs as string[]) : [];
+    if (providerRefs.length > 0) {
+      try {
+        await cc.setProviderRefs(name, providerRefs);
+      } catch (err) {
+        request.log.warn({ err, teamName: name, providerRefs }, 'failed to set provider refs');
+      }
+    }
+
     return { ok: true, teamName: name, runId: null };
   } catch (err) {
     return reply.code(500).send({ error: err instanceof Error ? err.message : String(err) });
@@ -915,6 +927,10 @@ app.get<{ Params: { name: string } }>('/api/teams/:name/data', async (request, r
       typeof p.agent_mode === 'string' && p.agent_mode.trim().length > 0
         ? p.agent_mode.trim()
         : permissionMode;
+    const [providerRefs, globalProviders] = await Promise.all([
+      cc.getProviderRefs(name).catch(() => []),
+      cc.listProviders().catch(() => []),
+    ]);
 
     return {
       teamName: name,
@@ -955,6 +971,8 @@ app.get<{ Params: { name: string } }>('/api/teams/:name/data', async (request, r
       description,
       workDir: p.work_dir ?? workDir,
       permissionMode: resolvedPermissionMode,
+      providerRefs,
+      globalProviders,
       settings: {
         ...projectSettings,
         language: resolvedLanguage,
@@ -1009,6 +1027,8 @@ app.get<{ Params: { name: string } }>('/api/teams/:name/data', async (request, r
       description,
       workDir,
       permissionMode,
+      providerRefs: [],
+      globalProviders: [],
       heartbeat: null,
       settings: {
         language,
@@ -1042,6 +1062,9 @@ app.delete<{ Params: { name: string }; Querystring: { deleteFiles?: string } }>(
   '/api/teams/:name',
   async (request, reply) => {
     const teamName = request.params.name;
+    if (teamName === 'default' || teamName === 'my-project') {
+      return reply.code(403).send({ error: '该团队不可删除' });
+    }
     try {
       let restartRequired = false;
       try {
@@ -3406,6 +3429,9 @@ async function applyTeamConfigUpdate(
   const disabledCommands = Array.isArray(body.disabledCommands)
     ? normalizeStringArray(body.disabledCommands)
     : undefined;
+  const providerRefs = Array.isArray(body.providerRefs)
+    ? normalizeStringArray(body.providerRefs)
+    : undefined;
   const platformAllowFrom = body.platformAllowFrom
     ? normalizePlatformAllowFrom(body.platformAllowFrom)
     : undefined;
@@ -3470,6 +3496,13 @@ async function applyTeamConfigUpdate(
       ccSyncError = err instanceof Error ? err.message : String(err);
     }
   }
+  if (providerRefs !== undefined) {
+    try {
+      await cc.setProviderRefs(teamName, providerRefs);
+    } catch (err) {
+      ccSyncError = err instanceof Error ? err.message : String(err);
+    }
+  }
 
   return {
     name: name || teamName,
@@ -3486,6 +3519,7 @@ async function applyTeamConfigUpdate(
     replyFooter: replyFooter ?? false,
     injectSender: injectSender ?? false,
     platformAllowFrom: platformAllowFrom ?? {},
+    providerRefs: providerRefs ?? [],
     ccSyncError,
   };
 }
@@ -3557,6 +3591,10 @@ app.get<{ Params: { name: string } }>('/api/teams/:name/config', async (request,
       typeof p.agent_mode === 'string' && p.agent_mode.trim().length > 0
         ? p.agent_mode.trim()
         : permissionMode;
+    const [providerRefs, globalProviders] = await Promise.all([
+      cc.getProviderRefs(name).catch(() => []),
+      cc.listProviders().catch(() => []),
+    ]);
     return {
       name,
       color,
@@ -3572,6 +3610,8 @@ app.get<{ Params: { name: string } }>('/api/teams/:name/config', async (request,
       injectSender: resolvedInjectSender,
       permissionMode: resolvedPermissionMode,
       platformAllowFrom: resolvedPlatformAllowFrom,
+      providerRefs,
+      globalProviders,
       settings: {
         ...projectSettings,
         language: resolvedLanguage,

package/src/renderer/api/httpClient.ts

@@ -278,7 +278,7 @@ export class HttpAPIClient implements ElectronAPI {
     try {
       const res = await fetch(`${this.baseUrl}${path}`, {
         method: 'DELETE',
-        headers: { 'Content-Type': 'application/json' },
+        headers: body ? { 'Content-Type': 'application/json' } : undefined,
         body: body ? JSON.stringify(body) : undefined,
         signal: controller.signal,
       });

package/src/renderer/components/runtime/ProviderRuntimeSettingsDialog.tsx

@@ -10,6 +10,7 @@ import {
   DialogTitle,
 } from '@renderer/components/ui/dialog';
 import { Input } from '@renderer/components/ui/input';
+import { emitOpenHermitEvent, OPEN_HERMIT_EVENTS } from '@renderer/utils/openHermitEvents';
 import { Loader2, RefreshCw } from 'lucide-react';
 
 import type { CliProviderId, CliProviderStatus } from '@shared/types';
@@ -127,6 +128,7 @@ export const ProviderRuntimeSettingsDialog = ({
       setNewProviderBaseUrl('');
       setNewProviderApiKey('');
       await refreshProviders();
+      emitOpenHermitEvent(OPEN_HERMIT_EVENTS.providersChanged);
     } catch (err) {
       setAddError(err instanceof Error ? err.message : '添加 Provider 失败');
     } finally {

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

@@ -10,6 +10,7 @@ import {
   DialogTitle,
 } from '@renderer/components/ui/dialog';
 import { Textarea } from '@renderer/components/ui/textarea';
+import { emitOpenHermitEvent, OPEN_HERMIT_EVENTS } from '@renderer/utils/openHermitEvents';
 import appIcon from '@renderer/favicon.png';
 import { Check, FileEdit, Loader2, RefreshCw, RotateCcw, X } from 'lucide-react';
 
@@ -147,6 +148,7 @@ export const AdvancedSection = ({}: AdvancedSectionProps): React.JSX.Element =>
     setRestartMsg(null);
     try {
       await api.ccSettings.restart();
+      emitOpenHermitEvent(OPEN_HERMIT_EVENTS.runtimeRestarted);
       setRestartMsg('已重启');
     } catch {
       setRestartMsg('重启失败');

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

@@ -30,6 +30,7 @@ import { useStore } from '@renderer/store';
 import { createLoadingMultimodelCliStatus } from '@renderer/store/slices/cliInstallerSlice';
 import { getMainScreenCliProviders } from '@renderer/utils/claudeCodeOnlyProviders';
 import { formatBytes } from '@renderer/utils/formatters';
+import { emitOpenHermitEvent, OPEN_HERMIT_EVENTS } from '@renderer/utils/openHermitEvents';
 import { resolveProjectPathById } from '@renderer/utils/projectLookup';
 import { refreshCliStatusForCurrentMode } from '@renderer/utils/refreshCliStatus';
 import { getRuntimeDisplayName } from '@renderer/utils/runtimeDisplayName';
@@ -747,6 +748,7 @@ const GenericHarnessProviderDialog = ({
       setNewProviderBaseUrl('');
       setNewProviderModel('');
       onRefresh();
+      emitOpenHermitEvent(OPEN_HERMIT_EVENTS.providersChanged);
     } catch (err) {
       setAddProviderError(err instanceof Error ? err.message : '添加 Provider 失败');
     } finally {

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

@@ -11,6 +11,7 @@ import { providersApi } from '@renderer/api/providers';
 import { ALL_AGENT_TYPES, AGENT_TYPE_LABELS } from '@renderer/components/team/HarnessCards';
 import type { CcAgentType } from '@renderer/components/team/HarnessCards';
 import { cn } from '@renderer/lib/utils';
+import { OPEN_HERMIT_EVENTS } from '@renderer/utils/openHermitEvents';
 import { CheckCircle2 } from 'lucide-react';
 
 import { SettingsSectionHeader } from '../components/SettingsSectionHeader';
@@ -70,6 +71,16 @@ export const HarnessSection = (): React.JSX.Element => {
     void refresh();
   }, [refresh]);
 
+  useEffect(() => {
+    const handleProvidersChanged = () => {
+      void refresh();
+    };
+    window.addEventListener(OPEN_HERMIT_EVENTS.providersChanged, handleProvidersChanged);
+    return () => {
+      window.removeEventListener(OPEN_HERMIT_EVENTS.providersChanged, handleProvidersChanged);
+    };
+  }, [refresh]);
+
   // Build coverage map: agent type -> list of sources (providers + projects)
   const coveredTypes = new Map<CcAgentType, string[]>();
   for (const type of ALL_AGENT_TYPES) {

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

@@ -19,6 +19,7 @@ import {
 } from '@renderer/components/ui/dialog';
 import { Input } from '@renderer/components/ui/input';
 import { Label } from '@renderer/components/ui/label';
+import { emitOpenHermitEvent, OPEN_HERMIT_EVENTS } from '@renderer/utils/openHermitEvents';
 import {
   Select,
   SelectContent,
@@ -213,7 +214,9 @@ async function addPlatform(
     restart_required?: boolean;
   };
   if (!json.ok) throw new Error(json.error ?? '添加失败');
-  return { restartRequired: json.data?.restart_required === true || json.restart_required === true };
+  return {
+    restartRequired: json.data?.restart_required === true || json.restart_required === true,
+  };
 }
 
 // ---------------------------------------------------------------------------
@@ -490,7 +493,11 @@ function AddPlatformDialog({
         else if (v === 'false') ccOptions[k] = false;
         else ccOptions[k] = v;
       }
-      const result = await addPlatform(projectName, platformType, ccOptions as Record<string, string>);
+      const result = await addPlatform(
+        projectName,
+        platformType,
+        ccOptions as Record<string, string>
+      );
       onAdded(projectName);
       if (result.restartRequired) {
         const shouldRestart = await confirm({
@@ -501,6 +508,7 @@ function AddPlatformDialog({
         });
         if (shouldRestart) {
           await api.ccSettings.restart();
+          emitOpenHermitEvent(OPEN_HERMIT_EVENTS.runtimeRestarted);
         }
       }
     } catch (e) {

package/src/renderer/components/team/TeamDetailView.tsx

@@ -67,6 +67,7 @@ import {
   Plus,
   Terminal,
   Trash2,
+  Loader2,
   Users,
 } from 'lucide-react';
 import { useShallow } from 'zustand/react/shallow';
@@ -1065,6 +1066,7 @@ export const TeamDetailView = ({
 
   const [sendDialogOpen, setSendDialogOpen] = useState(false);
   const [deleteConfirmOpen, setDeleteConfirmOpen] = useState(false);
+  const [deleting, setDeleting] = useState(false);
   const [trashOpen, setTrashOpen] = useState(false);
   const [sendDialogRecipient, setSendDialogRecipient] = useState<string | undefined>(undefined);
   const [sendDialogDefaultText, setSendDialogDefaultText] = useState<string | undefined>(undefined);
@@ -1618,16 +1620,13 @@ export const TeamDetailView = ({
   );
 
   const handleRestartTeamFromEdit = useCallback(async (): Promise<void> => {
-    if (!data?.config.projectPath) {
-      throw new Error('团队缺少项目路径，无法自动重启。');
-    }
-    await api.teams.stop(teamName);
-    await launchTeam({
-      teamName,
-      cwd: data.config.projectPath,
-    });
-    await Promise.all([fetchTeams(), selectTeam(teamName)]);
-  }, [data?.config.projectPath, fetchTeams, launchTeam, selectTeam, teamName]);
+    await api.ccSettings.restart();
+    // Wait for cc-connect to come back, then refresh
+    setTimeout(() => {
+      void fetchTeams();
+      void selectTeam(teamName);
+    }, 3000);
+  }, [fetchTeams, selectTeam, teamName]);
 
   const handleSaveAndRestartFromEdit = useCallback(
     async (runtimeConfig: {
@@ -1827,29 +1826,25 @@ export const TeamDetailView = ({
   }, []);
 
   const confirmDeleteTeam = useCallback((): void => {
-    setDeleteConfirmOpen(false);
+    setDeleting(true);
     void (async () => {
       try {
         const result = await deleteTeam(teamName);
         if (result.restartRequired) {
-          const shouldRestart = await confirm({
-            title: '重启 cc-connect',
-            message: '团队已从配置中删除。需要重启 cc-connect 才会停止对应运行时。',
-            confirmLabel: '立即重启',
-            cancelLabel: '稍后重启',
-            variant: 'danger',
-          });
-          if (shouldRestart) {
-            await api.ccSettings.restart();
-          }
+          await api.ccSettings.restart();
         }
+        await fetchTeams();
+        setDeleteConfirmOpen(false);
         if (tabId) closeTab(tabId);
         openTeamsTab();
-      } catch {
-        // error is shown via store
+      } catch (err) {
+        console.error('Failed to delete team:', err);
+        setDeleteConfirmOpen(false);
+      } finally {
+        setDeleting(false);
       }
     })();
-  }, [teamName, deleteTeam, openTeamsTab, closeTab, tabId]);
+  }, [teamName, deleteTeam, openTeamsTab, closeTab, tabId, fetchTeams]);
 
   const handleCreateTask = (
     subject: string,
@@ -2163,19 +2158,21 @@ export const TeamDetailView = ({
                         {isTeamProvisioning ? '团队仍在编排中，暂时无法编辑' : '编辑团队'}
                       </TooltipContent>
                     </Tooltip>
-                    <Tooltip>
-                      <TooltipTrigger asChild>
-                        <Button
-                          variant="ghost"
-                          size="sm"
-                          className="h-7 gap-1 px-2 text-xs text-red-400 hover:bg-red-500/10 hover:text-red-300"
-                          onClick={handleDeleteTeam}
-                        >
-                          <Trash2 size={12} />
-                        </Button>
-                      </TooltipTrigger>
-                      <TooltipContent side="bottom">删除团队</TooltipContent>
-                    </Tooltip>
+                    {teamName !== 'default' && teamName !== 'my-project' && (
+                      <Tooltip>
+                        <TooltipTrigger asChild>
+                          <Button
+                            variant="ghost"
+                            size="sm"
+                            className="h-7 gap-1 px-2 text-xs text-red-400 hover:bg-red-500/10 hover:text-red-300"
+                            onClick={handleDeleteTeam}
+                          >
+                            <Trash2 size={12} />
+                          </Button>
+                        </TooltipTrigger>
+                        <TooltipContent side="bottom">删除团队</TooltipContent>
+                      </Tooltip>
+                    )}
                   </div>
                 </div>
                 {data.config.description && (
@@ -2653,6 +2650,8 @@ export const TeamDetailView = ({
                 currentManagedSources={currentManagedSources}
                 currentDisabledCommands={currentDisabledCommands}
                 currentPlatformAllowFrom={currentPlatformAllowFrom}
+                currentProviderRefs={data.providerRefs ?? []}
+                globalProviders={data.globalProviders ?? []}
                 currentMembers={membersWithLiveBranches.filter((m) => !isLeadMember(m))}
                 leadMember={membersWithLiveBranches.find((m) => isLeadMember(m)) ?? null}
                 resolvedMemberColorMap={resolvedMemberColorMap}
@@ -2665,9 +2664,10 @@ export const TeamDetailView = ({
                   void fetchTeams();
                   void selectTeam(teamName);
                 }}
-                onDeleteTeam={handleDeleteTeam}
+                onDeleteTeam={
+                  teamName !== 'default' && teamName !== 'my-project' ? handleDeleteTeam : undefined
+                }
                 onRestartTeam={handleRestartTeamFromEdit}
-                onSaveAndRestart={handleSaveAndRestartFromEdit}
               />
 
               <Dialog
@@ -2704,7 +2704,12 @@ export const TeamDetailView = ({
                 </DialogContent>
               </Dialog>
 
-              <Dialog open={deleteConfirmOpen} onOpenChange={setDeleteConfirmOpen}>
+              <Dialog
+                open={deleteConfirmOpen}
+                onOpenChange={(v) => {
+                  if (!deleting) setDeleteConfirmOpen(v);
+                }}
+              >
                 <DialogContent className="max-w-sm">
                   <DialogHeader>
                     <DialogTitle>删除团队</DialogTitle>
@@ -2717,8 +2722,14 @@ export const TeamDetailView = ({
                     <Button variant="ghost" size="sm" onClick={() => setDeleteConfirmOpen(false)}>
                       取消
                     </Button>
-                    <Button variant="destructive" size="sm" onClick={confirmDeleteTeam}>
-                      删除
+                    <Button
+                      variant="destructive"
+                      size="sm"
+                      onClick={confirmDeleteTeam}
+                      disabled={deleting}
+                    >
+                      {deleting && <Loader2 size={14} className="mr-1.5 animate-spin" />}
+                      删除并重启
                     </Button>
                   </DialogFooter>
                 </DialogContent>

package/src/renderer/components/team/TeamListView.tsx

@@ -33,6 +33,7 @@ import {
 } from '@renderer/store/utils/stateResetHelpers';
 import { buildMemberColorMap } from '@renderer/utils/memberHelpers';
 import { buildTaskCountsByTeam, normalizePath } from '@renderer/utils/pathNormalize';
+import { emitOpenHermitEvent, OPEN_HERMIT_EVENTS } from '@renderer/utils/openHermitEvents';
 import { getBaseName } from '@renderer/utils/pathUtils';
 import { nameColorSet } from '@renderer/utils/projectColor';
 import {
@@ -42,6 +43,7 @@ import {
   Download,
   FolderOpen,
   GitBranch,
+  Loader2,
   Play,
   RotateCcw,
   Search,
@@ -275,6 +277,7 @@ export const TeamListView = (): React.JSX.Element => {
   const [copyData, setCopyData] = useState<TeamCopyData | null>(null);
   const [searchQuery, setSearchQuery] = useState('');
   const [filter, setFilter] = useState<TeamListFilterState>(EMPTY_TEAM_FILTER);
+  const [deletingTeamName, setDeletingTeamName] = useState<string | null>(null);
   const [aliveTeams, setAliveTeams] = useState<string[]>([]);
   const {
     teams,
@@ -532,33 +535,28 @@ export const TeamListView = (): React.JSX.Element => {
         }
         const confirmed = await confirm({
           title: '删除团队',
-          message: `确定删除团队“${teamDisplayName}”吗？此操作会同步删除 cc-connect 项目并移除本地团队数据。`,
-          confirmLabel: '删除',
+          message: `确定删除团队”${teamDisplayName}”吗？此操作会同步删除 cc-connect 项目并移除本地团队数据。`,
+          confirmLabel: '删除并重启',
           cancelLabel: '取消',
           variant: 'danger',
         });
         if (confirmed) {
+          setDeletingTeamName(teamName);
           try {
             const result = await deleteTeam(teamName);
             if (result.restartRequired) {
-              const shouldRestart = await confirm({
-                title: '重启 cc-connect',
-                message: '团队已从配置中删除。需要重启 cc-connect 才会停止对应运行时。',
-                confirmLabel: '立即重启',
-                cancelLabel: '稍后重启',
-                variant: 'danger',
-              });
-              if (shouldRestart) {
-                await api.ccSettings.restart();
-              }
+              await api.ccSettings.restart();
             }
-          } catch {
-            // error via store
+            await fetchTeams();
+          } catch (err) {
+            console.error('Failed to delete team:', err);
+          } finally {
+            setDeletingTeamName(null);
           }
         }
       })();
     },
-    [deleteTeam, teams]
+    [deleteTeam, teams, fetchTeams]
   );
 
   const handleRestoreTeam = useCallback(
@@ -674,6 +672,19 @@ export const TeamListView = (): React.JSX.Element => {
     void fetchAllTasks();
   }, [fetchTeams, fetchAllTasks]);
 
+  useEffect(() => {
+    const refresh = () => {
+      void fetchTeams();
+      void fetchAllTasks();
+    };
+    window.addEventListener(OPEN_HERMIT_EVENTS.runtimeRestarted, refresh);
+    window.addEventListener(OPEN_HERMIT_EVENTS.teamsChanged, refresh);
+    return () => {
+      window.removeEventListener(OPEN_HERMIT_EVENTS.runtimeRestarted, refresh);
+      window.removeEventListener(OPEN_HERMIT_EVENTS.teamsChanged, refresh);
+    };
+  }, [fetchTeams, fetchAllTasks]);
+
   const taskCountsByTeam = useMemo(() => buildTaskCountsByTeam(globalTasks), [globalTasks]);
 
   const activeTeams = useMemo<ActiveTeamRef[]>(() => {
@@ -798,6 +809,7 @@ export const TeamListView = (): React.JSX.Element => {
     async (request: TeamCreateRequest) => {
       await createTeam(request);
       await Promise.all([fetchTeams(), fetchAllTasks()]);
+      emitOpenHermitEvent(OPEN_HERMIT_EVENTS.teamsChanged);
       window.setTimeout(() => {
         void fetchTeams();
         void fetchAllTasks();
@@ -1094,6 +1106,7 @@ export const TeamListView = (): React.JSX.Element => {
             const matchesCurrentProject = currentProjectPath
               ? teamMatchesProjectSelection(team, currentProjectPath)
               : false;
+            const isDeleting = deletingTeamName === team.teamName;
             return (
               <div
                 key={team.teamName}
@@ -1101,14 +1114,22 @@ export const TeamListView = (): React.JSX.Element => {
                 tabIndex={0}
                 className="group relative flex cursor-pointer flex-col overflow-hidden rounded-lg border border-l-[3px] border-[var(--color-border)] bg-[var(--color-surface)] p-4 hover:bg-[var(--color-surface-raised)]"
                 style={teamColorSet ? { borderLeftColor: teamColorSet.border } : undefined}
-                onClick={() => openTeamTab(team.teamName, team.projectPath)}
+                onClick={
+                  isDeleting ? undefined : () => openTeamTab(team.teamName, team.projectPath)
+                }
                 onKeyDown={(e) => {
                   if (e.key === 'Enter' || e.key === ' ') {
                     e.preventDefault();
-                    openTeamTab(team.teamName, team.projectPath);
+                    if (!isDeleting) openTeamTab(team.teamName, team.projectPath);
                   }
                 }}
               >
+                {isDeleting && (
+                  <div className="absolute inset-0 z-20 flex items-center justify-center gap-2 bg-black/60 text-sm text-white">
+                    <Loader2 size={16} className="animate-spin" />
+                    删除并重启中…
+                  </div>
+                )}
                 <div className="flex flex-1 flex-col">
                   <div className="flex items-start justify-between gap-2">
                     <div className="flex min-w-0 flex-1 items-center gap-2">
@@ -1165,20 +1186,22 @@ export const TeamListView = (): React.JSX.Element => {
                           <TooltipContent side="bottom">复制团队</TooltipContent>
                         </Tooltip>
                       )}
-                      <Tooltip>
-                        <TooltipTrigger asChild>
-                          <button
-                            type="button"
-                            className="shrink-0 rounded p-1 text-[var(--color-text-muted)] opacity-0 transition-opacity hover:bg-red-500/10 hover:text-red-300 group-hover:opacity-100"
-                            onClick={(e) =>
-                              handleDeleteTeam(team.teamName, !!team.pendingCreate, e)
-                            }
-                          >
-                            <Trash2 size={14} />
-                          </button>
-                        </TooltipTrigger>
-                        <TooltipContent side="bottom">删除团队</TooltipContent>
-                      </Tooltip>
+                      {team.teamName !== 'default' && team.teamName !== 'my-project' && (
+                        <Tooltip>
+                          <TooltipTrigger asChild>
+                            <button
+                              type="button"
+                              className="shrink-0 rounded p-1 text-[var(--color-text-muted)] opacity-0 transition-opacity hover:bg-red-500/10 hover:text-red-300 group-hover:opacity-100"
+                              onClick={(e) =>
+                                handleDeleteTeam(team.teamName, !!team.pendingCreate, e)
+                              }
+                            >
+                              <Trash2 size={14} />
+                            </button>
+                          </TooltipTrigger>
+                          <TooltipContent side="bottom">删除团队</TooltipContent>
+                        </Tooltip>
+                      )}
                     </div>
                   </div>
                   <div className="mt-2 flex min-h-10 items-start gap-2">