@yancyyu/openhermit 1.6.29 → 1.6.31

package/src/renderer/store/slices/extensionsSlice.ts

@@ -18,9 +18,6 @@ import { findPaneByTabId, updatePane } from '../utils/paneHelpers';
 
 import type { AppState } from '../types';
 import type {
-  ApiKeyEntry,
-  ApiKeySaveRequest,
-  ApiKeyStorageStatus,
   EnrichedPlugin,
   ExtensionOperationState,
   InstalledMcpEntry,
@@ -74,12 +71,13 @@ export interface ExtensionsSlice {
   mcpInstallProgress: Record<string, ExtensionOperationState>;
   installErrors: Record<string, string>; // keyed by scoped operation key
 
-  // ── API Keys ──
-  apiKeys: ApiKeyEntry[];
-  apiKeysLoading: boolean;
-  apiKeysError: string | null;
-  apiKeySaving: boolean;
-  apiKeyStorageStatus: ApiKeyStorageStatus | null;
+  // ── Toast notifications ──
+  extensionToasts: Array<{
+    id: string;
+    type: 'success' | 'error' | 'warning' | 'info';
+    title: string;
+    message?: string;
+  }>;
 
   // ── Skills catalog cache ──
   skillsUserCatalog: SkillCatalogItem[];
@@ -111,6 +109,14 @@ export interface ExtensionsSlice {
   applySkillImport: (request: SkillImportRequest) => Promise<SkillDetail | null>;
   deleteSkill: (request: SkillDeleteRequest) => Promise<void>;
 
+  // ── Toast actions ──
+  addExtensionToast: (
+    type: 'success' | 'error' | 'warning' | 'info',
+    title: string,
+    message?: string
+  ) => void;
+  dismissExtensionToast: (id: string) => void;
+
   // ── Mutation actions ──
   installPlugin: (request: PluginInstallRequest) => Promise<void>;
   uninstallPlugin: (pluginId: string, scope?: InstallScope, projectPath?: string) => Promise<void>;
@@ -123,12 +129,6 @@ export interface ExtensionsSlice {
     projectPath?: string
   ) => Promise<void>;
 
-  // ── API Keys actions ──
-  fetchApiKeys: () => Promise<void>;
-  fetchApiKeyStorageStatus: () => Promise<void>;
-  saveApiKey: (request: ApiKeySaveRequest) => Promise<void>;
-  deleteApiKey: (id: string) => Promise<void>;
-
   // ── Tab opener ──
   openExtensionsTab: () => void;
 
@@ -337,11 +337,6 @@ function getSkillsCatalogKey(projectPath?: string): string {
   return projectPath ?? USER_SKILLS_CATALOG_KEY;
 }
 
-function upsertApiKeyEntry(entries: ApiKeyEntry[], entry: ApiKeyEntry): ApiKeyEntry[] {
-  const nextEntries = entries.filter((candidate) => candidate.id !== entry.id);
-  return [entry, ...nextEntries];
-}
-
 /** Duration to show "success" state before returning to idle */
 const SUCCESS_DISPLAY_MS = 2_000;
 const PROJECT_SCOPE_REQUIRED_MESSAGE =
@@ -397,12 +392,7 @@ export const createExtensionsSlice: StateCreator<AppState, [], [], ExtensionsSli
   pluginInstallProgress: {},
   mcpInstallProgress: {},
   installErrors: {},
-
-  apiKeys: [],
-  apiKeysLoading: false,
-  apiKeysError: null,
-  apiKeySaving: false,
-  apiKeyStorageStatus: null,
+  extensionToasts: [],
 
   skillsUserCatalog: [],
   skillsProjectCatalogByProjectPath: {},
@@ -631,6 +621,11 @@ export const createExtensionsSlice: StateCreator<AppState, [], [], ExtensionsSli
         const diagnosticsRecord = Object.fromEntries(
           diagnostics.map((entry) => [getMcpDiagnosticKey(entry.name, entry.scope), entry] as const)
         );
+        const failedServers = diagnostics.filter((d) => d.status === 'failed');
+        if (failedServers.length > 0) {
+          const names = failedServers.map((s) => s.name).join(', ');
+          get().addExtensionToast('warning', 'MCP 连接异常', `${names} 连接失败`);
+        }
         const checkedAt = Date.now();
         set({
           mcpDiagnostics: diagnosticsRecord,
@@ -956,6 +951,11 @@ export const createExtensionsSlice: StateCreator<AppState, [], [], ExtensionsSli
       set((prev) => ({
         pluginInstallProgress: { ...prev.pluginInstallProgress, [operationKey]: 'success' },
       }));
+      get().addExtensionToast(
+        'success',
+        '插件已安装',
+        `已安装到 claudecode (${effectiveRequest.scope ?? 'user'})`
+      );
 
       // Refresh catalog to pick up new installed state
       void get().fetchPluginCatalog(
@@ -1183,6 +1183,7 @@ export const createExtensionsSlice: StateCreator<AppState, [], [], ExtensionsSli
       set((prev) => ({
         mcpInstallProgress: { ...prev.mcpInstallProgress, [progressKey]: 'success' },
       }));
+      get().addExtensionToast('success', 'MCP 服务器已安装', `已安装 ${request.serverName}`);
 
       scheduleMcpSuccessReset(progressKey, set);
     } catch (err) {
@@ -1264,6 +1265,7 @@ export const createExtensionsSlice: StateCreator<AppState, [], [], ExtensionsSli
       set((prev) => ({
         mcpInstallProgress: { ...prev.mcpInstallProgress, [operationKey]: 'success' },
       }));
+      get().addExtensionToast('success', 'MCP 服务器已卸载');
 
       scheduleMcpSuccessReset(operationKey, set);
     } catch (err) {
@@ -1276,92 +1278,25 @@ export const createExtensionsSlice: StateCreator<AppState, [], [], ExtensionsSli
     }
   },
 
-  // ── API Keys fetch ──
-  fetchApiKeys: async () => {
-    if (!api.apiKeys) return;
-
-    set({ apiKeysLoading: true, apiKeysError: null });
-    try {
-      const keys = await api.apiKeys.list();
-      set({ apiKeys: keys, apiKeysLoading: false });
-    } catch (err) {
-      set({
-        apiKeysLoading: false,
-        apiKeysError: err instanceof Error ? err.message : 'Failed to load API keys',
-      });
-    }
-  },
-
-  fetchApiKeyStorageStatus: async () => {
-    if (!api.apiKeys) return;
-    try {
-      const status = await api.apiKeys.getStorageStatus();
-      set({ apiKeyStorageStatus: status });
-    } catch {
-      // Non-critical — UI will just not show the info icon
-    }
-  },
-
-  // ── API Key save ──
-  saveApiKey: async (request: ApiKeySaveRequest) => {
-    if (!api.apiKeys) return;
-
-    set({ apiKeySaving: true, apiKeysError: null });
-    try {
-      const savedKey = await api.apiKeys.save(request);
-      const warnings: string[] = [];
-
-      try {
-        const keys = await api.apiKeys.list();
-        set({ apiKeys: keys });
-      } catch (listError) {
-        warnings.push(
-          listError instanceof Error
-            ? `API key saved, but failed to refresh key list. ${listError.message}`
-            : 'API key saved, but failed to refresh key list.'
-        );
+  // ── Toast notifications ──
+  addExtensionToast: (type, title, message) => {
+    const id = `toast-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+    set((prev) => ({
+      extensionToasts: [...prev.extensionToasts, { id, type, title, message }],
+    }));
+    if (type === 'success') {
+      setTimeout(() => {
         set((prev) => ({
-          apiKeys: upsertApiKeyEntry(prev.apiKeys, savedKey),
+          extensionToasts: prev.extensionToasts.filter((t) => t.id !== id),
         }));
-      }
-
-      await refreshConfiguredCliStatus(get());
-      const refreshError = get().cliStatusError;
-      if (refreshError) {
-        warnings.push(`API key saved, but failed to refresh provider status. ${refreshError}`);
-      }
-      set({ apiKeySaving: false, apiKeysError: warnings.length > 0 ? warnings.join(' ') : null });
-    } catch (err) {
-      set({
-        apiKeySaving: false,
-        apiKeysError: err instanceof Error ? err.message : 'Failed to save API key',
-      });
-      throw err; // Re-throw so the dialog can show the error
+      }, 3000);
     }
   },
 
-  // ── API Key delete ──
-  deleteApiKey: async (id: string) => {
-    if (!api.apiKeys) return;
-
-    try {
-      await api.apiKeys.delete(id);
-      set((prev) => ({
-        apiKeys: prev.apiKeys.filter((k) => k.id !== id),
-      }));
-      await refreshConfiguredCliStatus(get());
-      const refreshError = get().cliStatusError;
-      set({
-        apiKeysError: refreshError
-          ? `API key deleted, but failed to refresh provider status. ${refreshError}`
-          : null,
-      });
-    } catch (err) {
-      set({
-        apiKeysError: err instanceof Error ? err.message : 'Failed to delete API key',
-      });
-      throw err;
-    }
+  dismissExtensionToast: (id) => {
+    set((prev) => ({
+      extensionToasts: prev.extensionToasts.filter((t) => t.id !== id),
+    }));
   },
 
   // ── Tab opener ──

package/src/renderer/store/slices/teamSlice.ts

@@ -904,7 +904,9 @@ function pruneOptimisticMessages(
   canonical: readonly InboxMessage[]
 ): InboxMessage[] {
   if (optimistic.length === 0) {
-    return [];
+    // Preserve the input reference so selectTeamMessages' identity cache stays
+    // warm across no-op head refreshes (otherwise every poll churns `messages`).
+    return optimistic as InboxMessage[];
   }
 
   const canonicalIds = new Set(
@@ -913,10 +915,14 @@ function pruneOptimisticMessages(
       .filter((messageId) => messageId.length > 0)
   );
 
-  return optimistic.filter((message) => {
+  const pruned = optimistic.filter((message) => {
     const messageId = typeof message.messageId === 'string' ? message.messageId.trim() : '';
     return !messageId || !canonicalIds.has(messageId);
   });
+
+  // Nothing was actually pruned — return the original reference so downstream
+  // identity checks (merged-messages selector) can short-circuit re-renders.
+  return pruned.length === optimistic.length ? (optimistic as InboxMessage[]) : pruned;
 }
 
 function clearPendingReplyRefreshTimer(teamName: string): void {

package/src/renderer/utils/multimodelProviderVisibility.ts

@@ -12,6 +12,23 @@ export function getVisibleMultimodelProviders(
   return filterMainScreenCliProviders(providers);
 }
 
+/**
+ * Further filters the visible providers to those the Extension Store can actually manage.
+ * Providers where ALL extension capabilities are 'provider-scoped' own their own config
+ * and cannot be managed via the Extension Store UI, so they are excluded from capability cards.
+ */
+export function filterExtensionStoreProviders(providers: CliProviderStatus[]): CliProviderStatus[] {
+  return providers.filter((p) => {
+    const ext = p.capabilities?.extensions;
+    if (!ext) return false;
+    return (
+      ext.plugins.ownership !== 'provider-scoped' ||
+      ext.mcp.ownership !== 'provider-scoped' ||
+      ext.skills.ownership !== 'provider-scoped'
+    );
+  });
+}
+
 export function isMultimodelRuntimeStatus(
   cliStatus: Pick<CliInstallationStatus, 'flavor' | 'providers'> | null | undefined
 ): boolean {

package/src/renderer/utils/openCodeRuntimeDeliveryDiagnostics.ts

@@ -19,8 +19,6 @@ interface OpenCodeRuntimeDeliveryDiagnostics {
 
 const PENDING_WARNING =
   'OpenCode runtime delivery is still being checked. Message was saved and will be retried if needed.';
-const FAILED_WARNING =
-  'OpenCode runtime delivery failed. Message was saved to inbox, but live delivery did not complete.';
 
 export function buildOpenCodeRuntimeDeliveryDiagnostics(
   result: SendMessageResult
@@ -30,22 +28,44 @@ export function buildOpenCodeRuntimeDeliveryDiagnostics(
     return { warning: null, debugDetails: null };
   }
 
+  // Delivery failed but message is safely in inbox — will be picked up on restart.
+  // No user-facing warning needed; keep debug details for development only.
   const isFailed = runtimeDelivery.delivered === false;
+  if (isFailed) {
+    return {
+      warning: null,
+      debugDetails: {
+        messageId: result.messageId,
+        providerId: runtimeDelivery.providerId,
+        delivered: false,
+        responsePending:
+          typeof runtimeDelivery.responsePending === 'boolean'
+            ? runtimeDelivery.responsePending
+            : null,
+        responseState: runtimeDelivery.responseState ?? null,
+        ledgerStatus: runtimeDelivery.ledgerStatus ?? null,
+        acceptanceUnknown:
+          typeof runtimeDelivery.acceptanceUnknown === 'boolean'
+            ? runtimeDelivery.acceptanceUnknown
+            : null,
+        reason: runtimeDelivery.reason ?? null,
+        diagnostics: runtimeDelivery.diagnostics ?? [],
+      },
+    };
+  }
+
   const isPending = runtimeDelivery.responsePending === true;
-  if (!isFailed && !isPending) {
+  if (!isPending) {
     return { warning: null, debugDetails: null };
   }
 
   return {
-    warning: isFailed ? FAILED_WARNING : PENDING_WARNING,
+    warning: PENDING_WARNING,
     debugDetails: {
       messageId: result.messageId,
       providerId: runtimeDelivery.providerId,
-      delivered: typeof runtimeDelivery.delivered === 'boolean' ? runtimeDelivery.delivered : null,
-      responsePending:
-        typeof runtimeDelivery.responsePending === 'boolean'
-          ? runtimeDelivery.responsePending
-          : null,
+      delivered: null,
+      responsePending: true,
       responseState: runtimeDelivery.responseState ?? null,
       ledgerStatus: runtimeDelivery.ledgerStatus ?? null,
       acceptanceUnknown:

package/src/shared/types/api.ts

@@ -1122,6 +1122,35 @@ export interface ElectronAPI extends RecentProjectsElectronApi {
   // Extension Store — Skills Catalog API (Electron-only, optional)
   skills?: SkillsCatalogAPI;
 
+  // Extension Store — Credentials (project env, MCP credentials)
+  credentials?: {
+    getStatus: () => Promise<{ encryption: string; storagePath: string } | null>;
+    getProjectEnv: (projectPath: string) => Promise<Record<string, string>>;
+    saveProjectEnv: (projectPath: string, vars: Record<string, string>) => Promise<void>;
+    scanRequired: (
+      projectPath: string,
+      mcpServers: {
+        name: string;
+        envVars?: { name: string; isRequired: boolean; description?: string };
+      }[],
+      skillReqs: {
+        name: string;
+        envVars: { name: string; isRequired?: boolean; description?: string }[];
+      }[]
+    ) => Promise<{
+      required: {
+        name: string;
+        isRequired: boolean;
+        description?: string;
+        source: string;
+        value?: string;
+      }[];
+    }>;
+    resolveAgentEnv: (projectPath: string) => Promise<Record<string, string>>;
+    getSkillGlobalEnv: (skillFolderName: string) => Promise<Record<string, string>>;
+    saveSkillGlobalEnv: (skillFolderName: string, vars: Record<string, string>) => Promise<void>;
+  };
+
   // Extension Store — API Keys Management (Electron-only, optional)
   apiKeys?: ApiKeysAPI;
 

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

@@ -41,6 +41,7 @@ export type {
   CreateSkillRequest,
   DeleteSkillRequest,
   SkillCatalogItem,
+  SkillEnvVarDef,
   SkillDeleteRequest,
   SkillDetail,
   SkillDirectoryFlags,

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

@@ -111,6 +111,7 @@ export interface McpInstallRequest {
   projectPath?: string; // required for 'project' scope
   envValues: Record<string, string>;
   headers: McpHeaderDef[]; // for HTTP/SSE servers (CLI --header flag)
+  harnessType?: string; // which harness to install to (defaults to claudecode)
 }
 
 // ── Custom install request (bypasses registry, user provides spec) ──────────
@@ -122,6 +123,7 @@ export interface McpCustomInstallRequest {
   installSpec: McpInstallSpec; // user provides directly
   envValues: Record<string, string>;
   headers: McpHeaderDef[];
+  harnessType?: string; // which harness to install to
 }
 
 // ── Search result wrapper ──────────────────────────────────────────────────

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

@@ -14,7 +14,7 @@ export interface PluginCatalogItem {
   name: string; // display name only
 
   // Metadata
-  source: 'official';
+  source: 'official' | 'local'; // 'local' = discovered from a user-registered custom marketplace
   description: string;
   category: string; // open-ended string, derived from marketplace.json
   author?: { name: string; email?: string };
@@ -71,6 +71,7 @@ export interface PluginInstallRequest {
   pluginId: string; // canonical key — main resolves qualifiedName from catalog
   scope: InstallScope;
   projectPath?: string; // required for repo-scoped installs ('project' or 'local')
+  harnessType?: string; // which harness to install to (defaults to claudecode)
 }
 
 // ── Filters (renderer-only concern) ────────────────────────────────────────

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

@@ -12,6 +12,12 @@ export type SkillInvocationMode = 'auto' | 'manual-only';
 
 export type SkillIssueSeverity = 'info' | 'warning' | 'error';
 
+export interface SkillEnvVarDef {
+  name: string;
+  description?: string;
+  isRequired?: boolean;
+}
+
 export interface SkillDirectoryFlags {
   hasScripts: boolean;
   hasReferences: boolean;
@@ -57,6 +63,7 @@ export interface SkillCatalogItem {
   isValid: boolean;
   issues: SkillValidationIssue[];
   modifiedAt: number;
+  requiredEnv?: SkillEnvVarDef[];
 }
 
 export interface SkillDetail {

package/src/shared/utils/providerExtensionCapabilities.ts

@@ -58,7 +58,7 @@ export function createLegacyRuntimeFallbackCliExtensionCapabilities(
 export function getCliProviderExtensionCapabilities(
   provider: Pick<CliProviderStatus, 'capabilities'> | null | undefined
 ): CliExtensionCapabilities {
-  const fallback = createLegacyRuntimeFallbackCliExtensionCapabilities();
+  const fallback = createDefaultCliExtensionCapabilities();
   const extensions = provider?.capabilities?.extensions;
   if (!extensions) {
     return fallback;

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

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

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

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-B4BG7PRW-FhpTEPvD.js";import{_ as i}from"./index-BowUl0Jb.js";import"./chunk-FMBD7UC4-e9l2tGHG.js";import"./chunk-55IACEB6-CGGAOoXd.js";import"./chunk-QN33PNHL-DeiXVTCy.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-DWew1HpM.js

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-B4BG7PRW-FhpTEPvD.js";import{_ as i}from"./index-BowUl0Jb.js";import"./chunk-FMBD7UC4-e9l2tGHG.js";import"./chunk-55IACEB6-CGGAOoXd.js";import"./chunk-QN33PNHL-DeiXVTCy.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-Dm-k63Yr.js

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