huaweicloud-devkit 1.1.4-next.5 → 1.1.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "huaweicloud-devkit",
   "mcpName": "io.github.huaweicloud/huaweicloud-devkit",
-  "version": "1.1.4-next.5",
+  "version": "1.1.4",
   "kooCliVersion": "7.2.12",
   "description": "Agent toolkit that helps coding agents use Huawei Cloud Skills, KooCLI, APIs, SDKs, and future MCP capabilities safely and accurately.",
   "type": "module",
@@ -30,7 +30,7 @@
     }
   },
   "scripts": {
-    "test": "node --test \"test/*.test.mjs\"",
+    "test": "node --experimental-test-module-mocks --test \"test/*.test.mjs\"",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
     "lint:md": "markdownlint-cli2 \"**/*.md\" \"#node_modules\" \"#.git\" \"#test/**\" \"#docs/**\" \"#.superpowers/**\"",

package/plugins/huaweicloud-core/.claude-plugin/plugin.json

@@ -17,7 +17,7 @@
   "mcpServers": "./.mcp.json",
   "description": "Guide coding agents to use Huawei Cloud Skills, KooCLI, APIs, SDKs, and future MCP capabilities with safer execution and less context.",
   "skills": "./skills/",
-  "version": "1.1.4-next.5",
+  "version": "1.1.4",
   "author": {
     "name": "HuaweiCloud Mate",
     "url": "https://github.com/huaweicloud"

package/plugins/huaweicloud-core/.codex-plugin/plugin.json

@@ -20,7 +20,7 @@
   "mcpServers": "./.mcp.json",
   "description": "Agent toolkit that helps coding agents use Huawei Cloud Skills, KooCLI, APIs, SDKs, and future MCP capabilities safely and accurately.",
   "skills": "./skills/",
-  "version": "1.1.4-next.5",
+  "version": "1.1.4",
   "author": {
     "name": "HuaweiCloud Mate",
     "url": "https://github.com/huaweicloud"

package/plugins/huaweicloud-core/.cursor-plugin/plugin.json

@@ -17,7 +17,7 @@
   "mcpServers": "./.mcp.json",
   "description": "Guide coding agents to use Huawei Cloud Skills, KooCLI, APIs, SDKs, and future MCP capabilities with safer execution and less context.",
   "skills": "./skills/",
-  "version": "1.1.4-next.5",
+  "version": "1.1.4",
   "author": {
     "name": "HuaweiCloud Mate",
     "url": "https://github.com/huaweicloud"

package/plugins/huaweicloud-core/.hermes-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "huaweicloud-devkit",
-  "version": "1.1.4-next.5",
+  "version": "1.1.4",
   "description": "Guide coding agents to use Huawei Cloud Skills, KooCLI, APIs, SDKs, and future MCP capabilities with safer execution and less context.",
   "author": {
     "name": "HuaweiCloud Mate",

package/plugins/huaweicloud-core/.workbuddy-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "huaweicloud-devkit",
-  "version": "1.1.4-next.5",
+  "version": "1.1.4",
   "description": "Guide coding agents to use Huawei Cloud Skills, KooCLI, APIs, SDKs, and future MCP capabilities with safer execution and less context.",
   "author": {
     "name": "HuaweiCloud Mate",

package/plugins/huaweicloud-core/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "name": "huaweicloud-devkit",
   "id": "huaweicloud-devkit",
   "displayName": "HuaweiCloud DevKit",
-  "version": "1.1.4-next.5",
+  "version": "1.1.4",
   "family": "bundle-plugin",
   "bundleFormat": "codex",
   "description": "Guide coding agents to use Huawei Cloud safely — KooCLI, APIs, SDKs, 28 MCP tools, skills, and safety guardrails.",

package/plugins/huaweicloud-core/safety/policy.json

@@ -36,6 +36,7 @@
     "Stop",
     "Start",
     "Restart",
+    "Apply",
     "Authorize",
     "Revoke",
     "Add",

package/plugins/huaweicloud-core/src/auth/credentials.mjs

@@ -177,6 +177,40 @@ export function resolveCredentials(options = {}) {
       'Huawei Cloud credentials are not configured. Run "npx huaweicloud-devkit auth init" or set HW_ACCESS_KEY/HW_SECRET_KEY.',
     );
     err.code = 'HDKIT_CRED_MISSING';
+    // Lightweight onboarding hint. HDKIT_CRED_MISSING fires when no credential
+    // resolved: with env empty/masked and S1 absent, the scenario is 3 by
+    // default. Scenario 4 (import a config-provided account) is only reachable
+    // in the narrow case where CodeArts S4 offers real creds that the resolver
+    // still couldn't adopt (e.g. CODEARTS_PROJECT_DIR set but the marker dir is
+    // absent). Full guidance comes from getAuthStatus(); keep this branch cheap.
+    const codeartsCreds = readCodeArtsCredentials();
+    const injectedAvailable = present(codeartsCreds?.ak) && present(codeartsCreds?.sk);
+    err.onboarding = injectedAvailable
+      ? {
+          scenario: 4,
+          reason: 'import-injected',
+          message: '检测到配置中已有有效账号,可导入为正式凭证。',
+          steps: isCodeArtsContext()
+            ? [{ action: 'auth_switch', args: { mode: 'mcp-config', action: 'persist' }, label: '导入配置中的账号' }]
+            : [
+                {
+                  action: 'auth_switch',
+                  args: { mode: 'import', action: 'persist' },
+                  label: '通过 creds-import.json 导入',
+                },
+              ],
+        }
+      : {
+          scenario: 3,
+          reason: 's1-missing',
+          message: '未配置华为云凭证,需要完成登录后才能使用云能力。',
+          steps: isCodeArtsContext()
+            ? [
+                { action: 'write-import', target: join(homedir(), '.config', 'huaweicloud', 'creds-import.json') },
+                { action: 'auth_switch', args: { mode: 'import', action: 'persist' } },
+              ]
+            : [{ action: 'auth-init', args: {} }],
+        };
     throw err;
   }
 

package/plugins/huaweicloud-core/src/auth/service.mjs

@@ -1,9 +1,12 @@
 import { existsSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
 
 import { getAgentRegistrationStatuses } from './agent-registration.mjs';
 import { resolveAndApplyProjectId } from './project-id.mjs';
 import {
   globalCredentialsPath,
+  isPlaceholder,
   obsConfigPath,
   readGlobalCredentials,
   writeLastSync,
@@ -18,10 +21,141 @@ import {
 } from './reconcile.mjs';
 import { hcloudProbeNextStep, probeHcloud } from '../hcloud-probe.mjs';
 
+function isCodeArtsHome() {
+  return (
+    existsSync(join(process.cwd(), '.codeartsdoer')) ||
+    existsSync(join(homedir(), '.codeartsdoer')) ||
+    existsSync(join(homedir(), '.codeartswork'))
+  );
+}
+
+function envHasRealTriplet() {
+  return (
+    !isPlaceholder(process.env.HW_ACCESS_KEY) &&
+    Boolean(process.env.HW_ACCESS_KEY) &&
+    !isPlaceholder(process.env.HW_SECRET_KEY) &&
+    Boolean(process.env.HW_SECRET_KEY) &&
+    !isPlaceholder(process.env.HW_SECURITY_TOKEN) &&
+    Boolean(process.env.HW_SECURITY_TOKEN)
+  );
+}
+
+// Onboarding guidance (scenarios 1-4) for credential setup.
+// scenario: 1=S1 exists, no env/…; 2=conflict (S1 vs injected); 3=everything
+// missing (fresh user); 4=S1 empty but injected creds exist (import candidate).
+export function computeOnboarding({ credentials, reconciled } = {}) {
+  const creds = credentials ?? readGlobalCredentials();
+  const scan = reconciled ?? exportStateForStatus();
+  const s1Has = Boolean(creds?.ak && creds?.sk && !isPlaceholder(creds.ak) && !isPlaceholder(creds.sk));
+  const injected = envHasRealTriplet();
+  // env has real non-triplet creds that are NOT placeholders (e.g. devspace AK/SK w/o token)
+  const envRealAk = !isPlaceholder(process.env.HW_ACCESS_KEY) && Boolean(process.env.HW_ACCESS_KEY);
+  const envRealSk = !isPlaceholder(process.env.HW_SECRET_KEY) && Boolean(process.env.HW_SECRET_KEY);
+  const envHasCreds = envRealAk && envRealSk;
+  const codeArts = isCodeArtsHome();
+  const accountHint = s1Has ? fingerprint(creds.ak, creds.sk) : null;
+
+  let scenario;
+  let reason;
+  let message;
+  let steps;
+
+  if (scan.hasRuntime) {
+    scenario = 0;
+    reason = 'runtime-active';
+    message = 'Runtime credentials are active; no setup needed.';
+    return { needsSetup: false, scenario, reason, message, steps: [], accountHint };
+  }
+  if (envHasRealTriplet() && !s1Has) {
+    scenario = 0;
+    reason = 'platform-injected';
+    message = 'Platform credentials are active; nothing to configure.';
+    return { needsSetup: false, scenario, reason, message, steps: [], accountHint };
+  }
+  if (s1Has && !envHasCreds) {
+    scenario = 1;
+    reason = 's1-only';
+    message = `已保存账号(指纹 ${accountHint})可直接使用。`;
+    steps = [
+      { order: 1, action: 'use-s1', args: {}, label: '直接使用已保存账号' },
+      { order: 2, action: 'switch-new', args: { mode: 'import', action: 'persist' }, label: '改用新账号(导入)' },
+    ];
+  } else if (s1Has && envHasCreds) {
+    // Covers both plain env creds (conflict) AND platform triplet when S1
+    // exists. resolveCredentials' STS gate keeps S1 in front of a triplet,
+    // so the effective account is S1 → scenario 1 semantics plus a note.
+    if (injected) {
+      scenario = 1;
+      reason = 's1-with-platform-injected';
+      message = `已保存账号(指纹 ${accountHint})优先于平台注入,可直接使用。`;
+      steps = [
+        { order: 1, action: 'use-s1', args: {}, label: '使用已保存账号' },
+        {
+          order: 2,
+          action: 'switch-platform',
+          args: { mode: 'mcp-config', action: 'persist' },
+          label: '改用平台注入账号',
+        },
+      ];
+    } else {
+      scenario = 2;
+      reason = 'conflict';
+      message = '检测到两套账号:已保存 与 环境注入,请选择其一。';
+      steps = [
+        {
+          order: 1,
+          action: 'switch-persist',
+          args: { mode: 'memory', action: 'persist' },
+          label: '使用已保存账号覆盖',
+        },
+        {
+          order: 2,
+          action: 'switch-env',
+          args: { mode: 'mcp-config', action: 'persist' },
+          label: '使用环境注入账号导入',
+        },
+      ];
+    }
+  } else if (!s1Has && envHasCreds && !injected) {
+    scenario = 4;
+    reason = 'import-injected';
+    message = '检测到配置中已有有效账号,可导入为正式凭证。';
+    steps = [
+      {
+        order: 1,
+        action: 'switch-persist',
+        args: { mode: codeArts ? 'mcp-config' : 'import', action: 'persist' },
+        label: '导入该账号',
+      },
+    ];
+  } else {
+    scenario = 3;
+    reason = 's1-missing';
+    message = '未配置华为云凭证,需要完成登录后才能使用云能力。';
+    steps = [
+      { order: 1, action: 'obtain-aksk', target: 'console', label: '获取 AK/SK(华为云控制台)' },
+      ...(codeArts
+        ? [
+            {
+              order: 2,
+              action: 'write-import',
+              target: join(homedir(), '.config', 'huaweicloud', 'creds-import.json'),
+              label: '把 AK/SK 写入 creds-import.json',
+            },
+            { order: 3, action: 'auth_switch', args: { mode: 'import', action: 'persist' }, label: '执行导入完成配置' },
+          ]
+        : [{ order: 2, action: 'auth-init', args: {}, label: '运行 npx huaweicloud-devkit auth init' }]),
+    ];
+  }
+
+  return { needsSetup: true, scenario, reason, message, steps, accountHint };
+}
+
 export function getAuthStatus(target = 'all') {
   const credentials = readGlobalCredentials();
   const reconciled = { ...exportStateForStatus(), runtimeActive: hasRuntimeCredentials() };
   const hcloud = probeHcloud();
+  const onboarding = computeOnboarding({ credentials, reconciled });
   return {
     target,
     credentialsConfigured: Boolean(credentials?.ak && credentials?.sk),
@@ -32,6 +166,7 @@ export function getAuthStatus(target = 'all') {
     kooCliStatus: hcloud.status,
     kooCliNextStep: hcloudProbeNextStep(hcloud),
     reconciled,
+    onboarding,
     agents: getAgentRegistrationStatuses(target).agents,
   };
 }

package/plugins/huaweicloud-core/src/mcp-config-backup.mjs

@@ -0,0 +1,70 @@
+// Backup/restore of user-customized MCP config fields across uninstall/reinstall (issue #615).
+// Uninstall saves the user delta keyed by agent; a later install/update consumes and applies it.
+//
+// Residual semantics: deltas are namespaced per agent and only that agent's
+// next install/update consumes them (take-once). If the user never reinstalls
+// an agent, its delta simply stays in the backup file — this is expected and
+// harmless (no cross-agent contamination). `uninstall --target all` purges
+// the whole file explicitly.
+
+import { existsSync, mkdirSync, readFileSync, writeFileSync, rmSync } from 'node:fs';
+import { join, dirname } from 'node:path';
+import { homedir } from 'node:os';
+
+export function mcpBackupFilePath(base = process.env.HUAWEICLOUD_HOME || homedir()) {
+  return join(base, '.config', 'huaweicloud', 'devkit-mcp-backup.json');
+}
+
+function readBackup(file) {
+  if (!existsSync(file)) return {};
+  try {
+    const data = JSON.parse(readFileSync(file, 'utf8'));
+    return data && typeof data === 'object' && !Array.isArray(data) ? data : {};
+  } catch {
+    return {};
+  }
+}
+
+export function readAgentDelta(agentKey, file = mcpBackupFilePath()) {
+  const delta = readBackup(file)[agentKey];
+  return delta && typeof delta === 'object' ? delta : null;
+}
+
+export function saveAgentDelta(agentKey, delta, file = mcpBackupFilePath()) {
+  if (!agentKey || !delta || typeof delta !== 'object') return false;
+  const backup = readBackup(file);
+  backup[agentKey] = { ...delta, savedAt: new Date().toISOString() };
+  try {
+    mkdirSync(dirname(file), { recursive: true });
+    writeFileSync(file, JSON.stringify(backup, null, 2));
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// Consume the delta for an agent: returns it and removes it from the backup file.
+export function takeAgentDelta(agentKey, file = mcpBackupFilePath()) {
+  const delta = readAgentDelta(agentKey, file);
+  if (!delta) return null;
+  const backup = readBackup(file);
+  delete backup[agentKey];
+  try {
+    if (Object.keys(backup).length === 0) {
+      rmSync(file, { force: true });
+    } else {
+      writeFileSync(file, JSON.stringify(backup, null, 2));
+    }
+  } catch {}
+  return delta;
+}
+
+export function purgeBackup(file = mcpBackupFilePath()) {
+  if (!existsSync(file)) return false;
+  try {
+    rmSync(file, { force: true });
+    return true;
+  } catch {
+    return false;
+  }
+}

package/plugins/huaweicloud-core/src/mcp-config-merge.mjs

@@ -0,0 +1,132 @@
+// Pure helpers for merging HuaweiCloud DevKit MCP config entries without
+// dropping user-customized fields (extra command args, env, timeout, enabled).
+// Program-owned fields (the node executable + mcp-server.mjs path, required env
+// keys) are corrected by the installer; everything else belongs to the user.
+
+function isPlainObject(value) {
+  return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+}
+
+function sameJson(a, b) {
+  return JSON.stringify(a) === JSON.stringify(b);
+}
+
+// Merge env maps: our required keys are only set when absent; user-set values
+// always win. Returns null when nothing needs to change.
+function mergeEnv(userEnv = {}, requiredEnv = {}) {
+  const merged = { ...userEnv };
+  let changed = false;
+  for (const [key, value] of Object.entries(requiredEnv)) {
+    if (merged[key] === undefined) {
+      merged[key] = value;
+      changed = true;
+    }
+  }
+  if (!changed && sameJson(merged, userEnv)) return null;
+  return merged;
+}
+
+function withDefaultTimeout(entry, defaultTimeout) {
+  // Pass null explicitly to omit the timeout field (defaults only apply to undefined).
+  if (defaultTimeout) entry.timeout = defaultTimeout;
+  return entry;
+}
+
+// OpenCode style entry: { type, command: ['node', mcpPath, ...userArgs], ... }
+export function mergeCommandStyle(existing, { mcpPath, defaultTimeout = 300000 } = {}) {
+  if (!isPlainObject(existing)) {
+    return {
+      entry: withDefaultTimeout({ type: 'local', command: ['node', mcpPath], enabled: true }, defaultTimeout),
+      changed: true,
+    };
+  }
+  const commandIsNodeStyle = Array.isArray(existing.command) && existing.command[0] === 'node';
+  if (!commandIsNodeStyle) {
+    // Foreign wrapper entry: keep current overwrite behavior.
+    return {
+      entry: withDefaultTimeout({ type: 'local', command: ['node', mcpPath], enabled: true }, defaultTimeout),
+      changed: true,
+    };
+  }
+  const merged = { ...existing, type: 'local', command: ['node', mcpPath, ...existing.command.slice(2)] };
+  if (merged.timeout === undefined && defaultTimeout) merged.timeout = defaultTimeout;
+  if (merged.enabled === undefined) merged.enabled = true;
+  return { entry: merged, changed: !sameJson(merged, existing) };
+}
+
+// WorkBuddy/AtomCode/CodeArts style entry: { command: 'node', args: [mcpPath, ...userArgs], env, ... }
+export function mergeArgsStyle(existing, { mcpPath, env = {}, defaultTimeout = 300000 } = {}) {
+  if (!isPlainObject(existing)) {
+    return {
+      entry: withDefaultTimeout({ command: 'node', args: [mcpPath], env: { ...env } }, defaultTimeout),
+      changed: true,
+    };
+  }
+  const commandIsNodeStyle = existing.command === 'node';
+  if (!commandIsNodeStyle) {
+    return {
+      entry: withDefaultTimeout({ command: 'node', args: [mcpPath], env: { ...env } }, defaultTimeout),
+      changed: true,
+    };
+  }
+  const merged = {
+    ...existing,
+    command: 'node',
+    args: [mcpPath, ...(Array.isArray(existing.args) ? existing.args.slice(1) : [])],
+  };
+  const envMerged = mergeEnv(isPlainObject(existing.env) ? existing.env : {}, env);
+  if (envMerged) merged.env = envMerged;
+  if (merged.timeout === undefined && defaultTimeout) merged.timeout = defaultTimeout;
+  return { entry: merged, changed: !sameJson(merged, existing) };
+}
+
+// Codex Desktop / OpenClaw .mcp.json style: { mcpServers: { 'huaweicloud-devkit': entry } }
+// Fresh entries keep the historical shape (no timeout field); user-set timeouts are preserved.
+export function mergeMcpServersFile(config, { mcpPath, env = {} } = {}) {
+  const existing = isPlainObject(config) ? config.mcpServers?.['huaweicloud-devkit'] : undefined;
+  const { entry, changed } = mergeArgsStyle(existing, { mcpPath, env, defaultTimeout: null });
+  const next = isPlainObject(config) ? { ...config } : {};
+  next.mcpServers = { ...(isPlainObject(config) ? config.mcpServers : {}), 'huaweicloud-devkit': entry };
+  return { entry, config: next, changed: changed || !isPlainObject(config) || !existing };
+}
+
+// Env keys the installer manages itself (recomputed on every install) — never
+// treated as user assets for backup purposes.
+const REQUIRED_ENV_KEYS = new Set(['HUAWEICLOUD_AGENT_TOOLKIT_MODE', 'HCLOUD_BIN']);
+
+// Extract the user-owned delta of an entry for backup before uninstall removes it.
+export function extractUserDelta(entry, style) {
+  if (!isPlainObject(entry)) return null;
+  const delta = {};
+  if (style === 'command') {
+    if (Array.isArray(entry.command) && entry.command.length > 2) delta.commandExtra = entry.command.slice(2);
+  } else if (style === 'args') {
+    if (Array.isArray(entry.args) && entry.args.length > 1) delta.argsExtra = entry.args.slice(1);
+  } else {
+    return null;
+  }
+  if (isPlainObject(entry.env)) {
+    const userEnv = Object.fromEntries(Object.entries(entry.env).filter(([key]) => !REQUIRED_ENV_KEYS.has(key)));
+    if (Object.keys(userEnv).length > 0) delta.env = userEnv;
+  }
+  if (entry.timeout !== undefined && entry.timeout !== 300000) delta.timeout = entry.timeout;
+  if (entry.enabled === false) delta.enabled = false;
+  return Object.keys(delta).length > 0 ? delta : null;
+}
+
+// Apply a previously saved delta onto a freshly written default entry.
+export function applyUserDelta(entry, delta, style) {
+  if (!isPlainObject(entry) || !isPlainObject(delta)) return entry;
+  const merged = { ...entry };
+  if (style === 'command' && Array.isArray(delta.commandExtra)) {
+    merged.command = [...entry.command, ...delta.commandExtra];
+  } else if (style === 'args' && Array.isArray(delta.argsExtra)) {
+    merged.args = [...entry.args, ...delta.argsExtra];
+  }
+  if (isPlainObject(delta.env)) {
+    merged.env = { ...(isPlainObject(entry.env) ? entry.env : {}), ...delta.env };
+  }
+  if (delta.timeout !== undefined) merged.timeout = delta.timeout;
+  if (delta.enabled === false) merged.enabled = false;
+  return merged;
+}

package/plugins/huaweicloud-core/src/proxy/proxy-agent.mjs

@@ -3,6 +3,17 @@ import { getProxyUrlForTarget } from './proxy-config.mjs';
 let cachedDispatcher = undefined;
 let cachedDispatcherProxyUrl = null;
 
+// Enterprise MITM proxies re-sign TLS on BOTH legs: the proxy's own certificate
+// (`proxyTls`) and the tunneled connection to the target server (`requestTls`).
+// Both must be relaxed for such environments. Note `requestTls` is NOT the proxy
+// cert — it is the target-server cert seen through the tunnel. This relaxation is
+// scoped to proxied connections only; direct connections keep strict certificate
+// verification (see the non-proxy branch of `fetchWithProxy`).
+export const PROXY_TLS_OPTIONS = {
+  proxyTls: { rejectUnauthorized: false },
+  requestTls: { rejectUnauthorized: false },
+};
+
 async function importUndici() {
   try {
     /* eslint-disable-next-line n/no-missing-import */
@@ -21,7 +32,7 @@ export async function getProxyDispatcher(targetUrl) {
   }
 
   const { ProxyAgent } = await importUndici();
-  cachedDispatcher = new ProxyAgent(proxyUrl);
+  cachedDispatcher = new ProxyAgent({ uri: proxyUrl, ...PROXY_TLS_OPTIONS });
   cachedDispatcherProxyUrl = proxyUrl;
   return cachedDispatcher;
 }

package/plugins/huaweicloud-core/src/setup-cli.mjs

@@ -36,6 +36,8 @@ import {
   getProxySettings,
 } from './proxy/proxy-config.mjs';
 import { removeKooCli, removeObsConfig } from './sandbox/uninstall-cleanup.mjs';
+import { mergeCommandStyle, mergeArgsStyle, extractUserDelta, applyUserDelta } from './mcp-config-merge.mjs';
+import { saveAgentDelta, takeAgentDelta, purgeBackup } from './mcp-config-backup.mjs';
 import { queryDistTagsFetch, determineTarget, semverCompare } from './update-check.mjs';
 import { getKooCliVersion, compareVersion, kooCliDownloadBase, KOO_CLI_BASE } from './koocli-version.mjs';
 import { findHcloudBin, hcloudProbeNextStep, probeHcloud } from './hcloud-probe.mjs';
@@ -261,15 +263,30 @@ function ensureOfficeaceMcpInSqlite() {
     const envJson = JSON.stringify(env);
 
     if (existing) {
-      if (existing.command === 'node' && existing.args_json === argsJson && existing.env_json === envJson) {
+      // Merge: keep user's extra args/env values, only correct program-owned fields (issue #615).
+      let existingArgs = [];
+      let existingEnv = [];
+      try {
+        existingArgs = JSON.parse(existing.args_json || '[]');
+        existingEnv = JSON.parse(existing.env_json || '[]');
+      } catch {}
+      const userArgs = Array.isArray(existingArgs) ? existingArgs.slice(1) : [];
+      // Start from the user's env and add our required keys only when absent (user values win).
+      const envMerged = [...(Array.isArray(existingEnv) ? existingEnv : [])];
+      for (const e of env) {
+        if (e && e.key && !envMerged.some((x) => x && x.key === e.key)) envMerged.push(e);
+      }
+      const nextArgsJson = JSON.stringify([mcpPath, ...userArgs]);
+      const nextEnvJson = JSON.stringify(envMerged);
+      if (existing.command === 'node' && existing.args_json === nextArgsJson && existing.env_json === nextEnvJson) {
         console.log(`  MCP config unchanged: ${dbPath}`);
         db.close();
         return true;
       }
       db.prepare(
         'UPDATE mcp_connectors SET command = ?, args_json = ?, env_json = ?, updated_at = ?, status = ?, enabled = 1 WHERE id = ?',
-      ).run('node', argsJson, envJson, now, 'disconnected', existing.id);
-      console.log(`  MCP config updated: ${dbPath}`);
+      ).run('node', nextArgsJson, nextEnvJson, now, 'disconnected', existing.id);
+      console.log(`  MCP config merged (user fields preserved): ${dbPath}`);
     } else {
       const ownerUserId = officeaceGetOwnerUserId();
       if (!ownerUserId) {
@@ -277,10 +294,16 @@ function ensureOfficeaceMcpInSqlite() {
         db.close();
         return false;
       }
+      // Restore user args saved by a previous uninstall (issue #615).
+      const officeaceDelta = takeAgentDelta('officeace');
+      const insertArgsJson =
+        officeaceDelta && Array.isArray(officeaceDelta.argsExtra)
+          ? JSON.stringify([mcpPath, ...officeaceDelta.argsExtra])
+          : argsJson;
       db.prepare(
         `INSERT INTO mcp_connectors (id, owner_user_id, type, name, normalized_name, transport, timeout_ms, command, args_json, env_json, enabled, status, created_at, updated_at, version, seeded)
          VALUES (?, ?, 'custom', 'huaweicloud-devkit', 'huaweicloud-devkit', 'stdio', 60000, 'node', ?, ?, 1, 'disconnected', ?, ?, 1, 0)`,
-      ).run(randomUUID(), ownerUserId, argsJson, envJson, now, now);
+      ).run(randomUUID(), ownerUserId, insertArgsJson, envJson, now, now);
       console.log(`  MCP config created: ${dbPath}`);
     }
     db.close();
@@ -302,6 +325,14 @@ function removeOfficeaceMcpFromSqlite() {
   let db;
   try {
     db = openOfficeaceDb();
+    // Back up user args before deleting the connector row (issue #615).
+    try {
+      const row = db.prepare("SELECT args_json FROM mcp_connectors WHERE name = 'huaweicloud-devkit'").get();
+      const parsed = row ? JSON.parse(row.args_json || '[]') : [];
+      if (Array.isArray(parsed) && parsed.length > 1) {
+        saveAgentDelta('officeace', { argsExtra: parsed.slice(1) });
+      }
+    } catch {}
     db.prepare(
       "DELETE FROM mcp_connector_tools WHERE connector_id IN (SELECT id FROM mcp_connectors WHERE name = 'huaweicloud-devkit')",
     ).run();
@@ -558,29 +589,68 @@ function updateOpenCodeConfig(pluginDir) {
       return;
     }
     const existing = config.mcp?.['huaweicloud-devkit'];
-    if (
-      existing &&
-      existing.type === 'local' &&
-      Array.isArray(existing.command) &&
-      existing.command[0] === 'node' &&
-      existing.command[1] === mcpPath &&
-      existing.timeout === 300000
-    ) {
+    const { entry, changed } = mergeCommandStyle(existing, { mcpPath });
+    if (existing && !changed) {
       console.log(`  OpenCode MCP config unchanged: ${configPath}`);
       return;
     }
+    if (existing && changed) {
+      config.mcp['huaweicloud-devkit'] = entry;
+      writeFileSync(configPath, JSON.stringify(config, null, 2));
+      console.log(`  OpenCode MCP config merged (user fields preserved): ${configPath}`);
+      return;
+    }
   }
   config.mcp = config.mcp || {};
-  config.mcp['huaweicloud-devkit'] = {
-    type: 'local',
-    command: ['node', mcpPath],
-    enabled: true,
-    timeout: 300000,
-  };
+  config.mcp['huaweicloud-devkit'] = mergeCommandStyle(undefined, { mcpPath }).entry;
+  // Restore user fields saved by a previous uninstall (issue #615).
+  const delta = takeAgentDelta('opencode');
+  if (delta) config.mcp['huaweicloud-devkit'] = applyUserDelta(config.mcp['huaweicloud-devkit'], delta, 'command');
   writeFileSync(configPath, JSON.stringify(config, null, 2));
   console.log(`  OpenCode config updated: ${configPath}`);
 }
 
+// Read-merge-write for pluginDir/.mcp.json (OpenClaw, Codex Desktop).
+// Preserves user extra args/env; restores a prior uninstall's backup on fresh install (issue #615).
+function writeMcpServersFile(pluginDest, mcpPath, agentKey) {
+  const configPath = join(pluginDest, '.mcp.json');
+  let config;
+  try {
+    config = existsSync(configPath) ? JSON.parse(readFileSync(configPath, 'utf8')) : undefined;
+  } catch {
+    config = undefined;
+  }
+  const existing = config && typeof config === 'object' ? config.mcpServers?.['huaweicloud-devkit'] : undefined;
+  const { entry, changed } = mergeArgsStyle(existing, {
+    mcpPath,
+    env: { HUAWEICLOUD_AGENT_TOOLKIT_MODE: 'local' },
+    defaultTimeout: null,
+  });
+  if (existing && !changed) {
+    console.log(`  MCP Config unchanged: ${configPath}`);
+    return;
+  }
+  const next = config && typeof config === 'object' && !Array.isArray(config) ? { ...config } : {};
+  next.mcpServers = { ...(config && typeof config === 'object' ? config.mcpServers : {}), 'huaweicloud-devkit': entry };
+  if (!existing) {
+    const delta = takeAgentDelta(agentKey);
+    if (delta)
+      next.mcpServers['huaweicloud-devkit'] = applyUserDelta(next.mcpServers['huaweicloud-devkit'], delta, 'args');
+  }
+  writeFileSync(configPath, JSON.stringify(next, null, 2));
+  console.log(`  MCP Config -> ${configPath}`);
+}
+
+// Back up the user delta from a pluginDir/.mcp.json before the directory is removed (issue #615).
+function backupDeltaFromMcpServersFile(pluginDest, agentKey) {
+  const configPath = join(pluginDest, '.mcp.json');
+  try {
+    const config = JSON.parse(readFileSync(configPath, 'utf8'));
+    const delta = extractUserDelta(config?.mcpServers?.['huaweicloud-devkit'], 'args');
+    if (delta) saveAgentDelta(agentKey, delta);
+  } catch {}
+}
+
 function removeOpenCodeConfig() {
   const configPath = opencodeConfigFile();
   if (!existsSync(configPath)) return;
@@ -591,6 +661,9 @@ function removeOpenCodeConfig() {
     return;
   }
   if (!config.mcp?.['huaweicloud-devkit']) return;
+  // Back up user-customized fields before removal so a later reinstall can restore them (issue #615).
+  const delta = extractUserDelta(config.mcp['huaweicloud-devkit'], 'command');
+  if (delta) saveAgentDelta('opencode', delta);
   delete config.mcp['huaweicloud-devkit'];
   if (Object.keys(config.mcp).length === 0) delete config.mcp;
   writeFileSync(configPath, JSON.stringify(config, null, 2));
@@ -920,17 +993,7 @@ async function installOpenClaw() {
   console.log(`  Safety Policy -> ${join(pluginDest, 'safety')}`);
 
   const mcpServerAbsPath = join(pluginDest, 'src', 'mcp-server.mjs').replace(/\\/g, '/');
-  const mcpConfig = {
-    mcpServers: {
-      'huaweicloud-devkit': {
-        command: 'node',
-        args: [mcpServerAbsPath],
-        env: { HUAWEICLOUD_AGENT_TOOLKIT_MODE: 'local' },
-      },
-    },
-  };
-  writeFileSync(join(pluginDest, '.mcp.json'), JSON.stringify(mcpConfig, null, 2));
-  console.log(`  MCP Config -> ${join(pluginDest, '.mcp.json')}`);
+  writeMcpServersFile(pluginDest, mcpServerAbsPath, 'openclaw');
 
   const codexPluginSrc = join(PLUGIN_ROOT, '.codex-plugin');
   if (existsSync(codexPluginSrc)) {
@@ -967,6 +1030,7 @@ function uninstallOpenClaw() {
     if (cmdRemoved > 0) console.log(`  Removed ${cmdRemoved} commands`);
   }
 
+  backupDeltaFromMcpServersFile(openclawPluginsDir(), 'openclaw');
   if (removeIfExists(openclawPluginsDir())) {
     console.log('  Removed MCP server and safety policy');
   }
@@ -991,17 +1055,7 @@ async function updateOpenClaw() {
   console.log(`  Safety Policy updated -> ${join(pluginDest, 'safety')}`);
 
   const mcpServerAbsPath = join(pluginDest, 'src', 'mcp-server.mjs').replace(/\\/g, '/');
-  const mcpConfig = {
-    mcpServers: {
-      'huaweicloud-devkit': {
-        command: 'node',
-        args: [mcpServerAbsPath],
-        env: { HUAWEICLOUD_AGENT_TOOLKIT_MODE: 'local' },
-      },
-    },
-  };
-  writeFileSync(join(pluginDest, '.mcp.json'), JSON.stringify(mcpConfig, null, 2));
-  console.log(`  MCP Config updated -> ${join(pluginDest, '.mcp.json')}`);
+  writeMcpServersFile(pluginDest, mcpServerAbsPath, 'openclaw');
 
   const codexPluginSrc = join(PLUGIN_ROOT, '.codex-plugin');
   if (existsSync(codexPluginSrc)) {
@@ -1039,17 +1093,7 @@ async function installCodexDesktop() {
 
   // Generate .mcp.json for Codex plugin MCP server discovery
   const mcpServerAbsPath = join(pluginDest, 'src', 'mcp-server.mjs').replace(/\\/g, '/');
-  const mcpConfig = {
-    mcpServers: {
-      'huaweicloud-devkit': {
-        command: 'node',
-        args: [mcpServerAbsPath],
-        env: { HUAWEICLOUD_AGENT_TOOLKIT_MODE: 'local' },
-      },
-    },
-  };
-  writeFileSync(join(pluginDest, '.mcp.json'), JSON.stringify(mcpConfig, null, 2));
-  console.log(`  MCP Config -> ${join(pluginDest, '.mcp.json')}`);
+  writeMcpServersFile(pluginDest, mcpServerAbsPath, 'codex-desktop');
 
   // Copy .codex-plugin manifest for Codex Desktop plugin registration
   const codexPluginSrc = join(PLUGIN_ROOT, '.codex-plugin');
@@ -1106,17 +1150,7 @@ async function updateCodexDesktop() {
   }
 
   const mcpServerAbsPath = join(pluginDest, 'src', 'mcp-server.mjs').replace(/\\/g, '/');
-  const mcpConfig = {
-    mcpServers: {
-      'huaweicloud-devkit': {
-        command: 'node',
-        args: [mcpServerAbsPath],
-        env: { HUAWEICLOUD_AGENT_TOOLKIT_MODE: 'local' },
-      },
-    },
-  };
-  writeFileSync(join(pluginDest, '.mcp.json'), JSON.stringify(mcpConfig, null, 2));
-  console.log(`  MCP Config updated -> ${join(pluginDest, '.mcp.json')}`);
+  writeMcpServersFile(pluginDest, mcpServerAbsPath, 'codex-desktop');
 
   const codexPluginSrc = join(PLUGIN_ROOT, '.codex-plugin');
   if (existsSync(codexPluginSrc)) {
@@ -1155,6 +1189,7 @@ function uninstallCodexDesktop() {
     if (cmdRemoved > 0) console.log(`  Removed ${cmdRemoved} commands`);
   }
 
+  backupDeltaFromMcpServersFile(pluginDest, 'codex-desktop');
   if (removeIfExists(pluginDest)) {
     console.log('  Removed MCP server and safety policy');
   }
@@ -1185,10 +1220,13 @@ function uninstallCodexDesktop() {
   }
 }
 
-function registerCodeartsMcp(configPath) {
+function registerCodeartsMcp(configPath, agentKey = 'codearts') {
   const mcpPath = join(codeartsPluginsDir(), 'src', 'mcp-server.mjs').replace(/\\/g, '/');
   const hcloudBin = findHcloudBin();
+  const env = { HUAWEICLOUD_AGENT_TOOLKIT_MODE: 'local' };
+  if (hcloudBin) env.HCLOUD_BIN = hcloudBin.replace(/\\/g, '/');
   let config = {};
+  let existing;
   if (existsSync(configPath)) {
     try {
       config = JSON.parse(readFileSync(configPath, 'utf8'));
@@ -1198,51 +1236,27 @@ function registerCodeartsMcp(configPath) {
       );
       return;
     }
-    const existing = config.mcpServers?.['huaweicloud-devkit'];
-    if (
-      existing &&
-      existing.command === 'node' &&
-      Array.isArray(existing.args) &&
-      existing.args[0] === mcpPath &&
-      existing.timeout === 300000
-    ) {
-      let changed = false;
-      if (!existing.env) {
-        existing.env = {};
-        changed = true;
-      }
-      if (!existing.env.HUAWEICLOUD_AGENT_TOOLKIT_MODE) {
-        existing.env.HUAWEICLOUD_AGENT_TOOLKIT_MODE = 'local';
-        changed = true;
-      }
-      if (hcloudBin && !existing.env.HCLOUD_BIN) {
-        existing.env.HCLOUD_BIN = hcloudBin.replace(/\\/g, '/');
-        changed = true;
-      }
-      if (existing.enabled !== true) {
-        existing.enabled = true;
-        changed = true;
-      }
-      if (changed) {
-        mkdirSync(dirname(configPath), { recursive: true });
-        writeFileSync(configPath, JSON.stringify(config, null, 2));
-        console.log(`  MCP config refreshed: ${configPath}`);
-      } else {
+    existing = config.mcpServers?.['huaweicloud-devkit'];
+    if (existing) {
+      const { entry, changed } = mergeArgsStyle(existing, { mcpPath, env });
+      if (!changed) {
         console.log(`  MCP config unchanged: ${configPath}`);
+        return;
       }
+      config.mcpServers['huaweicloud-devkit'] = entry;
+      mkdirSync(dirname(configPath), { recursive: true });
+      writeFileSync(configPath, JSON.stringify(config, null, 2));
+      console.log(`  MCP config merged (user fields preserved): ${configPath}`);
       return;
     }
   }
   config.mcpServers = config.mcpServers || {};
-  const env = { HUAWEICLOUD_AGENT_TOOLKIT_MODE: 'local' };
-  if (hcloudBin) env.HCLOUD_BIN = hcloudBin.replace(/\\/g, '/');
-  config.mcpServers['huaweicloud-devkit'] = {
-    command: 'node',
-    args: [mcpPath],
-    env,
-    enabled: true,
-    timeout: 300000,
-  };
+  let entry = mergeArgsStyle(undefined, { mcpPath, env }).entry;
+  entry.enabled = true;
+  // Restore user fields saved by a previous uninstall (issue #615).
+  const delta = takeAgentDelta(agentKey);
+  if (delta) entry = applyUserDelta(entry, delta, 'args');
+  config.mcpServers['huaweicloud-devkit'] = entry;
   mkdirSync(dirname(configPath), { recursive: true });
   writeFileSync(configPath, JSON.stringify(config, null, 2));
   console.log(`  MCP config updated: ${configPath}`);
@@ -1336,6 +1350,8 @@ function uninstallCodeArts() {
       config = JSON.parse(readFileSync(configPath, 'utf8'));
     } catch {}
     if (config.mcpServers?.['huaweicloud-devkit']) {
+      const delta = extractUserDelta(config.mcpServers['huaweicloud-devkit'], 'args');
+      if (delta) saveAgentDelta('codearts', delta);
       delete config.mcpServers['huaweicloud-devkit'];
       if (Object.keys(config.mcpServers).length === 0) delete config.mcpServers;
       writeFileSync(configPath, JSON.stringify(config, null, 2));
@@ -1392,31 +1408,44 @@ function registerCodeartsWorkMcp() {
       return;
     }
     const existing = config.mcp?.['huaweicloud-devkit'];
-    if (
-      existing &&
-      existing.type === 'local' &&
-      Array.isArray(existing.command) &&
-      existing.command[0] === 'node' &&
-      existing.command[1] === mcpPath &&
-      existing.timeout === 300000
-    ) {
-      console.log(`  MCP config unchanged: ${configPath}`);
+    if (existing) {
+      // codearts-work uses `command` array + `environment` naming; adapt via mergeCommandStyle.
+      const { entry, changed } = mergeCommandStyle(existing, { mcpPath });
+      if (!changed) {
+        console.log(`  MCP config unchanged: ${configPath}`);
+        return;
+      }
+      const merged = { ...entry };
+      merged.environment = {
+        ...(isPlainLocal(existing.environment) ? existing.environment : {}),
+        HUAWEICLOUD_AGENT_TOOLKIT_MODE: 'local',
+      };
+      if (hcloudBin && merged.environment.HCLOUD_BIN === undefined) {
+        merged.environment.HCLOUD_BIN = hcloudBin.replace(/\\/g, '/');
+      }
+      config.mcp['huaweicloud-devkit'] = merged;
+      mkdirSync(dirname(configPath), { recursive: true });
+      writeFileSync(configPath, JSON.stringify(config, null, 2));
+      console.log(`  MCP config merged (user fields preserved): ${configPath}`);
       return;
     }
   }
   config.mcp = config.mcp || {};
-  config.mcp['huaweicloud-devkit'] = {
-    type: 'local',
-    command: ['node', mcpPath],
-    environment,
-    enabled: true,
-    timeout: 300000,
-  };
+  let entry = mergeCommandStyle(undefined, { mcpPath }).entry;
+  entry.environment = { ...environment };
+  // Restore user fields saved by a previous uninstall (issue #615).
+  const delta = takeAgentDelta('codearts-work');
+  if (delta) entry = applyUserDelta(entry, delta, 'command');
+  config.mcp['huaweicloud-devkit'] = entry;
   mkdirSync(dirname(configPath), { recursive: true });
   writeFileSync(configPath, JSON.stringify(config, null, 2));
   console.log(`  MCP config updated: ${configPath}`);
 }
 
+function isPlainLocal(value) {
+  return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+}
+
 async function installCodeArtsWork() {
   const skillsSrc = join(PLUGIN_ROOT, 'skills');
   const srcDir = join(PLUGIN_ROOT, 'src');
@@ -1477,6 +1506,8 @@ function uninstallCodeArtsWork() {
       config = JSON.parse(readFileSync(configPath, 'utf8'));
     } catch {}
     if (config.mcp?.['huaweicloud-devkit']) {
+      const delta = extractUserDelta(config.mcp['huaweicloud-devkit'], 'command');
+      if (delta) saveAgentDelta('codearts-work', delta);
       delete config.mcp['huaweicloud-devkit'];
       if (Object.keys(config.mcp).length === 0) delete config.mcp;
       writeFileSync(configPath, JSON.stringify(config, null, 2));
@@ -1532,24 +1563,25 @@ function ensureWorkbuddyMcpConfig() {
       return false;
     }
     const existing = config.mcpServers?.['huaweicloud-devkit'];
-    if (
-      existing &&
-      existing.command === 'node' &&
-      Array.isArray(existing.args) &&
-      existing.args[0] === mcpPath &&
-      existing.timeout === 300000
-    ) {
-      console.log(`  MCP config unchanged: ${configPath}`);
-      return false;
+    if (existing) {
+      const { entry, changed } = mergeArgsStyle(existing, { mcpPath, env });
+      if (!changed) {
+        console.log(`  MCP config unchanged: ${configPath}`);
+        return false;
+      }
+      config.mcpServers['huaweicloud-devkit'] = entry;
+      mkdirSync(dirname(configPath), { recursive: true });
+      writeFileSync(configPath, JSON.stringify(config, null, 2));
+      console.log(`  MCP config merged (user fields preserved): ${configPath}`);
+      return true;
     }
   }
   config.mcpServers = config.mcpServers || {};
-  config.mcpServers['huaweicloud-devkit'] = {
-    command: 'node',
-    args: [mcpPath],
-    env,
-    timeout: 300000,
-  };
+  let entry = mergeArgsStyle(undefined, { mcpPath, env }).entry;
+  // Restore user fields saved by a previous uninstall (issue #615).
+  const delta = takeAgentDelta('workbuddy');
+  if (delta) entry = applyUserDelta(entry, delta, 'args');
+  config.mcpServers['huaweicloud-devkit'] = entry;
   mkdirSync(dirname(configPath), { recursive: true });
   writeFileSync(configPath, JSON.stringify(config, null, 2));
   console.log(`  MCP config updated: ${configPath}`);
@@ -1762,6 +1794,8 @@ function uninstallWorkBuddy() {
       config = JSON.parse(readFileSync(configPath, 'utf8'));
     } catch {}
     if (config.mcpServers?.['huaweicloud-devkit']) {
+      const delta = extractUserDelta(config.mcpServers['huaweicloud-devkit'], 'args');
+      if (delta) saveAgentDelta('workbuddy', delta);
       delete config.mcpServers['huaweicloud-devkit'];
       if (Object.keys(config.mcpServers).length === 0) delete config.mcpServers;
       writeFileSync(configPath, JSON.stringify(config, null, 2));
@@ -1861,24 +1895,25 @@ function ensureAtomcodeMcpConfig() {
       return false;
     }
     const existing = config.mcpServers?.['huaweicloud-devkit'];
-    if (
-      existing &&
-      existing.command === 'node' &&
-      Array.isArray(existing.args) &&
-      existing.args[0] === mcpPath &&
-      existing.timeout === 300000
-    ) {
-      console.log(`  MCP config unchanged: ${configPath}`);
-      return false;
+    if (existing) {
+      const { entry, changed } = mergeArgsStyle(existing, { mcpPath, env });
+      if (!changed) {
+        console.log(`  MCP config unchanged: ${configPath}`);
+        return false;
+      }
+      config.mcpServers['huaweicloud-devkit'] = entry;
+      mkdirSync(dirname(configPath), { recursive: true });
+      writeFileSync(configPath, JSON.stringify(config, null, 2));
+      console.log(`  MCP config merged (user fields preserved): ${configPath}`);
+      return true;
     }
   }
   config.mcpServers = config.mcpServers || {};
-  config.mcpServers['huaweicloud-devkit'] = {
-    command: 'node',
-    args: [mcpPath],
-    env,
-    timeout: 300000,
-  };
+  let entry = mergeArgsStyle(undefined, { mcpPath, env }).entry;
+  // Restore user fields saved by a previous uninstall (issue #615).
+  const delta = takeAgentDelta('atomcode');
+  if (delta) entry = applyUserDelta(entry, delta, 'args');
+  config.mcpServers['huaweicloud-devkit'] = entry;
   mkdirSync(dirname(configPath), { recursive: true });
   writeFileSync(configPath, JSON.stringify(config, null, 2));
   console.log(`  MCP config updated: ${configPath}`);
@@ -1951,6 +1986,8 @@ function uninstallAtomCode() {
       config = JSON.parse(readFileSync(configPath, 'utf8'));
     } catch {}
     if (config.mcpServers?.['huaweicloud-devkit']) {
+      const delta = extractUserDelta(config.mcpServers['huaweicloud-devkit'], 'args');
+      if (delta) saveAgentDelta('atomcode', delta);
       delete config.mcpServers['huaweicloud-devkit'];
       if (Object.keys(config.mcpServers).length === 0) delete config.mcpServers;
       writeFileSync(configPath, JSON.stringify(config, null, 2));
@@ -2478,7 +2515,6 @@ function ensureHermesMcpConfig() {
   if (hcloudBin) {
     blockLines.push(`      HCLOUD_BIN: "${hcloudBin.replace(/\\/g, '/')}"`);
   }
-  const block = blockLines.join('\n');
 
   let existing = '';
   if (existsSync(configPath)) {
@@ -2486,10 +2522,15 @@ function ensureHermesMcpConfig() {
       existing = readFileSync(configPath, 'utf8');
     } catch {}
     if (existing.includes('mcp_servers:') && existing.includes('huaweicloud-devkit')) {
-      if (existing.includes(`args: ["${mcpPath}"]`)) {
+      // Preserve user's extra args (e.g. --hdkitservice-endpoint) when rewriting the block (issue #615).
+      const argsMatch = existing.match(/^\s*huaweicloud-devkit\s*:[\s\S]*?^\s*args:\s*\[[^\]]*\]\s*$/m);
+      const extrasMatch = argsMatch ? argsMatch[0].match(/args:\s*\[".*?"(.*)\]/) : null;
+      const extras = extrasMatch && extrasMatch[1].trim() ? extrasMatch[1].replace(/,\s*$/, '') : '';
+      if (existing.includes(`args: ["${mcpPath}"${extras}]`)) {
         console.log(`  MCP config unchanged: ${configPath}`);
         return false;
       }
+      if (extras) blockLines[3] = `    args: ["${mcpPath}"${extras}]`;
       removeHermesMcpConfigBlock();
       existing = '';
       if (existsSync(configPath)) {
@@ -2500,7 +2541,14 @@ function ensureHermesMcpConfig() {
     }
   }
   mkdirSync(dirname(configPath), { recursive: true });
-  const newContent = existing ? `${existing.trimEnd()}\n\n${block}\n` : `${block}\n`;
+  // Restore user args saved by a previous uninstall (issue #615).
+  const hermesDelta = takeAgentDelta('hermes');
+  if (hermesDelta && Array.isArray(hermesDelta.argsExtra) && hermesDelta.argsExtra.length > 0) {
+    const extras = hermesDelta.argsExtra.map((a) => `"${String(a)}"`).join(', ');
+    blockLines[3] = `    args: ["${mcpPath}", ${extras}]`;
+  }
+  const newBlock = blockLines.join('\n');
+  const newContent = existing ? `${existing.trimEnd()}\n\n${newBlock}\n` : `${newBlock}\n`;
   writeFileSync(configPath, newContent);
   console.log(`  MCP config updated: ${configPath}`);
   return true;
@@ -2917,7 +2965,25 @@ function uninstallHermes() {
     }
   }
 
-  // 3. Remove MCP config from config.yaml
+  // 3. Remove MCP config from config.yaml (back up user args first, issue #615)
+  const hermesConfig = hermesConfigFile();
+  if (existsSync(hermesConfig)) {
+    try {
+      const text = readFileSync(hermesConfig, 'utf8');
+      const argsLine = text.match(/^\s*args:\s*\[([^\]]*)\]\s*$/m);
+      if (argsLine) {
+        let parsed;
+        try {
+          parsed = JSON.parse(`[${argsLine[1].replace(/'/g, '"')}]`);
+        } catch {
+          parsed = null;
+        }
+        if (Array.isArray(parsed) && parsed.length > 1) {
+          saveAgentDelta('hermes', { argsExtra: parsed.slice(1) });
+        }
+      }
+    } catch {}
+  }
   removeHermesMcpConfigBlock();
   console.log('  MCP config removed');
 
@@ -3583,6 +3649,10 @@ async function cmdUninstall() {
     if (removeIfExists(vaultPath)) {
       console.log('  Removed credential vault');
     }
+    // Full uninstall also discards any saved MCP config backups (issue #615).
+    if (purgeBackup()) {
+      console.log('  Removed MCP config backup');
+    }
     const vaultDir = dirname(vaultPath);
     try {
       if (existsSync(vaultDir) && readdirSync(vaultDir).length === 0) {