@yancyyu/openhermit 1.6.25 → 1.6.27

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,28 @@ 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 +338,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 +383,7 @@ export const CreateTeamDialog = ({
     setFieldErrors({});
     setIsSubmitting(false);
     setConflictDismissed(false);
+    setSelectedProviderRef(null);
   };
 
   // ── Platform selection ───────────────────────────────────────────────
@@ -402,6 +449,7 @@ export const CreateTeamDialog = ({
         harness: selectedHarness,
         platform: selectedPlatform || 'bridge',
         platformOptions: {},
+        providerRefs: selectedProviderRef ? [selectedProviderRef] : undefined,
       };
       await onCreate(request);
       onOpenTeam(request.teamName, effectiveCwd || undefined);
@@ -527,6 +575,81 @@ 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>
         )}
 

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

@@ -15,6 +15,8 @@ import {
 import { Loader2, Trash2 } from 'lucide-react';
 
 import type { ResolvedTeamMember } from '@shared/types';
+import type { CcAgentType } from '@shared/types/ccConnect';
+import type { GlobalProvider } from '@shared/types/providers';
 
 interface EditTeamDialogProps {
   open: boolean;
@@ -32,6 +34,8 @@ interface EditTeamDialogProps {
   currentManagedSources?: string;
   currentDisabledCommands?: string[];
   currentPlatformAllowFrom?: Record<string, string>;
+  currentProviderRefs?: string[];
+  globalProviders?: GlobalProvider[];
   currentMembers: ResolvedTeamMember[];
   leadMember?: ResolvedTeamMember | null;
   resolvedMemberColorMap?: ReadonlyMap<string, string>;
@@ -44,8 +48,6 @@ interface EditTeamDialogProps {
   onSaved: () => Promise<void> | void;
   onRestartTeam?: () => Promise<void> | void;
   onDeleteTeam?: () => void;
-  /** Deprecated in cc-connect mode: edit team no longer restarts runtime. */
-  onSaveAndRestart?: unknown;
 }
 
 const PERMISSION_MODE_OPTIONS = [
@@ -71,9 +73,13 @@ export const EditTeamDialog = ({
   currentManagedSources = '*',
   currentDisabledCommands = [],
   currentPlatformAllowFrom = {},
+  currentProviderRefs = [],
+  globalProviders = [],
+  isTeamAlive = false,
   isTeamProvisioning = false,
   onClose,
   onSaved,
+  onRestartTeam,
   onDeleteTeam,
 }: EditTeamDialogProps): React.JSX.Element => {
   const [name, setName] = useState(currentName);
@@ -90,6 +96,7 @@ export const EditTeamDialog = ({
     currentDisabledCommands.join(', ')
   );
   const [feishuAllowFrom, setFeishuAllowFrom] = useState(currentPlatformAllowFrom.feishu ?? '*');
+  const [providerRefs, setProviderRefs] = useState<string>(currentProviderRefs[0] ?? '');
   const [saving, setSaving] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
@@ -107,6 +114,7 @@ export const EditTeamDialog = ({
     setManagedSources(currentManagedSources);
     setDisabledCommandsInput(currentDisabledCommands.join(', '));
     setFeishuAllowFrom(currentPlatformAllowFrom.feishu ?? '*');
+    setProviderRefs(currentProviderRefs[0] ?? '');
     setError(null);
   }, [
     open,
@@ -122,6 +130,7 @@ export const EditTeamDialog = ({
     currentManagedSources,
     currentDisabledCommands,
     currentPlatformAllowFrom,
+    currentProviderRefs,
   ]);
 
   const clearError = (): void => setError(null);
@@ -160,6 +169,7 @@ export const EditTeamDialog = ({
           managedSources: managedSources.trim() || undefined,
           disabledCommands,
           platformAllowFrom: feishu ? { feishu } : {},
+          providerRefs: providerRefs ? [providerRefs] : [],
         });
         await Promise.resolve(onSaved());
         onClose();
@@ -171,6 +181,18 @@ export const EditTeamDialog = ({
     })();
   };
 
+  const compatibleProviders = globalProviders.filter(
+    (provider) =>
+      !provider.agent_types ||
+      provider.agent_types.length === 0 ||
+      (provider.agent_types as string[]).includes(agentType)
+  );
+
+  const toggleProviderRef = (providerName: string): void => {
+    clearError();
+    setProviderRefs((prev) => (prev === providerName ? '' : providerName));
+  };
+
   return (
     <Dialog open={open} onOpenChange={(nextOpen) => !nextOpen && onClose()}>
       <DialogContent className="max-w-2xl">
@@ -340,6 +362,80 @@ export const EditTeamDialog = ({
               />
             </div>
 
+            <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[agentType as CcAgentType] ?? agentType}{' '}
+                    默认配置和登录状态。 只有需要给该团队指定模型供应商时，才绑定下面的全局
+                    Provider。
+                  </p>
+                </div>
+                {providerRefs ? (
+                  <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={() => setProviderRefs('')}
+                  >
+                    使用本机默认
+                  </button>
+                ) : null}
+              </div>
+
+              <div className="mt-3 space-y-2">
+                {compatibleProviders.length > 0 ? (
+                  compatibleProviders.map((provider) => {
+                    const checked = providerRefs === provider.name;
+                    const at = agentType as CcAgentType;
+                    const endpoint = provider.endpoints?.[at] ?? provider.base_url ?? '默认端点';
+                    const model =
+                      provider.agent_models?.[at] ??
+                      provider.model ??
+                      provider.models?.[0]?.model ??
+                      '未指定模型';
+                    return (
+                      <button
+                        key={provider.name}
+                        type="button"
+                        onClick={() => toggleProviderRef(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[agentType as CcAgentType] ?? agentType} 的全局
+                    Provider。 可先在「设置 → Harness 配置」中添加；不添加也会使用本机默认登录态。
+                  </div>
+                )}
+              </div>
+            </div>
+
             <div>
               <label className="mb-1 block text-xs font-medium text-[var(--color-text-secondary)]">
                 平台访问控制（Feishu 允许的用户）

package/src/renderer/utils/openHermitEvents.ts

@@ -0,0 +1,9 @@
+export const OPEN_HERMIT_EVENTS = {
+  providersChanged: 'openhermit:providers-changed',
+  teamsChanged: 'openhermit:teams-changed',
+  runtimeRestarted: 'openhermit:runtime-restarted',
+} as const;
+
+export function emitOpenHermitEvent(eventName: string): void {
+  window.dispatchEvent(new Event(eventName));
+}

package/src/shared/types/team.ts

@@ -66,6 +66,7 @@ export interface TeamUpdateConfigRequest {
   leadModel?: string;
   leadEffort?: EffortLevel;
   leadWorkflow?: string;
+  providerRefs?: string[];
 }
 
 export interface TeamSummaryMember {
@@ -992,6 +993,8 @@ export interface TeamViewSnapshot {
   workDir?: string;
   permissionMode?: string;
   settings?: Record<string, unknown>;
+  providerRefs?: string[];
+  globalProviders?: import('./providers').GlobalProvider[];
 }
 
 export type EffortLevel = 'none' | 'minimal' | 'low' | 'medium' | 'high' | 'xhigh' | 'max';
@@ -1394,6 +1397,8 @@ export interface TeamCreateRequest {
   platform?: string;
   /** Platform-specific options (app_id, app_secret, allow_from, share_session, etc.) */
   platformOptions?: Record<string, string | boolean>;
+  /** Provider names to bind to the team project in cc-connect. */
+  providerRefs?: string[];
 }
 
 export interface TeamCreateConfigRequest {

package/dist-renderer/assets/channel-CqQK8EX1.js

@@ -1 +0,0 @@
-import{a6 as o,a7 as n}from"./index-CrOkTuIK.js";const t=(a,r)=>o.lang.round(n.parse(a)[r]);export{t as c};

package/dist-renderer/assets/classDiagram-2ON5EDUG-9A3Cg8IA.js

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-B4BG7PRW-Cmu8IjLN.js";import{_ as i}from"./index-CrOkTuIK.js";import"./chunk-FMBD7UC4-BZNeq0CB.js";import"./chunk-55IACEB6-BddOEwBk.js";import"./chunk-QN33PNHL-DMb3gYzN.js";import"./splashScene-C8lWNnm4.js";var u={parser:e,get db(){return new t},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{u as diagram};

package/dist-renderer/assets/classDiagram-v2-WZHVMYZB-9A3Cg8IA.js

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-B4BG7PRW-Cmu8IjLN.js";import{_ as i}from"./index-CrOkTuIK.js";import"./chunk-FMBD7UC4-BZNeq0CB.js";import"./chunk-55IACEB6-BddOEwBk.js";import"./chunk-QN33PNHL-DMb3gYzN.js";import"./splashScene-C8lWNnm4.js";var u={parser:e,get db(){return new t},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{u as diagram};

package/dist-renderer/assets/clone-Bnr-WjeU.js

@@ -1 +0,0 @@
-import{b as r}from"./_baseUniq-BDBpSAHY.js";var e=4;function a(o){return r(o,e)}export{a as c};