@yancyyu/openhermit 1.6.25 → 1.6.26

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, '..', '..');
@@ -816,6 +806,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 +915,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 +959,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 +1015,8 @@ app.get<{ Params: { name: string } }>('/api/teams/:name/data', async (request, r
       description,
       workDir,
       permissionMode,
+      providerRefs: [],
+      globalProviders: [],
       heartbeat: null,
       settings: {
         language,
@@ -1042,6 +1050,9 @@ app.delete<{ Params: { name: string }; Querystring: { deleteFiles?: string } }>(
   '/api/teams/:name',
   async (request, reply) => {
     const teamName = request.params.name;
+    if (teamName === 'default') {
+      return reply.code(403).send({ error: 'default 团队不可删除' });
+    }
     try {
       let restartRequired = false;
       try {
@@ -3406,6 +3417,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 +3484,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 +3507,7 @@ async function applyTeamConfigUpdate(
     replyFooter: replyFooter ?? false,
     injectSender: injectSender ?? false,
     platformAllowFrom: platformAllowFrom ?? {},
+    providerRefs: providerRefs ?? [],
     ccSyncError,
   };
 }
@@ -3557,6 +3579,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 +3598,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/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

@@ -1618,16 +1618,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: {
@@ -1832,21 +1829,12 @@ export const TeamDetailView = ({
       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();
         }
         if (tabId) closeTab(tabId);
         openTeamsTab();
-      } catch {
-        // error is shown via store
+      } catch (err) {
+        console.error('Failed to delete team:', err);
       }
     })();
   }, [teamName, deleteTeam, openTeamsTab, closeTab, tabId]);
@@ -2163,6 +2151,7 @@ export const TeamDetailView = ({
                         {isTeamProvisioning ? '团队仍在编排中，暂时无法编辑' : '编辑团队'}
                       </TooltipContent>
                     </Tooltip>
+                    {teamName !== 'default' && (
                     <Tooltip>
                       <TooltipTrigger asChild>
                         <Button
@@ -2176,6 +2165,7 @@ export const TeamDetailView = ({
                       </TooltipTrigger>
                       <TooltipContent side="bottom">删除团队</TooltipContent>
                     </Tooltip>
+                    )}
                   </div>
                 </div>
                 {data.config.description && (
@@ -2653,6 +2643,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 +2657,8 @@ export const TeamDetailView = ({
                   void fetchTeams();
                   void selectTeam(teamName);
                 }}
-                onDeleteTeam={handleDeleteTeam}
+                onDeleteTeam={teamName !== 'default' ? handleDeleteTeam : undefined}
                 onRestartTeam={handleRestartTeamFromEdit}
-                onSaveAndRestart={handleSaveAndRestartFromEdit}
               />
 
               <Dialog

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 {
@@ -541,19 +542,11 @@ export const TeamListView = (): React.JSX.Element => {
           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();
+              emitOpenHermitEvent(OPEN_HERMIT_EVENTS.runtimeRestarted);
             }
-          } catch {
-            // error via store
+          } catch (err) {
+            console.error('Failed to delete team:', err);
           }
         }
       })();
@@ -674,6 +667,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 +804,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();
@@ -1165,6 +1172,7 @@ export const TeamListView = (): React.JSX.Element => {
                           <TooltipContent side="bottom">复制团队</TooltipContent>
                         </Tooltip>
                       )}
+                      {team.teamName !== 'default' && (
                       <Tooltip>
                         <TooltipTrigger asChild>
                           <button
@@ -1179,6 +1187,7 @@ export const TeamListView = (): React.JSX.Element => {
                         </TooltipTrigger>
                         <TooltipContent side="bottom">删除团队</TooltipContent>
                       </Tooltip>
+                      )}
                     </div>
                   </div>
                   <div className="mt-2 flex min-h-10 items-start gap-2">

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

@@ -54,6 +54,9 @@ import PlatformManualForm from './PlatformManualForm';
 
 import type { Project, TeamCreateRequest } from '@shared/types';
 import type { CcAgentType } from '@shared/types/ccConnect';
+import type { GlobalProvider } from '@shared/types/providers';
+
+import { providersApi } from '@renderer/api/providers';
 
 export interface ActiveTeamRef {
   teamName: string;
@@ -252,6 +255,10 @@ export const CreateTeamDialog = ({
   const [projectsLoading, setProjectsLoading] = useState(false);
   const [projectsError, setProjectsError] = useState<string | null>(null);
 
+  // ── Global providers ─────────────────────────────────────────────────
+  const [globalProviders, setGlobalProviders] = useState<GlobalProvider[]>([]);
+  const [selectedProviderRef, setSelectedProviderRef] = useState<string | null>(null);
+
   // ── Errors / submission ──────────────────────────────────────────────
   const [localError, setLocalError] = useState<string | null>(null);
   const [isSubmitting, setIsSubmitting] = useState(false);
@@ -273,6 +280,27 @@ export const CreateTeamDialog = ({
         : selectedProjectPath.trim()
       : customCwd.trim();
 
+  const compatibleProviders = useMemo(
+    () =>
+      globalProviders.filter(
+        (p) => !p.agent_types || p.agent_types.length === 0 || p.agent_types.includes(selectedHarness)
+      ),
+    [globalProviders, selectedHarness]
+  );
+
+  const selectProviderRef = (providerName: string) => {
+    setSelectedProviderRef((prev) => prev === providerName ? null : providerName);
+  };
+
+  // Clear selected provider when harness changes and it's no longer compatible
+  useEffect(() => {
+    setSelectedProviderRef((prev) => {
+      if (!prev) return prev;
+      const compatible = new Set(compatibleProviders.map((p) => p.name));
+      return compatible.has(prev) ? prev : null;
+    });
+  }, [compatibleProviders]);
+
   const conflictingTeam = useMemo(() => {
     if (!activeTeams?.length || !effectiveCwd) return null;
     const norm = normalizePath(effectiveCwd);
@@ -309,6 +337,23 @@ export const CreateTeamDialog = ({
     };
   }, [open]);
 
+  // ── Load global providers on open ────────────────────────────────────
+  useEffect(() => {
+    if (!open) return;
+    let cancelled = false;
+    void (async () => {
+      try {
+        const result = await providersApi.list();
+        if (!cancelled) setGlobalProviders(result.providers ?? []);
+      } catch {
+        if (!cancelled) setGlobalProviders([]);
+      }
+    })();
+    return () => {
+      cancelled = true;
+    };
+  }, [open]);
+
   // ── Auto-select default project path ─────────────────────────────────
   useEffect(() => {
     if (!open || cwdMode !== 'project' || selectedProjectPath) return;
@@ -337,6 +382,7 @@ export const CreateTeamDialog = ({
     setFieldErrors({});
     setIsSubmitting(false);
     setConflictDismissed(false);
+    setSelectedProviderRef(null);
   };
 
   // ── Platform selection ───────────────────────────────────────────────
@@ -402,6 +448,7 @@ export const CreateTeamDialog = ({
         harness: selectedHarness,
         platform: selectedPlatform || 'bridge',
         platformOptions: {},
+        providerRefs: selectedProviderRef ? [selectedProviderRef] : undefined,
       };
       await onCreate(request);
       onOpenTeam(request.teamName, effectiveCwd || undefined);
@@ -527,6 +574,79 @@ export const CreateTeamDialog = ({
               projectsError={projectsError}
               fieldError={fieldErrors.cwd}
             />
+
+            {/* Provider selection */}
+            <div className="rounded-lg border border-[var(--color-border-subtle)] bg-white/[0.02] p-3">
+              <div className="flex items-start justify-between gap-3">
+                <div>
+                  <p className="text-xs font-medium text-[var(--color-text)]">Provider（可选）</p>
+                  <p className="mt-1 text-[11px] leading-relaxed text-[var(--color-text-muted)]">
+                    留空时使用本机 {AGENT_TYPE_LABELS[selectedHarness] ?? selectedHarness} 默认配置和登录状态。
+                    只有需要给该团队指定模型供应商时，才绑定下面的全局 Provider。
+                  </p>
+                </div>
+                {selectedProviderRef ? (
+                  <button
+                    type="button"
+                    className="shrink-0 rounded-md border border-[var(--color-border)] px-2 py-1 text-[11px] text-[var(--color-text-muted)] hover:bg-white/5"
+                    onClick={() => setSelectedProviderRef(null)}
+                  >
+                    使用本机默认
+                  </button>
+                ) : null}
+              </div>
+
+              <div className="mt-3 space-y-2">
+                {compatibleProviders.length > 0 ? (
+                  compatibleProviders.map((provider) => {
+                    const checked = selectedProviderRef === provider.name;
+                    const endpoint = provider.endpoints?.[selectedHarness] ?? provider.base_url ?? '默认端点';
+                    const model =
+                      provider.agent_models?.[selectedHarness] ??
+                      provider.model ??
+                      provider.models?.[0]?.model ??
+                      '未指定模型';
+                    return (
+                      <button
+                        key={provider.name}
+                        type="button"
+                        onClick={() => selectProviderRef(provider.name)}
+                        className={`w-full rounded-lg border px-3 py-2 text-left transition-colors ${
+                          checked
+                            ? 'border-indigo-400/60 bg-indigo-500/10'
+                            : 'border-[var(--color-border-subtle)] bg-black/10 hover:border-[var(--color-border)] hover:bg-white/[0.04]'
+                        }`}
+                      >
+                        <div className="flex items-center justify-between gap-3">
+                          <div className="min-w-0">
+                            <p className="truncate text-xs font-medium text-[var(--color-text)]">
+                              {provider.name}
+                            </p>
+                            <p className="mt-0.5 truncate text-[11px] text-[var(--color-text-muted)]">
+                              {model} · {endpoint}
+                            </p>
+                          </div>
+                          <span
+                            className={`shrink-0 rounded-full px-2 py-0.5 text-[10px] ${
+                              checked
+                                ? 'bg-indigo-400/20 text-indigo-200'
+                                : 'bg-white/5 text-[var(--color-text-muted)]'
+                            }`}
+                          >
+                            {checked ? '已绑定' : '可绑定'}
+                          </span>
+                        </div>
+                      </button>
+                    );
+                  })
+                ) : (
+                  <div className="rounded-md border border-dashed border-[var(--color-border)] px-3 py-3 text-xs text-[var(--color-text-muted)]">
+                    暂无适用于 {AGENT_TYPE_LABELS[selectedHarness] ?? selectedHarness} 的全局 Provider。
+                    可先在「设置 → Harness 配置」中添加；不添加也会使用本机默认登录态。
+                  </div>
+                )}
+              </div>
+            </div>
           </div>
         )}