@yancyyu/openhermit 1.6.37 → 1.6.38

package/src/renderer/components/team/tools/SkillChip.tsx

@@ -0,0 +1,35 @@
+/**
+ * SkillChip — compact chip for a skill.
+ * Shows skill name, scope badge, and remove button on hover.
+ */
+
+import { X } from 'lucide-react';
+
+import type { SkillCatalogItem } from '@shared/types/extensions';
+
+interface SkillChipProps {
+  skill: SkillCatalogItem;
+  onRemove: (skill: SkillCatalogItem) => void;
+}
+
+export const SkillChip = ({ skill, onRemove }: SkillChipProps): React.JSX.Element => {
+  return (
+    <div className="group inline-flex items-center gap-1.5 rounded-full bg-[var(--color-bg-secondary)] px-2.5 py-1 text-xs transition-colors hover:bg-[var(--color-bg-secondary-hover)]">
+      <span className="max-w-[120px] truncate text-[var(--color-text)]">{skill.name}</span>
+      {skill.scope && (
+        <span className="rounded bg-blue-500/20 px-1 py-0.5 text-[10px] text-blue-400">
+          {skill.scope === 'project' ? '项目' : '用户'}
+        </span>
+      )}
+      <button
+        type="button"
+        className="shrink-0 rounded-full p-0.5 opacity-0 transition-opacity hover:bg-red-500/20 group-hover:opacity-100"
+        onClick={() => onRemove(skill)}
+        aria-label={`删除 ${skill.name}`}
+        title="点击删除"
+      >
+        <X size={10} className="text-[var(--color-text-muted)] hover:text-red-400" />
+      </button>
+    </div>
+  );
+};

package/src/renderer/components/team/tools/ToolsSection.tsx

@@ -0,0 +1,208 @@
+/**
+ * ToolsSection — per-worker MCP and Skills management.
+ * Chip/tag UI: compact chips for installed tools, inline add forms.
+ */
+
+import { useCallback, useEffect, useMemo, useState } from 'react';
+
+import { confirm } from '@renderer/components/common/ConfirmDialog';
+import { useStore } from '@renderer/store';
+import { Plus, Wrench } from 'lucide-react';
+
+import { AddMcpInline } from './AddMcpInline';
+import { AddSkillInline } from './AddSkillInline';
+import { McpChip } from './McpChip';
+import { SkillChip } from './SkillChip';
+
+interface ToolsSectionProps {
+  teamName: string;
+  projectPath: string | null;
+  harnessType?: string;
+}
+
+export const ToolsSection = ({
+  teamName,
+  projectPath,
+  harnessType,
+}: ToolsSectionProps): React.JSX.Element => {
+  // ── Store selectors ──
+  const mcpByPath = useStore((s) => s.mcpInstalledServersByProjectPath);
+  const diagnosticsByPath = useStore((s) => s.mcpDiagnosticsByProjectPath);
+  const skillsByPath = useStore((s) => s.skillsProjectCatalogByProjectPath);
+  const mcpFetchInstalled = useStore((s) => s.mcpFetchInstalled);
+  const runMcpDiagnostics = useStore((s) => s.runMcpDiagnostics);
+  const fetchSkillsCatalog = useStore((s) => s.fetchSkillsCatalog);
+  const uninstallMcpServer = useStore((s) => s.uninstallMcpServer);
+  const deleteSkill = useStore((s) => s.deleteSkill);
+
+  // ── Local state ──
+  const [addingMcp, setAddingMcp] = useState(false);
+  const [addingSkill, setAddingSkill] = useState(false);
+
+  // ── Derived data ──
+  const mcpServers = useMemo(
+    () => (projectPath ? mcpByPath[projectPath] ?? [] : []),
+    [mcpByPath, projectPath],
+  );
+  // Diagnostics are stored keyed by `getMcpDiagnosticKey(name, scope)`, but the
+  // scope is not always present (e.g. the text-mode CLI parser omits it), so the
+  // scoped key can't be reconstructed reliably from an installed entry. Index by
+  // server name instead — chip rows already assume names are unique per project.
+  const diagnosticByName = useMemo(() => {
+    const record = projectPath ? diagnosticsByPath[projectPath] ?? {} : {};
+    return Object.fromEntries(Object.values(record).map((d) => [d.name, d] as const));
+  }, [diagnosticsByPath, projectPath]);
+
+  // Deduplicate skills by name (same skill may appear from multiple roots)
+  const skills = useMemo(() => {
+    const raw = projectPath ? skillsByPath[projectPath] ?? [] : [];
+    const seen = new Set<string>();
+    return raw.filter((skill) => {
+      const key = skill.name.toLowerCase();
+      if (seen.has(key)) return false;
+      seen.add(key);
+      return true;
+    });
+  }, [skillsByPath, projectPath]);
+
+  // ── Fetch data on mount ──
+  useEffect(() => {
+    if (projectPath) {
+      mcpFetchInstalled(projectPath).catch(() => {});
+      runMcpDiagnostics(projectPath).catch(() => {});
+      fetchSkillsCatalog(projectPath).catch(() => {});
+    }
+  }, [projectPath, mcpFetchInstalled, runMcpDiagnostics, fetchSkillsCatalog]);
+
+  // ── Handlers ──
+  const handleRemoveMcp = useCallback(
+    (entry: { name: string; scope: string }) => {
+      void (async () => {
+        const confirmed = await confirm({
+          title: '删除 MCP 服务器',
+          message: `确认删除 MCP 服务器「${entry.name}」？删除后该工具将不再可用。`,
+          confirmLabel: '删除',
+          cancelLabel: '取消',
+          variant: 'danger',
+        });
+        if (!confirmed) return;
+        uninstallMcpServer('', entry.name, entry.scope, projectPath ?? undefined).catch(() => {});
+      })();
+    },
+    [uninstallMcpServer, projectPath],
+  );
+
+  const handleRemoveSkill = useCallback(
+    (skill: { id: string; name: string }) => {
+      void (async () => {
+        const confirmed = await confirm({
+          title: '删除 Skill',
+          message: `确认删除 Skill「${skill.name}」？删除后该技能将不再可用。`,
+          confirmLabel: '删除',
+          cancelLabel: '取消',
+          variant: 'danger',
+        });
+        if (!confirmed) return;
+        deleteSkill({ skillId: skill.id, projectPath: projectPath ?? undefined }).catch(() => {});
+      })();
+    },
+    [deleteSkill, projectPath],
+  );
+
+  const handleMcpAdded = useCallback(() => {
+    setAddingMcp(false);
+    if (projectPath) {
+      mcpFetchInstalled(projectPath).catch(() => {});
+      runMcpDiagnostics(projectPath).catch(() => {});
+    }
+  }, [projectPath, mcpFetchInstalled, runMcpDiagnostics]);
+
+  const handleSkillAdded = useCallback(() => {
+    setAddingSkill(false);
+    if (projectPath) {
+      fetchSkillsCatalog(projectPath).catch(() => {});
+    }
+  }, [projectPath, fetchSkillsCatalog]);
+
+  if (!projectPath) {
+    return (
+      <div className="flex items-center gap-2 px-1 py-2 text-xs text-[var(--color-text-muted)]">
+        <Wrench size={12} />
+        <span>需要关联项目目录才能管理工具</span>
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex flex-col gap-3 px-1 py-2">
+      {/* MCP 工具 */}
+      <div className="flex flex-col gap-1.5">
+        <div className="flex items-center gap-1.5 text-[11px] font-medium text-[var(--color-text-muted)]">
+          <span>MCP 工具</span>
+          <span className="text-[10px]">({mcpServers.length})</span>
+        </div>
+        <div className="flex flex-wrap items-center gap-1.5">
+          {mcpServers.map((entry) => (
+            <McpChip
+              key={entry.name}
+              entry={entry}
+              diagnostic={diagnosticByName[entry.name]}
+              onRemove={handleRemoveMcp}
+            />
+          ))}
+          {addingMcp ? (
+            <AddMcpInline
+              projectPath={projectPath}
+              harnessType={harnessType ?? 'claudecode'}
+              onAdded={handleMcpAdded}
+              onCancel={() => setAddingMcp(false)}
+            />
+          ) : (
+            <button
+              type="button"
+              onClick={() => setAddingMcp(true)}
+              className="inline-flex items-center gap-1 rounded-full border border-dashed border-[var(--color-border)] px-2 py-1 text-xs text-[var(--color-text-muted)] transition-colors hover:border-[var(--color-text-muted)] hover:text-[var(--color-text)]"
+            >
+              <Plus size={10} />
+              添加
+            </button>
+          )}
+        </div>
+      </div>
+
+      {/* Skills */}
+      <div className="flex flex-col gap-1.5">
+        <div className="flex items-center gap-1.5 text-[11px] font-medium text-[var(--color-text-muted)]">
+          <span>Skills</span>
+          <span className="text-[10px]">({skills.length})</span>
+        </div>
+        <div className="flex flex-wrap items-center gap-1.5">
+          {skills.map((skill) => (
+            <SkillChip
+              key={skill.id}
+              skill={skill}
+              onRemove={handleRemoveSkill}
+            />
+          ))}
+          {addingSkill ? (
+            <AddSkillInline
+              projectPath={projectPath}
+              projectLabel={teamName}
+              onAdded={handleSkillAdded}
+              onCancel={() => setAddingSkill(false)}
+            />
+          ) : (
+            <button
+              type="button"
+              onClick={() => setAddingSkill(true)}
+              className="inline-flex items-center gap-1 rounded-full border border-dashed border-[var(--color-border)] px-2 py-1 text-xs text-[var(--color-text-muted)] transition-colors hover:border-[var(--color-text-muted)] hover:text-[var(--color-text)]"
+            >
+              <Plus size={10} />
+              添加
+            </button>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};

package/src/shared/types/extensions/api.ts

@@ -15,6 +15,10 @@ import type {
   McpCatalogItem,
   McpCustomInstallRequest,
   McpInstallRequest,
+  McpLibraryEntry,
+  McpLibraryImportRequest,
+  McpLibraryImportResult,
+  McpLibraryUpsertRequest,
   McpSearchResult,
   McpServerDiagnostic,
 } from './mcp';
@@ -59,6 +63,11 @@ export interface McpCatalogAPI {
   installCustom: (request: McpCustomInstallRequest) => Promise<OperationResult>;
   uninstall: (name: string, scope?: string, projectPath?: string) => Promise<OperationResult>;
   githubStars: (repositoryUrls: string[]) => Promise<Record<string, number>>;
+  // ── Library (cc-switch style global library of server definitions) ──
+  libraryList: () => Promise<McpLibraryEntry[]>;
+  libraryUpsert: (request: McpLibraryUpsertRequest) => Promise<McpLibraryEntry>;
+  libraryDelete: (id: string) => Promise<void>;
+  libraryImport: (request: McpLibraryImportRequest) => Promise<McpLibraryImportResult>;
 }
 
 // ── Skills API ─────────────────────────────────────────────────────────────

package/src/shared/types/extensions/index.ts

@@ -21,6 +21,10 @@ export type {
   McpHttpInstallSpec,
   McpInstallRequest,
   McpInstallSpec,
+  McpLibraryEntry,
+  McpLibraryImportRequest,
+  McpLibraryImportResult,
+  McpLibraryUpsertRequest,
   McpSearchResult,
   McpServerDiagnostic,
   McpServerHealthStatus,

package/src/shared/types/extensions/mcp.ts

@@ -132,3 +132,44 @@ export interface McpSearchResult {
   servers: McpCatalogItem[];
   warnings: string[]; // e.g. "Official registry unavailable"
 }
+
+// ── MCP Library (cc-switch style: a reusable global library of server defs) ──
+//
+// A saved server definition lives once in the library and can be enabled for
+// any worker (= installed into that worker's project config) without re-typing
+// the command / URL / env each time.
+
+export interface McpLibraryEntry {
+  id: string; // stable uuid
+  name: string; // server name used when installing (`claude mcp add <name>`)
+  description?: string;
+  installSpec: McpInstallSpec;
+  envValues?: Record<string, string>; // saved non-secret defaults
+  headers?: McpHeaderDef[];
+  createdAt: number;
+  updatedAt: number;
+}
+
+/** Create (omit id) or update (provide id) a library entry. */
+export interface McpLibraryUpsertRequest {
+  id?: string;
+  name: string;
+  description?: string;
+  installSpec: McpInstallSpec;
+  envValues?: Record<string, string>;
+  headers?: McpHeaderDef[];
+}
+
+/**
+ * Import existing MCP servers from live config into the library.
+ * Pulls user-scope servers plus, when a projectPath is given, that worker's
+ * project-scope servers. Existing library entries (matched by name) are skipped.
+ */
+export interface McpLibraryImportRequest {
+  projectPath?: string;
+}
+
+export interface McpLibraryImportResult {
+  imported: string[];
+  skipped: string[];
+}

package/src/shared/utils/extensionNormalizers.ts

@@ -106,6 +106,28 @@ export function buildPluginId(pluginName: string, marketplaceName: string): stri
   return `${pluginName}@${marketplaceName}`;
 }
 
+/**
+ * Substrings that mark a plugin as "essential" (必装) — recommended/required for
+ * the workbench. Matched against both the pluginId and homepage so it works
+ * regardless of the marketplace name a plugin is published under. Note the codex
+ * plugin ships as `codex@openai-codex` (repo: openai/codex-plugin-cc), so the
+ * pluginId alone does not contain "codex-plugin-cc" — the homepage does.
+ */
+export const ESSENTIAL_PLUGIN_PATTERNS = [
+  'oh-my-claudecode',
+  'codex@openai-codex',
+  'codex-plugin-cc',
+] as const;
+
+/**
+ * Whether a plugin is one of the essential plugins surfaced with a 必装 badge and
+ * the recommendation banner.
+ */
+export function isEssentialPlugin(plugin: { pluginId: string; homepage?: string }): boolean {
+  const haystack = `${plugin.pluginId} ${plugin.homepage ?? ''}`.toLowerCase();
+  return ESSENTIAL_PLUGIN_PATTERNS.some((pattern) => haystack.includes(pattern));
+}
+
 /**
  * Namespaced operation-state key for plugin install/uninstall UI state.
  */

package/dist-renderer/assets/channel-5dJIx68e.js

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

package/dist-renderer/assets/classDiagram-2ON5EDUG-BMGXWJ2d.js

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-B4BG7PRW-TPDaA_KQ.js";import{_ as i}from"./index-LwDIsXJN.js";import"./chunk-FMBD7UC4-Beimtg3a.js";import"./chunk-55IACEB6-BGAXQZRC.js";import"./chunk-QN33PNHL-OjNBu854.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-BMGXWJ2d.js

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-B4BG7PRW-TPDaA_KQ.js";import{_ as i}from"./index-LwDIsXJN.js";import"./chunk-FMBD7UC4-Beimtg3a.js";import"./chunk-55IACEB6-BGAXQZRC.js";import"./chunk-QN33PNHL-OjNBu854.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-D7FWfGY9.js

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