coding-tool-x 3.9.3-261008 → 3.9.5-261009

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coding-tool-x",
-  "version": "3.9.3-261008",
+  "version": "3.9.5-261009",
   "description": "Vibe Coding 增强工作助手 - 智能会话管理、动态渠道切换、全局搜索、实时监控",
   "main": "src/index.js",
   "bin": {

package/src/config/model-metadata.json

@@ -1,7 +1,7 @@
 {
   "source": "models.dev",
   "sourceUrl": "https://models.dev/api.json",
-  "lastUpdated": "2026-10-08",
+  "lastUpdated": "2026-10-09",
   "defaultModels": {
     "claude": [
       "claude-opus-4-7",
@@ -3450,7 +3450,7 @@
         "image"
       ],
       "limit": {
-        "context": 524288,
+        "context": 1048576,
         "output": 262144
       },
       "name": "Mistral Large 4",

package/src/platforms/drivers/dsh/api-operations.js

@@ -9,6 +9,7 @@ const { installPlugin, uninstallPlugin, updatePlugin } = require('./plugin-manag
 const { createDriver: createChannelsDriver } = require('./channels');
 const { createDriver: createProxyDriver } = require('./proxy');
 const { createDriver: createStatisticsDriver } = require('./statistics');
+const { importMcpServer } = require('../../../shared/mcp-import');
 
 function requiredId(value, label) {
   const id = String(value || '').trim();
@@ -153,18 +154,34 @@ function dshMcpSpecToConfig(spec = {}, serverName) {
   return config;
 }
 
-function readDshMcpEntries(context = {}) {
+function dshMcpServerName(server, fallbackId) {
+  const requested = String(server?.name || '').trim();
+  if (/^[A-Za-z0-9_-]{1,32}$/.test(requested)) return requested;
+  return String(fallbackId || '')
+    .replace(/[^A-Za-z0-9_-]/g, '_')
+    .slice(0, 32) || 'mcp';
+}
+
+function readDshMcpRecords(context = {}) {
   const profile = resolveProfileName(context);
-  if (!profile) return {};
+  if (!profile) return [];
   const result = listProfileMcp(context, profile);
-  const entries = {};
+  const entries = [];
   for (const server of result?.servers || []) {
     if (!server?.id || server.disabled) continue;
-    entries[server.id] = dshMcpConfigToSpec(server.config || {});
+    entries.push({
+      id: server.id,
+      name: server.config?.serverName || server.id,
+      spec: dshMcpConfigToSpec(server.config || {})
+    });
   }
   return entries;
 }
 
+function readDshMcpEntries(context = {}) {
+  return Object.fromEntries(readDshMcpRecords(context).map(({ id, spec }) => [id, spec]));
+}
+
 function promptContentFromDshConfig(config = {}) {
   for (const key of ['content', 'prompt', 'text']) {
     if (typeof config[key] === 'string') return config[key];
@@ -359,47 +376,33 @@ function createDriver(context = {}) {
     driver.read = () => resultFor(mcpContext('read'), 'ok', { mcpServers: readDshMcpEntries(context) });
     driver.normalize = spec => resultFor(mcpContext('normalize'), 'ok', spec);
     driver.sync = async server => {
-    const profileName = profileNameForRequest(context, server);
-    const id = String(server?.id || '').trim();
-    if (!id) throw new Error('MCP server id is required');
-    const patch = requirePatchResult(
-      upsertProfilePatchRow(context, profileName, {
-        id,
-        name: '@deepseek-ai/dsh-mcp-client',
-        config: dshMcpSpecToConfig(server.server || {}, id)
-      }),
-      profileName
-    );
-    return resultFor(mcpContext('sync'), 'ok', patch);
-  };
-  driver.remove = async serverId => {
-    const profileName = profileNameForRequest(context);
-    const id = String(serverId || '').trim();
-    if (!id) throw new Error('MCP server id is required');
-    if (!profileName) return resultFor(mcpContext('remove'), 'ok', true);
-    const patch = requirePatchResult(deleteProfilePatchRow(context, profileName, id), profileName);
-    return resultFor(mcpContext('remove'), 'ok', patch);
-  };
+      const profileName = profileNameForRequest(context, server);
+      const id = String(server?.id || '').trim();
+      if (!id) throw new Error('MCP server id is required');
+      const patch = requirePatchResult(
+        upsertProfilePatchRow(context, profileName, {
+          id,
+          name: '@deepseek-ai/dsh-mcp-client',
+          config: dshMcpSpecToConfig(server.server || {}, dshMcpServerName(server, id))
+        }),
+        profileName
+      );
+      return resultFor(mcpContext('sync'), 'ok', patch);
+    };
+    driver.remove = async serverId => {
+      const profileName = profileNameForRequest(context);
+      const id = String(serverId || '').trim();
+      if (!id) throw new Error('MCP server id is required');
+      if (!profileName) return resultFor(mcpContext('remove'), 'ok', true);
+      const patch = requirePatchResult(deleteProfilePatchRow(context, profileName, id), profileName);
+      return resultFor(mcpContext('remove'), 'ok', patch);
+    };
     driver.import = async servers => {
-    const entries = readDshMcpEntries(context);
-    let count = 0;
-    for (const [id, spec] of Object.entries(entries)) {
-      if (servers[id]) {
-        servers[id].apps = { ...(servers[id].apps || {}), dsh: true };
-        continue;
+      let count = 0;
+      for (const entry of readDshMcpRecords(context)) {
+        if (importMcpServer(servers, { ...entry, platform: 'dsh' })) count++;
       }
-      const now = Date.now();
-      servers[id] = {
-        id,
-        name: id,
-        server: spec,
-        apps: { dsh: true },
-        createdAt: now,
-        updatedAt: now
-      };
-      count++;
-    }
-    return resultFor(mcpContext('import'), 'ok', count);
+      return resultFor(mcpContext('import'), 'ok', count);
     };
   }
 

package/src/server/api/mcp.js

@@ -326,8 +326,8 @@ router.post('/import/:platform', async (req, res) => {
       success: true,
       imported: count,
       message: count > 0
-        ? `成功从 ${resolved.key} 导入 ${count} 个 MCP 服务器`
-        : `${resolved.key} 没有可导入的 MCP 服务器`
+        ? `已从 ${resolved.key} 导入或更新 ${count} 个 MCP 服务器`
+        : `${resolved.key} 的 MCP 配置没有新增或变更`
     });
   } catch (error) {
     console.error('[MCP API] Import failed:', sanitizeErrorMessage(error.message || error));

package/src/server/services/mcp-service.js

@@ -9,6 +9,7 @@ const path = require('path');
 const { spawn } = require('child_process');
 const { McpClient, buildMissingCommandMessage, createMissingCommandHint } = require('./mcp-client');
 const mcpFormat = require('../../shared/mcp-format');
+const { importMcpServer } = require('../../shared/mcp-import');
 const { convertToOmpMcpFormat, convertFromOmpMcpFormat } = mcpFormat;
 const { PATHS } = require('../../config/paths');
 const { ControlManifestStore } = require('./control-manifest-store');
@@ -1072,25 +1073,7 @@ async function importGenericMcpServers(driver, platform, servers) {
 
   for (const [id, spec] of Object.entries(mcpServers)) {
     if (!spec || typeof spec !== 'object' || Array.isArray(spec)) continue;
-    if (servers[id]) {
-      servers[id].apps = normalizeServerApps(servers[id].apps, {});
-      if (!servers[id].apps[platform]) {
-        servers[id].apps[platform] = true;
-        count++;
-      }
-      continue;
-    }
-
-    const now = Date.now();
-    servers[id] = {
-      id,
-      name: id,
-      server: normalizeServerSpec(spec),
-      apps: { [platform]: true },
-      createdAt: now,
-      updatedAt: now
-    };
-    count++;
+    if (importMcpServer(servers, { id, platform, spec: normalizeServerSpec(spec) })) count++;
   }
 
   return count;

package/src/shared/driver-factories/mcp.js

@@ -8,6 +8,7 @@ const tomlStringify = require('@iarna/toml').stringify;
 const { ok, failed } = require('../driver-result');
 const { extractServerSpec, convertToCodexFormat, convertFromCodexFormat, convertToOmpMcpFormat, convertFromOmpMcpFormat, convertToOpenCodeFormat, convertFromOpenCodeFormat } = require('../mcp-format');
 const { redactSecrets, validateMcpId } = require('../project-config');
+const { importMcpServer } = require('../mcp-import');
 
 const SCHEMA_URL = 'https://raw.githubusercontent.com/can1357/oh-my-omp/main/packages/coding-agent/src/config/mcp-schema.json';
 
@@ -192,14 +193,7 @@ function createMcpDriver({ platform, ...context } = {}) {
     let count = 0;
     for (const [id, spec] of Object.entries(map)) {
       if (!spec || typeof spec !== 'object' || Array.isArray(spec)) continue;
-      if (servers[id]) {
-        servers[id].apps = { ...(servers[id].apps || {}), [platform]: true };
-        count += 1;
-        continue;
-      }
-      const now = Date.now();
-      servers[id] = { id, name: id, server: internalSpec(spec), apps: { [platform]: true }, createdAt: now, updatedAt: now };
-      count += 1;
+      if (importMcpServer(servers, { id, platform, spec: internalSpec(spec) })) count += 1;
     }
     return count;
   }

package/src/shared/mcp-import.js

@@ -0,0 +1,107 @@
+'use strict';
+
+const { isDeepStrictEqual } = require('util');
+const { validateMcpId } = require('./project-config');
+
+const REDACTED_VALUES = new Set(['[REDACTED]', '[redacted]', '[EXPRESSION]']);
+
+function normalizeImportedSpec(spec) {
+  if (!spec || typeof spec !== 'object' || Array.isArray(spec)) return spec;
+  return { ...spec, type: spec.type || 'stdio' };
+}
+
+function restoreRedactedUrl(incoming, existing) {
+  if (typeof incoming !== 'string' || typeof existing !== 'string') return incoming;
+  try {
+    const nextUrl = new URL(incoming);
+    const previousUrl = new URL(existing);
+    const isRedactedPart = value => {
+      try {
+        return REDACTED_VALUES.has(decodeURIComponent(value));
+      } catch (_) {
+        return false;
+      }
+    };
+    const decodePart = value => {
+      try {
+        return decodeURIComponent(value);
+      } catch (_) {
+        return value;
+      }
+    };
+    if (isRedactedPart(nextUrl.username) && previousUrl.username) {
+      nextUrl.username = decodePart(previousUrl.username);
+    }
+    if (isRedactedPart(nextUrl.password) && previousUrl.password) {
+      nextUrl.password = decodePart(previousUrl.password);
+    }
+    for (const [key, value] of nextUrl.searchParams.entries()) {
+      if (REDACTED_VALUES.has(value) && previousUrl.searchParams.has(key)) {
+        nextUrl.searchParams.set(key, previousUrl.searchParams.get(key));
+      }
+    }
+    return nextUrl.toString();
+  } catch (_) {
+    return incoming;
+  }
+}
+
+function restoreRedactedValues(incoming, existing, key = '') {
+  if (REDACTED_VALUES.has(incoming)) return existing === undefined ? incoming : existing;
+  if (key === 'url') return restoreRedactedUrl(incoming, existing);
+  if (Array.isArray(incoming)) {
+    const previous = Array.isArray(existing) ? existing : [];
+    return incoming.map((value, index) => restoreRedactedValues(value, previous[index]));
+  }
+  if (!incoming || typeof incoming !== 'object') return incoming;
+  const previous = existing && typeof existing === 'object' && !Array.isArray(existing) ? existing : {};
+  return Object.fromEntries(Object.entries(incoming).map(([childKey, value]) => [
+    childKey,
+    restoreRedactedValues(value, previous[childKey], childKey)
+  ]));
+}
+
+function importMcpServer(servers, { id, platform, spec, name } = {}) {
+  let normalizedId;
+  try {
+    normalizedId = validateMcpId(id);
+  } catch (_) {
+    return false;
+  }
+  const importedSpec = normalizeImportedSpec(spec);
+  const existing = servers[normalizedId];
+
+  if (!existing) {
+    const now = Date.now();
+    servers[normalizedId] = {
+      id: normalizedId,
+      name: typeof name === 'string' && name.trim() ? name : normalizedId,
+      server: importedSpec,
+      apps: { [platform]: true },
+      createdAt: now,
+      updatedAt: now
+    };
+    return true;
+  }
+
+  // Treat imports as full snapshots, restoring only values hidden by the platform.
+  const nextSpec = restoreRedactedValues(importedSpec, existing.server);
+  const nextApps = {
+    ...(existing.apps && typeof existing.apps === 'object' && !Array.isArray(existing.apps)
+      ? existing.apps
+      : {}),
+    [platform]: true
+  };
+  const nextName = typeof name === 'string' && name.trim() ? name : existing.name || normalizedId;
+  const changed = !isDeepStrictEqual(existing.server, nextSpec)
+    || !isDeepStrictEqual(existing.apps || {}, nextApps)
+    || existing.name !== nextName;
+
+  existing.server = nextSpec;
+  existing.apps = nextApps;
+  existing.name = nextName;
+  if (changed) existing.updatedAt = Date.now();
+  return changed;
+}
+
+module.exports = { importMcpServer };