@yancyyu/openhermit 1.6.29 → 1.6.31

package/src/renderer/components/extensions/mcp/McpServerDetailDialog.tsx

@@ -15,6 +15,12 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@renderer/components/ui/dialog';
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from '@renderer/components/ui/tooltip';
 import { Input } from '@renderer/components/ui/input';
 import { Label } from '@renderer/components/ui/label';
 import {
@@ -26,6 +32,7 @@ import {
 } from '@renderer/components/ui/select';
 import { useStore } from '@renderer/store';
 import {
+  getExtensionActionDisableReason,
   getMcpInstallationSummaryLabel,
   getMcpOperationKey,
   getPreferredMcpInstallationEntry,
@@ -37,9 +44,10 @@ import {
   isProjectScopedMcpScope,
   isSharedMcpScope,
 } from '@shared/utils/mcpScopes';
-import { ExternalLink, Lock, Plus, Star, Trash2, Wrench } from 'lucide-react';
+import { Check, ExternalLink, Loader2, Lock, Plus, Star, Trash2, Wrench } from 'lucide-react';
 
 import { InstallButton } from '../common/InstallButton';
+import { HarnessSelector } from '../common/HarnessSelector';
 import { SourceBadge } from '../common/SourceBadge';
 
 import type { CliInstallationStatus } from '@shared/types';
@@ -98,6 +106,7 @@ export const McpServerDetailDialog = ({
   );
 
   const [serverName, setServerName] = useState('');
+  const [harnessType, setHarnessType] = useState('claudecode');
   const [envValues, setEnvValues] = useState<Record<string, string>>({});
   const [headers, setHeaders] = useState<McpHeaderDef[]>([]);
   const [imgError, setImgError] = useState(false);
@@ -254,6 +263,18 @@ export const McpServerDetailDialog = ({
     missingRequiredEnvVars ||
     missingRequiredHeaders ||
     scopeRequiresProjectPath;
+  const installCliDisableReason = getExtensionActionDisableReason({
+    isInstalled: false,
+    cliStatus,
+    cliStatusLoading: cliStatusLoading ?? false,
+    section: 'mcp',
+  });
+  const uninstallCliDisableReason = getExtensionActionDisableReason({
+    isInstalled: true,
+    cliStatus,
+    cliStatusLoading: cliStatusLoading ?? false,
+    section: 'mcp',
+  });
   const diagnosticBadgeClass =
     diagnostic?.status === 'connected'
       ? 'border-emerald-500/30 bg-emerald-500/10 text-emerald-400'
@@ -271,6 +292,7 @@ export const McpServerDetailDialog = ({
       projectPath: isProjectScopedMcpScope(scope) ? (projectPath ?? undefined) : undefined,
       envValues,
       headers,
+      harnessType,
     });
   };
 
@@ -493,6 +515,14 @@ export const McpServerDetailDialog = ({
               </Select>
             </div>
 
+            {/* Harness selector */}
+            <HarnessSelector
+              capability="mcp"
+              value={harnessType}
+              onChange={setHarnessType}
+              disabled={isInstalledForScope}
+            />
+
             {/* Environment variables */}
             {server.envVars.length > 0 && (
               <div className="space-y-1.5">
@@ -588,20 +618,86 @@ export const McpServerDetailDialog = ({
               </div>
             )}
 
-            {/* Install/Uninstall button */}
-            <div className="flex justify-end pt-1">
-              <InstallButton
-                state={installProgress}
-                isInstalled={isInstalledForScope}
-                section="mcp"
-                cliStatus={cliStatus}
-                cliStatusLoading={cliStatusLoading}
-                onInstall={handleInstall}
-                onUninstall={handleUninstall}
-                disabled={installDisabled}
-                size="default"
-                errorMessage={installError}
-              />
+            {/* Install / Save & Restart / Uninstall */}
+            <div className="flex items-center justify-end gap-2 pt-1">
+              {isInstalledForScope ? (
+                <>
+                  <Button
+                    variant="ghost"
+                    size="sm"
+                    className="border-red-500/30 text-red-400 hover:bg-red-500/10"
+                    data-testid="uninstall-button"
+                    onClick={handleUninstall}
+                    disabled={Boolean(uninstallCliDisableReason)}
+                  >
+                    <Trash2 className="size-3.5" />
+                    <span className="ml-1.5">卸载</span>
+                  </Button>
+                  {installProgress === 'pending' ? (
+                    <Button size="default" disabled>
+                      <Loader2 className="size-3.5 animate-spin" />
+                      <span className="ml-1.5">保存并重启中...</span>
+                    </Button>
+                  ) : installProgress === 'success' ? (
+                    <Button size="default" disabled className="text-green-400">
+                      <Check className="size-3.5" />
+                      <span className="ml-1.5">完成</span>
+                    </Button>
+                  ) : installProgress === 'error' ? (
+                    <div className="flex max-w-64 flex-col items-end gap-1">
+                      <TooltipProvider>
+                        <Tooltip>
+                          <TooltipTrigger asChild>
+                            <span tabIndex={0}>
+                              <Button
+                                size="default"
+                                variant="outline"
+                                className="border-red-500/30 text-red-400 hover:bg-red-500/10"
+                                onClick={handleInstall}
+                                disabled={installDisabled || Boolean(installCliDisableReason)}
+                              >
+                                保存并重启
+                              </Button>
+                            </span>
+                          </TooltipTrigger>
+                          {installError && (
+                            <TooltipContent className="max-w-64 text-red-300">
+                              {installError}
+                            </TooltipContent>
+                          )}
+                        </Tooltip>
+                      </TooltipProvider>
+                      {installError && (
+                        <p className="text-right text-[11px] leading-4 text-red-300">
+                          {installError}
+                        </p>
+                      )}
+                    </div>
+                  ) : (
+                    <Button
+                      size="default"
+                      data-testid="save-restart-button"
+                      onClick={handleInstall}
+                      disabled={installDisabled || Boolean(installCliDisableReason)}
+                    >
+                      保存并重启
+                    </Button>
+                  )}
+                </>
+              ) : (
+                <InstallButton
+                  state={installProgress}
+                  isInstalled={false}
+                  section="mcp"
+                  cliStatus={cliStatus}
+                  cliStatusLoading={cliStatusLoading}
+                  onInstall={handleInstall}
+                  onUninstall={handleUninstall}
+                  disabled={installDisabled}
+                  size="default"
+                  errorMessage={installError}
+                />
+              )}
             </div>
           </div>
         )}

package/src/renderer/components/extensions/mcp/McpServersPanel.tsx

@@ -256,7 +256,7 @@ export const McpServersPanel = ({
     }
   };
 
-  // Sort displayed servers
+  // Sort displayed catalog servers
   const displayServers = useMemo(() => sortMcpServers(rawServers, mcpSort), [rawServers, mcpSort]);
   const runtimeLabel = getRuntimeDisplayName(cliStatus, true);
 
@@ -472,6 +472,56 @@ export const McpServersPanel = ({
           </div>
         ))}
 
+      {/* Installed servers (catalog-style cards for custom installs) */}
+      {installedServers.length > 0 && (
+        <div className="space-y-3">
+          <div className="flex items-center justify-between gap-3">
+            <p className="text-sm font-medium text-text">已安装</p>
+            <Badge variant="secondary" className="font-normal">
+              {installedServers.length}
+            </Badge>
+          </div>
+          <div className="mcp-servers-grid grid grid-cols-1 gap-3 sm:grid-cols-2 xl:grid-cols-3">
+            {installedServers.map((entry) => {
+              // Find matching catalog item
+              const catalogMatch = browseCatalog.find(
+                (c) => sanitizeMcpServerName(c.name) === entry.name.toLowerCase()
+              );
+              const fakeItem: McpCatalogItem = catalogMatch ?? {
+                id: `custom:${entry.name}`,
+                name: entry.name,
+                description: entry.transport === 'http' ? 'HTTP/SSE 服务器' : 'Stdio 服务器',
+                source: 'official',
+                installSpec: null,
+                envVars: [],
+                requiresAuth: false,
+                tools: [],
+              };
+              const diagnostic =
+                mcpDiagnostics[getMcpDiagnosticKey(entry.name, entry.scope)] ??
+                mcpDiagnostics[getMcpDiagnosticKey(entry.name)] ??
+                mcpDiagnostics[entry.name] ??
+                null;
+
+              return (
+                <McpServerCard
+                  key={`${entry.name}-${entry.scope}`}
+                  server={fakeItem}
+                  isInstalled={true}
+                  installedEntry={entry}
+                  installedEntries={[entry]}
+                  diagnostic={diagnostic}
+                  diagnosticsLoading={mcpDiagnosticsLoading}
+                  onClick={setSelectedMcpServerId}
+                  cliStatus={cliStatus}
+                  cliStatusLoading={cliStatusLoading}
+                />
+              );
+            })}
+          </div>
+        </div>
+      )}
+
       {/* Empty state */}
       {!isLoading && displayServers.length === 0 && (
         <div className="flex flex-col items-center gap-3 rounded-sm border border-dashed border-border px-8 py-16">

package/src/renderer/components/extensions/skills/SkillsPanel.tsx

@@ -23,7 +23,6 @@ import {
   Info,
   Plus,
   Search,
-  Trash2,
 } from 'lucide-react';
 import { useShallow } from 'zustand/react/shallow';
 
@@ -35,12 +34,7 @@ import { SkillImportDialog } from './SkillImportDialog';
 import { resolveSkillProjectPath } from './skillProjectUtils';
 
 import type { SkillsSortState } from '@renderer/hooks/useExtensionsTabState';
-import type {
-  SkillCatalogItem,
-  SkillDetail,
-  SkillSource,
-  SkillValidationIssue,
-} from '@shared/types/extensions';
+import type { SkillCatalogItem, SkillDetail, SkillValidationIssue } from '@shared/types/extensions';
 
 const SUCCESS_BANNER_MS = 2500;
 const NEW_SKILL_HIGHLIGHT_MS = 4000;
@@ -141,10 +135,6 @@ export const SkillsPanel = ({
   const [quickFilter, setQuickFilter] = useState<SkillsQuickFilter>('all');
   const [successMessage, setSuccessMessage] = useState<string | null>(null);
   const [highlightedSkillId, setHighlightedSkillId] = useState<string | null>(null);
-  const [skillSources, setSkillSources] = useState<SkillSource[]>([]);
-  const [newSkillSourceUrl, setNewSkillSourceUrl] = useState('');
-  const [skillSourceLoading, setSkillSourceLoading] = useState(false);
-  const [skillSourceError, setSkillSourceError] = useState<string | null>(null);
   const selectedSkillIdRef = useRef<string | null>(selectedSkillId);
   const selectedSkillItemRef = useRef<SkillCatalogItem | null>(null);
   selectedSkillIdRef.current = selectedSkillId;
@@ -221,55 +211,6 @@ export const SkillsPanel = ({
     };
   }, [fetchSkillDetail, fetchSkillsCatalog, projectPath]);
 
-  useEffect(() => {
-    if (!api.skills) return;
-    void api.skills
-      .listSources()
-      .then((snapshot) => setSkillSources(snapshot.sources))
-      .catch(() => undefined);
-  }, []);
-
-  const saveAndRefreshSkillSources = async (sources: SkillSource[]): Promise<void> => {
-    if (!api.skills) return;
-    setSkillSourceLoading(true);
-    setSkillSourceError(null);
-    try {
-      const saved = await api.skills.saveSources(sources);
-      setSkillSources(saved.sources);
-      const refreshed = await api.skills.refreshSources();
-      setSkillSources(refreshed.sources);
-      await fetchSkillsCatalog(projectPath ?? undefined);
-      setSuccessMessage('Skills 源已同步到 ~/.hermit/skills');
-    } catch (error) {
-      setSkillSourceError(error instanceof Error ? error.message : '同步 Skills 源失败');
-    } finally {
-      setSkillSourceLoading(false);
-    }
-  };
-
-  const handleAddSkillSource = async (): Promise<void> => {
-    const url = newSkillSourceUrl.trim();
-    if (!url) return;
-    const id =
-      url
-        .replace(/\.git$/, '')
-        .split(/[/:]/)
-        .filter(Boolean)
-        .slice(-2)
-        .join('-')
-        .toLowerCase()
-        .replace(/[^a-z0-9._-]+/g, '-') || `source-${Date.now().toString(36)}`;
-    await saveAndRefreshSkillSources([
-      ...skillSources,
-      { id, name: id, url, enabled: true, branch: 'main' },
-    ]);
-    setNewSkillSourceUrl('');
-  };
-
-  const handleRemoveSkillSource = async (sourceId: string): Promise<void> => {
-    await saveAndRefreshSkillSources(skillSources.filter((source) => source.id !== sourceId));
-  };
-
   const visibleSkills = useMemo(() => {
     const q = skillsSearchQuery.trim().toLowerCase();
     const filteredByQuery = q
@@ -307,71 +248,6 @@ export const SkillsPanel = ({
 
   return (
     <div className="flex flex-col gap-4">
-      <div className="rounded-md border border-blue-500/30 bg-blue-500/5 px-4 py-3 text-sm text-blue-300">
-        全局技能由 `~/.hermit/skills` 管理，并在团队启动前投影到各 runtime 的全局 skills
-        目录。项目技能直接安装到你选择的项目 runtime 目录。
-      </div>
-      <div className="bg-surface-raised/20 rounded-xl border border-border p-4">
-        <div className="flex flex-col gap-3 lg:flex-row lg:items-end">
-          <div className="min-w-0 flex-1 space-y-1">
-            <h3 className="text-sm font-semibold text-text">全局 Skills 源</h3>
-            <p className="text-xs text-text-muted">
-              Git 源会同步到 `~/.hermit/skills`，随后由 Hermit 投影给 Claude、Cursor、Codex
-              等运行时。
-            </p>
-            <p className="text-xs text-text-muted">
-              打开面板只读取本地缓存；只有点击“添加并同步”或“刷新源”才会访问 GitHub 更新。
-            </p>
-            <input
-              value={newSkillSourceUrl}
-              onChange={(event) => setNewSkillSourceUrl(event.target.value)}
-              placeholder="https://github.com/yancyuu/HermitSkills"
-              className="mt-2 h-8 w-full rounded-md border border-border bg-surface px-2 text-xs text-text"
-            />
-          </div>
-          <Button
-            variant="outline"
-            size="sm"
-            disabled={skillSourceLoading || !newSkillSourceUrl.trim()}
-            onClick={() => void handleAddSkillSource()}
-          >
-            {skillSourceLoading ? '同步中...' : '添加并同步'}
-          </Button>
-          <Button
-            variant="outline"
-            size="sm"
-            disabled={skillSourceLoading || skillSources.length === 0}
-            onClick={() => void saveAndRefreshSkillSources(skillSources)}
-          >
-            刷新源
-          </Button>
-        </div>
-        {skillSourceError ? <p className="mt-2 text-xs text-red-400">{skillSourceError}</p> : null}
-        {skillSources.length > 0 ? (
-          <div className="mt-3 flex flex-wrap gap-1.5">
-            {skillSources.map((source) => (
-              <span
-                key={source.id}
-                className="inline-flex max-w-full items-center gap-1 rounded bg-surface-raised px-1.5 py-0.5 text-[10px] text-text-muted"
-                title={source.url}
-              >
-                <span className="max-w-44 truncate">
-                  {source.name}
-                  {source.lastError ? ' · 同步失败' : ''}
-                </span>
-                <button
-                  type="button"
-                  className="-mr-0.5 inline-flex size-4 shrink-0 items-center justify-center rounded hover:bg-red-500/10 hover:text-red-300"
-                  onClick={() => void handleRemoveSkillSource(source.id)}
-                  aria-label={`删除 Skills 源 ${source.name}`}
-                >
-                  <Trash2 size={10} />
-                </button>
-              </span>
-            ))}
-          </div>
-        ) : null}
-      </div>
       <div className="bg-surface-raised/20 rounded-xl border border-border p-4">
         <div className="flex flex-col gap-4 xl:flex-row xl:items-start xl:justify-between">
           <div className="min-w-0 flex-1 space-y-1 xl:max-w-2xl">
@@ -387,7 +263,6 @@ export const SkillsPanel = ({
             </p>
             <p className="max-w-2xl text-xs leading-5 text-text-muted">
               需要到处生效的习惯请使用个人技能；只对当前代码库有意义的流程请使用项目技能。
-              全局技能从 Hermit 源统一投影；项目技能直接写入所选项目 runtime 目录。
             </p>
           </div>
 

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

@@ -10,6 +10,7 @@ import { useCallback, useEffect, useState } from 'react';
 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 { HarnessIcon } from '@renderer/components/team/HarnessSelect';
 import { cn } from '@renderer/lib/utils';
 import { OPEN_HERMIT_EVENTS } from '@renderer/utils/openHermitEvents';
 import { CheckCircle2 } from 'lucide-react';
@@ -115,12 +116,7 @@ export const HarnessSection = (): React.JSX.Element => {
                   background: 'var(--color-surface-raised)',
                 }}
               >
-                <div
-                  className={cn(
-                    'h-2 w-2 shrink-0 rounded-full',
-                    covered ? 'bg-green-500' : 'bg-gray-500'
-                  )}
-                />
+                <HarnessIcon type={type} className="size-5 shrink-0" />
                 <div className="min-w-0 flex-1">
                   <p
                     className="truncate text-xs font-medium"

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

@@ -230,24 +230,34 @@ export function TaskBusSection(): React.JSX.Element {
       .finally(() => setLoading(false));
 
     // Restore telemetry status + Redis connection state on mount
-    fetch('/api/telemetry/status')
+    fetch('/api/settings/task-bus')
       .then((r) => r.json())
-      .then((s: TelemetryStatus) => {
-        if (s.connected) setConnected(true);
-        if ('sessions' in s && s.sessions > 0) setTelemetryStatus(s);
+      .then((busConfig: TaskBusConfig) => {
+        if (busConfig.enabled) {
+          fetch('/api/telemetry/status')
+            .then((r) => r.json())
+            .then((s: TelemetryStatus) => {
+              if (s.connected) setConnected(true);
+              if ('sessions' in s && s.sessions > 0) setTelemetryStatus(s);
+            })
+            .catch(() => {});
+        }
       })
       .catch(() => {});
 
     const poll = setInterval(() => {
-      if (collectionEnabled) {
+      if (enabled && collectionEnabled) {
         fetch('/api/telemetry/status')
           .then((r) => r.json())
-          .then((s: TelemetryStatus) => setTelemetryStatus(s))
+          .then((s: TelemetryStatus) => {
+            setTelemetryStatus(s);
+            setConnected(s.connected === true);
+          })
           .catch(() => {});
       }
     }, 30000);
     return () => clearInterval(poll);
-  }, [collectionEnabled]);
+  }, [enabled, collectionEnabled]);
 
   const buildConfig = (
     overrides: Partial<{

package/src/renderer/components/sidebar/SidebarSessions.tsx

@@ -402,6 +402,29 @@ const SessionRow = ({
     };
   }, [historyLimit, isExpanded, session.teamName, session.id]);
 
+  // While a live session stays expanded, keep its detail fresh with a silent
+  // refetch (no skeleton flash) so newly arrived messages show without needing
+  // to collapse and reopen.
+  useEffect(() => {
+    if (!isExpanded || !session.live) {
+      return;
+    }
+    const intervalId = window.setInterval(() => {
+      if (document.visibilityState !== 'visible') {
+        return;
+      }
+      void (async () => {
+        try {
+          const d = await api.teams.getSessionDetail(session.teamName, session.id, historyLimit);
+          setDetail(d);
+        } catch {
+          // silent — transient fetch failures are retried on the next tick
+        }
+      })();
+    }, REFRESH_INTERVAL_MS);
+    return () => window.clearInterval(intervalId);
+  }, [isExpanded, session.live, session.teamName, session.id, historyLimit]);
+
   const handleLoadMoreHistory = useCallback(() => {
     if (loadingDetail || loadingMoreHistory || !hasMoreHistory) {
       return;

package/src/renderer/components/sidebar/WorkspaceBrowser.tsx

@@ -217,13 +217,7 @@ const TeamWorkspace = ({
                 <button
                   key={entry.name}
                   type="button"
-                  className={`flex w-full items-center gap-2 px-3 py-1.5 text-left text-xs transition-colors ${
-                    entry.isDirectory
-                      ? 'cursor-pointer hover:bg-[var(--color-surface-raised)]'
-                      : onFileClick
-                        ? 'cursor-pointer hover:bg-[var(--color-surface-raised)]'
-                        : 'hover:bg-[var(--color-surface-raised)]/50 cursor-default'
-                  }`}
+                  className="flex w-full cursor-pointer items-center gap-2 px-3 py-1.5 text-left text-xs transition-colors hover:bg-[var(--color-surface-raised)]"
                   onClick={() => handleEntryClick(entry)}
                 >
                   {entry.isDirectory ? (

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

@@ -0,0 +1,71 @@
+import type { CcAgentType } from '@shared/types/ccConnect';
+import { ProviderBrandLogo } from '@renderer/components/common/ProviderBrandLogo';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@renderer/components/ui/select';
+import { ALL_AGENT_TYPES, AGENT_TYPE_LABELS } from './HarnessCards';
+
+interface HarnessSelectProps {
+  value: CcAgentType;
+  onChange: (value: CcAgentType) => void;
+  className?: string;
+  id?: string;
+}
+
+const HARNESS_PROVIDER_MAP: Partial<
+  Record<CcAgentType, 'anthropic' | 'codex' | 'gemini' | 'opencode'>
+> = {
+  claudecode: 'anthropic',
+  codex: 'codex',
+  gemini: 'gemini',
+  opencode: 'opencode',
+};
+
+function HarnessIcon({ type, className }: { type: CcAgentType; className?: string }) {
+  const providerId = HARNESS_PROVIDER_MAP[type];
+  if (providerId) {
+    return <ProviderBrandLogo providerId={providerId} className={className} />;
+  }
+  return <span className={className}>{EMOJI_FALLBACK[type]}</span>;
+}
+
+const EMOJI_FALLBACK: Record<CcAgentType, string> = {
+  claudecode: '🤖',
+  codex: '🔬',
+  cursor: '💻',
+  gemini: '💎',
+  iflow: '🌊',
+  kimi: '🌙',
+  devin: '🧑‍💻',
+  opencode: '🔓',
+  qoder: '⚡',
+  pi: '🥧',
+  acp: '🔗',
+  tmux: '🖥️',
+};
+
+export function HarnessSelect({ value, onChange, className, id }: HarnessSelectProps) {
+  return (
+    <Select value={value} onValueChange={(v) => onChange(v as CcAgentType)}>
+      <SelectTrigger id={id} className={className}>
+        <SelectValue />
+      </SelectTrigger>
+      <SelectContent>
+        {ALL_AGENT_TYPES.map((type) => (
+          <SelectItem key={type} value={type}>
+            <div className="flex items-center gap-2">
+              <HarnessIcon type={type} className="size-4 shrink-0" />
+              <span>{AGENT_TYPE_LABELS[type]}</span>
+            </div>
+          </SelectItem>
+        ))}
+      </SelectContent>
+    </Select>
+  );
+}
+
+export { HarnessIcon, HARNESS_PROVIDER_MAP, EMOJI_FALLBACK };