@yancyyu/openhermit 1.6.41 → 1.6.43

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

@@ -1193,7 +1193,7 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
     const parts: string[] = [];
     if (providerChangeForcesFreshLeadContext && previousProviderId) {
       parts.push(
-        `提供商已从 ${getProviderLabel(previousProviderId)} 更改为 ${getProviderLabel(selectedProviderId)}。之前的负责人会话不会恢复，负责人会以全新上下文启动。`
+        `提供商已从 ${getProviderLabel(previousProviderId)} 更改为 ${getProviderLabel(selectedProviderId)}。之前的 Lead 会话不会恢复，Lead 会以全新上下文启动。`
       );
     }
     const runtimeChange = runtimeChangeNoteByKey.get('lead');
@@ -1596,7 +1596,7 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
     if (!isLaunchMode) return [];
 
     const summary: string[] = [];
-    if (promptDraft.value.trim()) summary.push('负责人提示词');
+    if (promptDraft.value.trim()) summary.push('Lead 指令');
     const worktreeMemberCount = effectiveMemberDrafts.filter(
       (member) => !member.removedAt && member.isolation === 'worktree'
     ).length;
@@ -1646,7 +1646,7 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
     if (!effectiveCwd) errors.push('必须填写工作目录');
     if (isSchedule) {
       if (!effectiveTeamName) errors.push('必须选择团队');
-      if (!promptDraft.value.trim()) errors.push('必须填写提示词');
+      if (!promptDraft.value.trim()) errors.push('必须填写指令');
       if (!cronExpression.trim()) errors.push('必须填写 Cron 表达式');
     }
     return errors;
@@ -2052,7 +2052,8 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
       </>
     ) : (
       <>
-        通过 Agent CLI 启动数字员工 <span className="font-mono font-medium">{effectiveTeamName}</span>。
+        通过 Agent CLI 启动数字员工{' '}
+        <span className="font-mono font-medium">{effectiveTeamName}</span>。
       </>
     )
   ) : isEditing ? (
@@ -2202,7 +2203,8 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
                 <div className="flex items-start gap-2">
                   <AlertTriangle className="mt-0.5 size-3.5 shrink-0" />
                   <p>
-                    团队负责人会启动一个新会话，不再恢复之前的上下文。已积累的会话记忆和对话历史将不可用。
+                    Lead
+                    会启动一个新会话，不再恢复之前的上下文。已积累的会话记忆和运行历史将不可用。
                   </p>
                 </div>
               </div>
@@ -2392,9 +2394,9 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
 
             <div className="rounded-md border border-[var(--color-border)] bg-[var(--color-surface)] p-3">
               <div className="mb-2">
-                <p className="text-xs font-medium text-[var(--color-text)]">团队运行时</p>
+                <p className="text-xs font-medium text-[var(--color-text)]">运行时</p>
                 <p className="mt-0.5 text-[11px] text-[var(--color-text-muted)]">
-                  Provider 作用于整个团队；成员只选择模型，默认继承这里的 provider。
+                  Provider 作用于整个循环；成员只选择模型，默认继承这里的 provider。
                 </p>
               </div>
               <TeamModelSelector
@@ -2469,7 +2471,7 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
                       inheritModelSettingsByDefault
                       lockProviderModel={syncModelsWithLead}
                       forceInheritedModelSettings={syncModelsWithLead}
-                      modelLockReason="该成员当前与团队负责人模型保持同步。关闭同步后可单独设置提供商、模型或推理强度。"
+                      modelLockReason="该成员当前与 Lead 模型保持同步。关闭同步后可单独设置提供商、模型或推理强度。"
                       providerId={selectedProviderId}
                       model={selectedModel}
                       effort={(selectedEffort as EffortLevel) || undefined}
@@ -2495,7 +2497,7 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
 
                   <div className="space-y-1.5">
                     <Label htmlFor="dialog-prompt" className="label-optional">
-                      给团队负责人的提示（可选）
+                      给 Lead 的启动指令（可选）
                     </Label>
                     <MentionableTextarea
                       id="dialog-prompt"
@@ -2509,7 +2511,7 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
                       chips={chipDraft.chips}
                       onChipRemove={chipDraft.removeChip}
                       onFileChipInsert={chipDraft.addChip}
-                      placeholder="填写给团队负责人的说明..."
+                      placeholder="填写给 Lead 的循环目标、约束或启动说明..."
                       footerRight={
                         promptDraft.isSaved ? (
                           <span className="text-[10px] text-[var(--color-text-muted)]">已保存</span>
@@ -2541,7 +2543,8 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
                           <p>
                             提供商已从 {getProviderLabel(previousProviderId!)} 更改为{' '}
                             {getProviderLabel(selectedProviderId)}
-                            。之前的负责人会话不会恢复，负责人会以全新上下文启动，以正确应用新的运行时。
+                            。之前的 Lead 会话不会恢复，Lead
+                            会以全新上下文启动，以正确应用新的运行时。
                           </p>
                         </div>
                       </div>
@@ -2572,7 +2575,8 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
                         <div className="flex items-start gap-2">
                           <AlertTriangle className="mt-0.5 size-3.5 shrink-0" />
                           <p>
-                            团队负责人会启动一个新会话，不再恢复之前的上下文。已积累的会话记忆和对话历史将不可用。
+                            Lead
+                            会启动一个新会话，不再恢复之前的上下文。已积累的会话记忆和运行历史将不可用。
                           </p>
                         </div>
                       </div>
@@ -2594,7 +2598,7 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
             ) : (
               <>
                 <div className="space-y-1.5">
-                  <Label htmlFor="dialog-prompt">提示词</Label>
+                  <Label htmlFor="dialog-prompt">定时指令</Label>
                   <MentionableTextarea
                     id="dialog-prompt"
                     className="min-h-[100px] text-xs"
@@ -2607,7 +2611,7 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
                     chips={chipDraft.chips}
                     onChipRemove={chipDraft.removeChip}
                     onFileChipInsert={chipDraft.addChip}
-                    placeholder="填写定时执行时给 Claude 的说明..."
+                    placeholder="填写定时触发后交给 Lead 的循环指令..."
                     footerRight={
                       promptDraft.isSaved ? (
                         <span className="text-[10px] text-[var(--color-text-muted)]">已保存</span>
@@ -2615,7 +2619,7 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
                     }
                   />
                   <p className="text-[11px] text-[var(--color-text-muted)]">
-                    该提示词会传递给 <code className="font-mono">claude -p</code> 用于 one-shot
+                    该指令会传递给 <code className="font-mono">claude -p</code> 用于 one-shot
                     execution
                   </p>
                 </div>

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

@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 
 import { Button } from '@renderer/components/ui/button';
 import {
@@ -92,11 +92,17 @@ const PLATFORM_OPTIONS: PlatformOption[] = [
 
 type BindingStep = 'platform' | 'qr' | 'form';
 
+export interface PlatformBindingCompleteOptions {
+  restartHandled?: boolean;
+}
+
 interface PlatformBindingContentProps {
   projectName: string;
   workDir: string;
   agentType: string;
-  onComplete: () => void;
+  platformAllowFrom?: Record<string, string>;
+  platformAllowChat?: Record<string, string>;
+  onComplete: (options?: PlatformBindingCompleteOptions) => void;
   onCancel: () => void;
 }
 
@@ -104,6 +110,8 @@ export function PlatformBindingContent({
   projectName,
   workDir,
   agentType,
+  platformAllowFrom = {},
+  platformAllowChat = {},
   onComplete,
   onCancel,
 }: PlatformBindingContentProps): React.JSX.Element {
@@ -120,6 +128,26 @@ export function PlatformBindingContent({
     setStep(isQRPlatform(key) ? 'qr' : 'form');
   };
 
+  const initialFormValues = useMemo((): Record<string, unknown> => {
+    const meta = platformMeta[selectedPlatform];
+    const values: Record<string, unknown> = {};
+    const allowFrom =
+      selectedPlatform === 'lark'
+        ? (platformAllowFrom.lark ?? platformAllowFrom.feishu)
+        : platformAllowFrom[selectedPlatform];
+    const allowChat =
+      selectedPlatform === 'lark'
+        ? (platformAllowChat.lark ?? platformAllowChat.feishu)
+        : platformAllowChat[selectedPlatform];
+    if (allowFrom && meta?.fields.some((field) => field.key === 'allow_from')) {
+      values.allow_from = allowFrom;
+    }
+    if (allowChat && meta?.fields.some((field) => field.key === 'allow_chat')) {
+      values.allow_chat = allowChat;
+    }
+    return values;
+  }, [platformAllowChat, platformAllowFrom, selectedPlatform]);
+
   if (
     step === 'qr' &&
     (selectedPlatform === 'feishu' || selectedPlatform === 'lark' || selectedPlatform === 'weixin')
@@ -144,6 +172,7 @@ export function PlatformBindingContent({
         projectName={projectName}
         workDir={workDir}
         agentType={agentType}
+        initialValues={initialFormValues}
         onComplete={onComplete}
         onCancel={() => setStep('platform')}
       />
@@ -152,10 +181,11 @@ export function PlatformBindingContent({
 
   return (
     <div className="space-y-3 py-2">
-      <div className="rounded-md border border-[var(--color-border)] bg-[var(--color-surface)] px-3 py-2 text-xs text-[var(--color-text-muted)]">
-        绑定渠道是可选项，用于将数字员工暴露到飞书、微信等外部平台；不绑定也可以在本机直接运行。
-        <br />
-        <span className="text-amber-500">⚠️ 绑定新渠道后需要重启服务，将短暂中断所有正在运行的会话。</span>
+      <div className="bg-[var(--color-surface-raised)]/60 relative overflow-hidden rounded-xl border border-[var(--color-border-subtle)] px-3 py-2.5 text-xs text-[var(--color-text-muted)] shadow-sm shadow-black/10">
+        <div className="pointer-events-none absolute inset-x-6 top-0 h-px bg-gradient-to-r from-transparent via-[var(--color-accent-border)] to-transparent" />
+        <p>
+          绑定渠道是可选项，用于将数字员工暴露到飞书、微信等外部平台；不绑定也可以在本机直接运行。
+        </p>
       </div>
       <div className="grid max-h-80 grid-cols-2 gap-2 overflow-y-auto">
         {PLATFORM_OPTIONS.map(({ key, label, color, icon }) => (
@@ -163,14 +193,18 @@ export function PlatformBindingContent({
             key={key}
             type="button"
             onClick={() => handlePlatformSelect(key)}
-            className="flex items-center gap-2.5 rounded-xl border border-[var(--color-border)] bg-[var(--color-surface-raised)] p-3 text-left transition-all hover:border-[var(--color-border-emphasis)] hover:bg-[var(--color-accent)]/5"
+            className="group flex items-center gap-2.5 rounded-xl border border-[var(--color-border-subtle)] bg-[var(--color-surface-raised)] p-3 text-left shadow-sm shadow-black/5 transition-all duration-200 hover:-translate-y-0.5 hover:border-[var(--color-accent-border)] hover:bg-[var(--color-accent-soft)] hover:shadow-[0_10px_24px_rgba(0,0,0,0.18)]"
           >
-            <div className={`h-9 w-9 rounded-lg ${color} flex shrink-0 items-center justify-center`}>
+            <div
+              className={`h-9 w-9 rounded-lg ${color} flex shrink-0 items-center justify-center`}
+            >
               {icon === 'qr' ? <Smartphone size={16} /> : <Settings2 size={16} />}
             </div>
             <div className="min-w-0">
               <div className="truncate text-sm font-medium text-[var(--color-text)]">{label}</div>
-              <div className="text-[11px] text-[var(--color-text-muted)]">{icon === 'qr' ? '扫码绑定' : '手动配置'}</div>
+              <div className="text-[11px] text-[var(--color-text-muted)]">
+                {icon === 'qr' ? '扫码绑定' : '手动配置'}
+              </div>
             </div>
           </button>
         ))}
@@ -195,6 +229,8 @@ export function PlatformBindingDialog({
   projectName,
   workDir,
   agentType,
+  platformAllowFrom,
+  platformAllowChat,
   onComplete,
   onCancel,
 }: PlatformBindingDialogProps): React.JSX.Element {
@@ -204,7 +240,7 @@ export function PlatformBindingDialog({
         <DialogHeader>
           <DialogTitle className="text-sm">绑定渠道</DialogTitle>
           <DialogDescription className="text-xs">
-            可选：为当前数字员工选择外部平台渠道，绑定后通过 Hermit 对外接收消息。
+            可选：为当前数字员工选择外部平台渠道，绑定后通过 Hermit 对外接收 Loop 指令。
           </DialogDescription>
         </DialogHeader>
         <PlatformBindingContent
@@ -212,6 +248,8 @@ export function PlatformBindingDialog({
           projectName={projectName}
           workDir={workDir}
           agentType={agentType}
+          platformAllowFrom={platformAllowFrom}
+          platformAllowChat={platformAllowChat}
           onComplete={onComplete}
           onCancel={onCancel}
         />

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

@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { Button } from '@renderer/components/ui/button';
 import { Input } from '@renderer/components/ui/input';
 import { Label } from '@renderer/components/ui/label';
@@ -13,7 +13,8 @@ interface Props {
   projectName: string;
   workDir: string;
   agentType: string;
-  onComplete: () => void;
+  initialValues?: Record<string, unknown>;
+  onComplete: (options?: { restartHandled?: boolean }) => void;
   onCancel: () => void;
 }
 
@@ -23,15 +24,19 @@ export default function PlatformManualForm({
   projectName,
   workDir,
   agentType,
+  initialValues = {},
   onComplete,
   onCancel,
 }: Props) {
-  const [values, setValues] = useState<Record<string, unknown>>({});
+  const [values, setValues] = useState<Record<string, unknown>>(initialValues);
   const [showAdvanced, setShowAdvanced] = useState(false);
   const [saving, setSaving] = useState(false);
-  const [restarting, setRestarting] = useState(false);
   const [error, setError] = useState('');
 
+  useEffect(() => {
+    setValues(initialValues);
+  }, [initialValues, platformType]);
+
   const basicFields = meta.fields.filter((f) => f.group !== 'advanced');
   const advancedFields = meta.fields.filter((f) => f.group === 'advanced');
 
@@ -52,23 +57,17 @@ export default function PlatformManualForm({
           opts[f.key] = v;
         }
       }
-      await api.ccSetup.addPlatform(projectName, {
+      const result = await api.ccSetup.addPlatform(projectName, {
         type: platformType,
         options: opts,
         work_dir: workDir,
         agent_type: agentType,
       });
-      // Restart CC Connect to activate the new platform binding
-      setRestarting(true);
-      try {
-        await api.ccSettings.restart();
-      } catch { /* best effort */ }
-      onComplete();
+      onComplete({ restartHandled: result.restart_handled === true });
     } catch (e: unknown) {
       setError(e instanceof Error ? e.message : String(e));
     } finally {
       setSaving(false);
-      setRestarting(false);
     }
   };
 

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

@@ -2,15 +2,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import { QRCodeSVG } from 'qrcode.react';
 import { Button } from '@renderer/components/ui/button';
 import { api } from '@renderer/api';
-import {
-  AlertCircle,
-  CheckCircle2,
-  Loader2,
-  RefreshCw,
-  RotateCcw,
-  Smartphone,
-  XCircle,
-} from 'lucide-react';
+import { AlertCircle, CheckCircle2, Loader2, RefreshCw, Smartphone, XCircle } from 'lucide-react';
 
 type PlatformKind = 'feishu' | 'lark' | 'weixin';
 type Phase =
@@ -30,7 +22,7 @@ interface Props {
   projectName: string;
   workDir: string;
   agentType: string;
-  onComplete: () => void;
+  onComplete: (options?: { restartHandled?: boolean }) => void;
   onCancel: () => void;
 }
 
@@ -98,7 +90,7 @@ export default function PlatformSetupQR({
           switch (res.status) {
             case 'completed':
               setPhase('saving');
-              await api.ccSetup.feishuSave({
+              const saved = await api.ccSetup.feishuSave({
                 project: projectName,
                 app_id: res.app_id!,
                 app_secret: res.app_secret!,
@@ -107,6 +99,13 @@ export default function PlatformSetupQR({
                 work_dir: workDir,
                 agent_type: agentType,
               });
+              if (saved.restart_required) {
+                setPhase('restarting');
+                await api.ccSettings.restart();
+                onComplete({ restartHandled: true });
+                pollingRef.current = false;
+                return;
+              }
               setPhase('completed');
               pollingRef.current = false;
               return;
@@ -167,7 +166,7 @@ export default function PlatformSetupQR({
               break;
             case 'confirmed':
               setPhase('saving');
-              await api.ccSetup.weixinSave({
+              const saved = await api.ccSetup.weixinSave({
                 project: projectName,
                 token: pollRes.bot_token!,
                 base_url: pollRes.base_url,
@@ -176,6 +175,12 @@ export default function PlatformSetupQR({
                 work_dir: workDir,
                 agent_type: agentType,
               });
+              if (saved.restart_required) {
+                setPhase('restarting');
+                await api.ccSettings.restart();
+                onComplete({ restartHandled: true });
+                return;
+              }
               setPhase('completed');
               return;
             case 'expired':
@@ -207,6 +212,13 @@ export default function PlatformSetupQR({
     startFlow();
   };
 
+  const handleComplete = (): void => {
+    if (phase === 'restarting') return;
+    setError('');
+    setPhase('restarting');
+    onComplete();
+  };
+
   const platformLabel = isFeishu ? '飞书 / Lark' : '微信 (ilink)';
   const scanHint = isFeishu ? '打开飞书 / Lark App 扫描二维码' : '打开微信扫描二维码';
 
@@ -259,38 +271,28 @@ export default function PlatformSetupQR({
         </>
       )}
 
-      {phase === 'completed' && (
+      {(phase === 'completed' || phase === 'restarting') && (
         <div className="flex flex-col items-center gap-3 py-4">
-          <CheckCircle2 size={48} className="text-green-500" />
+          {phase === 'restarting' ? (
+            <Loader2 size={48} className="animate-spin text-indigo-500" />
+          ) : (
+            <CheckCircle2 size={48} className="text-green-500" />
+          )}
           <p className="text-sm font-medium text-green-700 dark:text-green-400">平台绑定成功！</p>
-          <p className="text-center text-xs text-gray-500">重启服务使新平台生效</p>
+          <p className="text-center text-xs text-gray-500">
+            {phase === 'restarting'
+              ? '正在重启服务并刷新平台长连接...'
+              : '下一步将统一重启服务并刷新平台长连接。'}
+          </p>
           <div className="flex gap-2">
-            <Button
-              variant="outline"
-              onClick={async () => {
-                try {
-                  await api.ccSettings.restart();
-                  setPhase('restarting');
-                  setTimeout(() => onComplete(), 3000);
-                } catch (e: unknown) {
-                  setError(e instanceof Error ? e.message : String(e));
-                }
-              }}
-            >
-              <RotateCcw size={14} /> 立即重启
+            <Button onClick={handleComplete} disabled={phase === 'restarting'}>
+              {phase === 'restarting' && <Loader2 size={14} className="mr-1.5 animate-spin" />}
+              {phase === 'restarting' ? '正在重启...' : '重启并完成'}
             </Button>
-            <Button onClick={onComplete}>稍后</Button>
           </div>
         </div>
       )}
 
-      {phase === 'restarting' && (
-        <div className="flex flex-col items-center gap-3 py-4">
-          <Loader2 size={32} className="animate-spin text-indigo-500" />
-          <p className="text-sm text-gray-600 dark:text-gray-400">正在重启服务...</p>
-        </div>
-      )}
-
       {phase === 'expired' && (
         <div className="flex flex-col items-center gap-3 py-4">
           <XCircle size={48} className="text-amber-500" />
@@ -321,7 +323,7 @@ export default function PlatformSetupQR({
         </div>
       )}
 
-      {phase !== 'completed' && phase !== 'restarting' && (
+      {phase !== 'completed' && (
         <button
           onClick={onCancel}
           className="mt-2 text-xs text-gray-400 hover:text-gray-600 dark:hover:text-gray-300"