@yancyyu/openhermit 1.6.37 → 1.6.39

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yancyyu/openhermit",
   "type": "module",
-  "version": "1.6.37",
+  "version": "1.6.39",
   "description": "openHermit: team-oriented agent management workbench atop cc-connect.",
   "license": "AGPL-3.0",
   "author": {
@@ -29,6 +29,24 @@
     "package.json",
     "README.md"
   ],
+  "scripts": {
+    "dev": "node ./scripts/dev-mvp.mjs",
+    "dev:server": "tsx watch src/main/server.ts",
+    "dev:web": "vite --config vite.web.config.ts",
+    "build:web": "vite build --config vite.web.config.ts --outDir ../../dist-renderer --emptyOutDir",
+    "postinstall": "node ./bin/postinstall.mjs",
+    "prepack": "pnpm build:web",
+    "start": "node bin/hermit.mjs",
+    "typecheck": "tsc --noEmit",
+    "lint": "eslint src/ --cache --cache-location .eslintcache --cache-strategy content",
+    "lint:fix": "eslint src/ --fix --cache --cache-location .eslintcache --cache-strategy content",
+    "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,css}\"",
+    "format:check": "prettier --check \"src/**/*.{ts,tsx,js,jsx,json,css}\"",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage",
+    "prepare": "husky"
+  },
   "lint-staged": {
     "src/**/*.{ts,tsx,js,jsx}": [
       "prettier --write"
@@ -87,6 +105,9 @@
     "@tiptap/pm": "^3.20.4",
     "@tiptap/react": "^3.20.4",
     "@tiptap/starter-kit": "^3.20.4",
+    "@xterm/addon-fit": "^0.11.0",
+    "@xterm/addon-web-links": "^0.12.0",
+    "@xterm/xterm": "^6.0.0",
     "anser": "^2.3.5",
     "cc-connect": "1.3.3-beta.4",
     "chokidar": "^5.0.0",
@@ -106,6 +127,7 @@
     "mdast-util-to-hast": "^13.2.1",
     "mermaid": "^11.12.3",
     "motion": "12.38.0",
+    "node-pty": "^1.1.0",
     "qrcode.react": "^4.2.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
@@ -167,20 +189,5 @@
     "vite": "^5.4.2",
     "vitest": "^3.1.4"
   },
-  "scripts": {
-    "dev": "node ./scripts/dev-mvp.mjs",
-    "dev:server": "tsx watch src/main/server.ts",
-    "dev:web": "vite --config vite.web.config.ts",
-    "build:web": "vite build --config vite.web.config.ts --outDir ../../dist-renderer --emptyOutDir",
-    "postinstall": "node ./bin/postinstall.mjs",
-    "start": "node bin/hermit.mjs",
-    "typecheck": "tsc --noEmit",
-    "lint": "eslint src/ --cache --cache-location .eslintcache --cache-strategy content",
-    "lint:fix": "eslint src/ --fix --cache --cache-location .eslintcache --cache-strategy content",
-    "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,css}\"",
-    "format:check": "prettier --check \"src/**/*.{ts,tsx,js,jsx,json,css}\"",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "test:coverage": "vitest run --coverage"
-  }
-}
+  "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319"
+}

package/src/main/ipc/extensions.ts

@@ -7,8 +7,9 @@
 
 import type { CcAgentType } from '@shared/types/ccConnect';
 import type {
-  McpInstallRequest,
   McpCustomInstallRequest,
+  McpLibraryImportRequest,
+  McpLibraryUpsertRequest,
   OperationResult,
   PluginInstallRequest,
   SkillDeleteRequest,
@@ -18,12 +19,9 @@ import type {
 } from '@shared/types/extensions';
 
 import { PluginCatalogService } from '@main/services/extensions/catalog/PluginCatalogService';
-import { McpCatalogAggregator } from '@main/services/extensions/catalog/McpCatalogAggregator';
-import { OfficialMcpRegistryService } from '@main/services/extensions/catalog/OfficialMcpRegistryService';
-import { GlamaMcpEnrichmentService } from '@main/services/extensions/catalog/GlamaMcpEnrichmentService';
 import { ExtensionFacadeService } from '@main/services/extensions/ExtensionFacadeService';
+import { McpLibraryService } from '@main/services/extensions/library/McpLibraryService';
 import { PluginInstallationStateService } from '@main/services/extensions/state/PluginInstallationStateService';
-import { McpInstallationStateService } from '@main/services/extensions/state/McpInstallationStateService';
 import { SkillsCatalogService } from '@main/services/extensions/skills/SkillsCatalogService';
 import { SkillsMutationService } from '@main/services/extensions/skills/SkillsMutationService';
 import { SkillsWatcherService } from '@main/services/extensions/skills/SkillsWatcherService';
@@ -53,6 +51,7 @@ function wrapHandler<T>(handler: () => Promise<T>): Promise<IpcResult<T>> {
 // ── Service instances (singleton) ──
 
 let facade: ExtensionFacadeService | null = null;
+let mcpLibrary: McpLibraryService | null = null;
 let skillsCatalog: SkillsCatalogService | null = null;
 let skillsMutation: SkillsMutationService | null = null;
 let skillsWatcher: SkillsWatcherService | null = null;
@@ -62,15 +61,16 @@ function getFacade(): ExtensionFacadeService {
   if (!facade) {
     const pluginCatalog = new PluginCatalogService();
     const pluginState = new PluginInstallationStateService();
-    const mcpOfficial = new OfficialMcpRegistryService();
-    const mcpGlama = new GlamaMcpEnrichmentService();
-    const mcpAggregator = new McpCatalogAggregator(mcpOfficial, mcpGlama);
-    const mcpState = new McpInstallationStateService();
-    facade = new ExtensionFacadeService(pluginCatalog, pluginState, mcpAggregator, mcpState);
+    facade = new ExtensionFacadeService(pluginCatalog, pluginState);
   }
   return facade;
 }
 
+function getMcpLibrary(): McpLibraryService {
+  if (!mcpLibrary) mcpLibrary = new McpLibraryService();
+  return mcpLibrary;
+}
+
 function getSkillsCatalog(): SkillsCatalogService {
   if (!skillsCatalog) skillsCatalog = new SkillsCatalogService();
   return skillsCatalog;
@@ -186,48 +186,12 @@ export const extensionHandlers = {
 
   // ── MCP ──
 
-  mcpSearch: (query: string, limit?: number) =>
-    wrapHandler(() => getFacade().searchMcp(query, limit)),
-
-  mcpBrowse: (cursor?: string, limit?: number) =>
-    wrapHandler(() => getFacade().browseMcp(cursor, limit)),
-
-  mcpGetById: (registryId: string) => wrapHandler(() => getFacade().getMcpById(registryId)),
-
   mcpGetInstalled: (projectPath?: string) =>
-    wrapHandler(() => getFacade().getInstalledMcp(projectPath)),
-
-  mcpInstall: (request: McpInstallRequest) =>
     wrapHandler(async () => {
-      const harnessType = (request.harnessType ?? 'claudecode') as CcAgentType;
-      const adapter = getAdapter(harnessType);
-      if (!adapter || !adapter.supportsMcp) {
-        return { state: 'error' as const, error: `MCP not supported by ${harnessType}` };
-      }
-
-      // Re-fetch server from registry (security: don't trust renderer)
-      const server = await getFacade().getMcpById(request.registryId);
-      if (!server?.installSpec) {
-        return {
-          state: 'error' as const,
-          error: `Server "${request.registryId}" not found or no install spec`,
-        };
-      }
-
-      const result = await adapter.installMcp(
-        request.serverName,
-        server.installSpec,
-        request.envValues,
-        request.headers,
-        { scope: request.scope ?? 'user', projectPath: request.projectPath }
-      );
-
-      if (result.state === 'success') {
-        getFacade().invalidateInstalledCache();
-        // Save credentials for auto-fill next time
-        await getCredentials().saveMcpCredentials(request.serverName, request.envValues);
-      }
-      return result;
+      const { createExtensionsRuntimeAdapter } =
+        await import('@main/services/extensions/runtime/ExtensionsRuntimeAdapter');
+      const adapter = createExtensionsRuntimeAdapter();
+      return adapter.getInstalledMcp(projectPath);
     }),
 
   mcpInstallCustom: (request: McpCustomInstallRequest) =>
@@ -269,6 +233,22 @@ export const extensionHandlers = {
       return result;
     }),
 
+  // ── MCP Library (cc-switch style global library) ──
+
+  mcpLibraryList: () => wrapHandler(async () => getMcpLibrary().list()),
+
+  mcpLibraryUpsert: (request: McpLibraryUpsertRequest) =>
+    wrapHandler(async () => getMcpLibrary().upsert(request)),
+
+  mcpLibraryDelete: (id: string) =>
+    wrapHandler(async () => {
+      getMcpLibrary().remove(id);
+      return { ok: true };
+    }),
+
+  mcpLibraryImport: (request: McpLibraryImportRequest) =>
+    wrapHandler(() => getMcpLibrary().importFromLive(request)),
+
   // ── Skills ──
 
   skillsList: (projectPath?: string) => wrapHandler(() => getSkillsCatalog().list(projectPath)),