huaweicloud-devkit 1.1.7-next.1 → 1.1.7-next.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "huaweicloud-devkit",
   "mcpName": "io.github.huaweicloud/huaweicloud-devkit",
-  "version": "1.1.7-next.1",
+  "version": "1.1.7-next.2",
   "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",

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.7-next.1",
+  "version": "1.1.7-next.2",
   "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.7-next.1",
+  "version": "1.1.7-next.2",
   "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.7-next.1",
+  "version": "1.1.7-next.2",
   "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.7-next.1",
+  "version": "1.1.7-next.2",
   "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.7-next.1",
+  "version": "1.1.7-next.2",
   "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.7-next.1",
+  "version": "1.1.7-next.2",
   "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/src/auth/credentials.mjs

@@ -85,6 +85,95 @@ function present(v) {
   return typeof v === 'string' && v.length > 0 && !isPlaceholder(v);
 }
 
+// Pick the Huawei Cloud DevKit MCP server entry from a map using prefix matching.
+// CodeArts Work marketplace presets keyed entries like `huaweicloud-devkit_1`
+// (suffix per installed instance); match by prefix so `_1`/`_2`/`HuaweiCloud DevKit`
+// all resolve without hardcoding an instance number.
+// Deterministically choose the Huawei Cloud DevKit MCP server entry from a map.
+// Priority (stable, independent of object key order):
+//   1. exact `huaweicloud-devkit` (installer-managed key)
+//   2. `HuaweiCloud DevKit`
+//   3. prefixed instances `huaweicloud-devkit_N` sorted by ascending N
+export function pickDevkitMcpServer(mcpMap) {
+  if (!mcpMap || typeof mcpMap !== 'object') return null;
+  const keys = Object.keys(mcpMap);
+  const rank = (k) => {
+    if (k === 'huaweicloud-devkit') return -2;
+    if (k === 'HuaweiCloud DevKit') return -1;
+    const m = /^huaweicloud-devkit_(\d+)$/i.exec(k);
+    return m ? Number(m[1]) : Number.MAX_SAFE_INTEGER;
+  };
+  const candidates = keys
+    .filter((k) => /^huaweicloud-devkit(?:_|$)/i.test(k) || k === 'HuaweiCloud DevKit')
+    .sort((a, b) => rank(a) - rank(b));
+  for (const k of candidates) {
+    if (mcpMap[k]) return mcpMap[k];
+  }
+  return null;
+}
+
+// Derive the expiry (epoch ms) of a temporary STS credential set.
+// Priority: 1) HW_STS_EXPIRES_AT env (ISO8601 or epoch seconds); 2) decode the
+// security token (JWT payload or bare URL-safe base64 JSON) reading common
+// expiry fields (exp, timeout_at, expires_at, id_expires_at; issued_at+duration).
+// Returns null when unknown/unparseable. Never throws.
+export function parseStsExpiry({ securityToken, expiresAtEnv = process.env.HW_STS_EXPIRES_AT } = {}) {
+  if (expiresAtEnv) {
+    const v = String(expiresAtEnv).trim();
+    if (!v) return null;
+    const asNum = Number(v);
+    if (Number.isFinite(asNum) && asNum > 0) return asNum > 1e12 ? asNum : asNum * 1000;
+    const t = Date.parse(v);
+    if (Number.isFinite(t)) return t;
+    return null;
+  }
+  if (!securityToken || typeof securityToken !== 'string') return null;
+  const token = String(securityToken).trim();
+  if (!token) return null;
+
+  const payload = (() => {
+    try {
+      if (token.includes('.')) {
+        const parts = token.split('.');
+        const b64 = parts.length >= 2 ? parts[1] : null;
+        if (!b64) return null;
+        const pad = b64 + '='.repeat((4 - (b64.length % 4)) % 4);
+        return JSON.parse(Buffer.from(pad.replace(/-/g, '+').replace(/_/g, '/'), 'base64').toString('utf8'));
+      }
+      const pad = token + '='.repeat((4 - (token.length % 4)) % 4);
+      return JSON.parse(Buffer.from(pad.replace(/-/g, '+').replace(/_/g, '/'), 'base64').toString('utf8'));
+    } catch {
+      return null;
+    }
+  })();
+  if (!payload || typeof payload !== 'object') return null;
+
+  const exp = Number(payload.exp ?? payload.expires_at ?? payload.timeout_at ?? Number.NaN);
+  if (Number.isFinite(exp) && exp > 0) return exp * 1000;
+  const issued = Number(payload.issued_at ?? payload.iat ?? Number.NaN);
+  const duration = Number(payload.duration ?? payload.expires_in ?? payload.lifetime ?? Number.NaN);
+  if (Number.isFinite(issued) && issued > 0 && Number.isFinite(duration) && duration > 0) {
+    return (issued + duration) * 1000;
+  }
+  return null;
+}
+
+function readWorkEnvironmentEntry(config) {
+  const server = pickDevkitMcpServer(config?.mcp);
+  if (!server?.environment) return null;
+  const ak = server.environment.HW_ACCESS_KEY;
+  const sk = server.environment.HW_SECRET_KEY;
+  if (present(ak) && present(sk)) {
+    return {
+      ak,
+      sk,
+      securityToken: present(server.environment.HW_SECURITY_TOKEN) ? server.environment.HW_SECURITY_TOKEN : '',
+      region: server.environment.HW_REGION || server.environment.HUAWEICLOUD_REGION || '',
+    };
+  }
+  return null;
+}
+
 export function writeGlobalCredentials(credentials = {}) {
   const path = globalCredentialsPath();
   mkdirSync(dirname(path), { recursive: true });
@@ -136,6 +225,7 @@ export function resolveCredentials(options = {}) {
   if (codeartsCreds) {
     if (!ak && codeartsCreds.ak) ak = codeartsCreds.ak;
     if (!sk && codeartsCreds.sk) sk = codeartsCreds.sk;
+    if (!securityToken && codeartsCreds.securityToken) securityToken = codeartsCreds.securityToken;
     if (!region && codeartsCreds.region) region = codeartsCreds.region;
   }
 
@@ -234,7 +324,8 @@ function isCodeArtsContext() {
   return (
     existsSync(join(process.cwd(), '.codeartsdoer')) ||
     existsSync(join(homedir(), '.codeartsdoer')) ||
-    existsSync(join(homedir(), '.codeartswork'))
+    existsSync(join(homedir(), '.codeartswork')) ||
+    existsSync(join(homedir(), '.codearts'))
   );
 }
 
@@ -248,7 +339,7 @@ export function readCodeArtsCredentials() {
     try {
       if (!existsSync(path)) continue;
       const config = JSON.parse(readFileSync(path, 'utf8'));
-      const server = config?.mcpServers?.['huaweicloud-devkit'] || config?.mcpServers?.['HuaweiCloud DevKit'];
+      const server = pickDevkitMcpServer(config?.mcpServers);
       if (!server?.env) continue;
 
       const ak = server.env.HW_ACCESS_KEY;
@@ -266,26 +357,20 @@ export function readCodeArtsCredentials() {
     }
   }
 
-  // CodeArts Work — user-level only
-  {
-    const path = join(homedir(), '.codeartswork', 'mcp', 'mcp_settings.json');
+  // CodeArts Work — user-level only.
+  // New layout (post platform migration): ~/.codearts/mcp/mcp_settings.json with
+  // prefixed keys like `huaweicloud-devkit_1`; legacy ~/.codeartswork kept as
+  // fallback while still in service.
+  const workPaths = [
+    join(homedir(), '.codearts', 'mcp', 'mcp_settings.json'),
+    join(homedir(), '.codeartswork', 'mcp', 'mcp_settings.json'),
+  ];
+  for (const path of workPaths) {
     try {
-      if (existsSync(path)) {
-        const config = JSON.parse(readFileSync(path, 'utf8'));
-        const server = config?.mcp?.['huaweicloud-devkit'] || config?.mcp?.['HuaweiCloud DevKit'];
-        if (server?.environment) {
-          const ak = server.environment.HW_ACCESS_KEY;
-          const sk = server.environment.HW_SECRET_KEY;
-          if (present(ak) && present(sk)) {
-            return {
-              ak,
-              sk,
-              securityToken: present(server.environment.HW_SECURITY_TOKEN) ? server.environment.HW_SECURITY_TOKEN : '',
-              region: server.environment.HW_REGION || server.environment.HUAWEICLOUD_REGION || '',
-            };
-          }
-        }
-      }
+      if (!existsSync(path)) continue;
+      const config = JSON.parse(readFileSync(path, 'utf8'));
+      const entry = readWorkEnvironmentEntry(config);
+      if (entry) return entry;
     } catch {
       // mcp_settings.json missing or invalid — skip
     }

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

@@ -8,6 +8,7 @@ import {
   globalCredentialsPath,
   isPlaceholder,
   obsConfigPath,
+  readCodeArtsCredentials,
   readGlobalCredentials,
   writeLastSync,
   writeObsConfig,
@@ -47,6 +48,8 @@ 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 s4Creds = readCodeArtsCredentials();
+  const s4Has = Boolean(s4Creds?.ak && s4Creds?.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);
@@ -72,6 +75,14 @@ export function computeOnboarding({ credentials, reconciled } = {}) {
     message = 'Platform credentials are active; nothing to configure.';
     return { needsSetup: false, scenario, reason, message, steps: [], accountHint };
   }
+  if (s4Has && !s1Has && !envHasCreds) {
+    // CodeArts Work/IDE carries the user's temporary STS credentials in the MCP
+    // settings file only (not surfaced in the UI, not in S1/env).
+    scenario = 0;
+    reason = 'mcp-settings-injected';
+    message = '已从码道 MCP settings 读取到临时凭证,MCP 工具可直接使用。';
+    return { needsSetup: false, scenario, reason, message, steps: [], accountHint };
+  }
   if (s1Has && !envHasCreds) {
     scenario = 1;
     reason = 's1-only';
@@ -155,11 +166,14 @@ export function getAuthStatus(target = 'all') {
   const credentials = readGlobalCredentials();
   const reconciled = { ...exportStateForStatus(), runtimeActive: hasRuntimeCredentials() };
   const hcloud = probeHcloud();
+  const s4Creds = readCodeArtsCredentials();
   const onboarding = computeOnboarding({ credentials, reconciled });
   return {
     target,
     credentialsConfigured: Boolean(credentials?.ak && credentials?.sk),
     credentialsPath: globalCredentialsPath(),
+    mcpSettingsConfigured: Boolean(s4Creds?.ak && s4Creds?.sk),
+    mcpSettingsSource: s4Creds ? 'codearts' : null,
     obsConfigured: existsSync(obsConfigPath()),
     obsConfigPath: obsConfigPath(),
     kooCliInstalled: hcloud.installed,

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

@@ -7,6 +7,7 @@ import { dirname, join } from 'node:path';
 import { classifyHcloudArgs, redactSecrets, assertAllowed } from './safety-policy.mjs';
 import { getProxySettings } from './proxy/proxy-config.mjs';
 import { findHcloudBin, resolveHcloudCommand } from './hcloud-probe.mjs';
+import { parseStsExpiry, resolveCredentialsWithRuntime } from './auth/credentials.mjs';
 
 const DEFAULT_TIMEOUT_MS = 60_000;
 const DEFAULT_FORCE_KILL_AFTER_MS = 2_000;
@@ -237,6 +238,105 @@ export function classifyUnsupported(service, metaDir) {
   return 'unknown';
 }
 
+// Build command-line credential-injection args when the current credentials are
+// temporary STS (carry a non-empty security token). KooCLI/obsutil do not read the
+// platform-injected HW_* env (link B reads only S2/S3 config), so for a live STS
+// credential set that R3 forbids writing to disk, we pass it per-command instead.
+// Zero-persist: nothing touches S1/S2/S3 and every invocation re-reads the current
+// value (stale as soon as the token is).
+// Redact executed args for MCP-visible output. Besides the generic key=value
+// redaction (--cli-access-key=...), obsutil-style standalone credential flags
+// (-i AK / -k SK / -t TOKEN) carry the temporary STS as following array elements,
+// which redactSecrets can't match. We scrub those explicitly.
+export function redactArgsWithObs(rawArgs) {
+  const arr = Array.isArray(rawArgs) ? rawArgs.map(String) : [];
+  const out = [...arr];
+  for (let i = 0; i < out.length; i += 1) {
+    if (out[i] === '-i' || out[i] === '-k' || out[i] === '-t') {
+      if (i + 1 < out.length) out[i + 1] = '<redacted>';
+      i += 1;
+    } else if (/^-i[A-Za-z0-9]/.test(out[i])) {
+      out[i] = '-i<redacted>';
+    } else if (/^-k[A-Za-z0-9]/.test(out[i])) {
+      out[i] = '-k<redacted>';
+    } else if (/^-t[A-Za-z0-9]/.test(out[i])) {
+      out[i] = '-t<redacted>';
+    }
+  }
+  return redactSecrets(out);
+}
+
+export function resolveStsInjectArgs(rawArgs) {
+  const normalized = Array.isArray(rawArgs) ? rawArgs.map(String) : [];
+  if (normalized.length === 0) return [];
+  const flat = normalized.map(String);
+
+  // Explicit kill-switch (R2): CI/ops can disable argv-injection entirely so the
+  // temporary STS never appears in a process list.
+  const flag = process.env.HUAWEICLOUD_INJECT_STS_CMD;
+  if (flag === '0' || flag === 'false') return [];
+
+  // Never inject for help / metadata subcommands — the flags are meaningless there.
+  if (flat.some((a) => a === '--help' || a === '-h' || a === 'help')) return [];
+
+  // Wrapper invocation (bash -c / sudo / sh ...): our extra args would land in the
+  // wrapper's argv, not hcloud's — either ineffective or misleading. Skip them.
+  const WRAP = new Set([
+    'bash',
+    'sh',
+    'zsh',
+    'dash',
+    'bash.exe',
+    'sh.exe',
+    '/bin/bash',
+    '/bin/sh',
+    '/bin/zsh',
+    '/bin/dash',
+    'sudo',
+  ]);
+  const first = String(flat[0] || '').toLowerCase();
+  if (WRAP.has(first)) return [];
+
+  // KooCLI profile-management subcommands don't take --cli-security-token.
+  if (first === 'configure' || first === 'config') return [];
+
+  // If the caller already passed explicit credential flags, do not override them.
+  if (
+    flat.some(
+      (a) =>
+        a.startsWith('--cli-access-key=') || a.startsWith('--cli-secret-key=') || a.startsWith('--cli-security-token='),
+    )
+  ) {
+    return [];
+  }
+  // Explicit obsutil-style credentials already present — standalone (-i AK) or
+  // attached (-iAK) — should not be overridden by an extra injection.
+  if (flat.some((a) => a === '-i' || a === '-k' || a === '-t' || /^-[ikt][A-Za-z0-9]/.test(a))) return [];
+
+  let creds;
+  try {
+    creds = resolveCredentialsWithRuntime({ allowMissing: true });
+  } catch {
+    return [];
+  }
+  if (!creds || !creds.ak || !creds.sk || !creds.securityToken) return [];
+
+  // R3: if we can derive an expiry and the token is already at/within 60s of
+  // expiring, skip injection — using a dead token would make a doomed IAM round
+  // trip. If expiry is unknown/unparseable we keep the existing "inject anyway"
+  // behavior (can't prove it's stale).
+  const expiry = parseStsExpiry({ securityToken: creds.securityToken });
+  if (expiry !== null) {
+    const grace = 60 * 1000;
+    if (expiry <= Date.now() + grace) return [];
+  }
+
+  const isObs = flat[0].toUpperCase() === 'OBS';
+  return isObs
+    ? ['-i', creds.ak, '-k', creds.sk, '-t', creds.securityToken]
+    : ['--cli-access-key=' + creds.ak, '--cli-secret-key=' + creds.sk, '--cli-security-token=' + creds.securityToken];
+}
+
 export function planHcloudCommand(args, options = {}) {
   const normalizedArgs = Array.isArray(args) ? args.map(String) : [];
   const classification = classifyHcloudArgs(normalizedArgs, options);
@@ -299,6 +399,16 @@ export async function runHcloud(args, options = {}) {
   };
   assertAllowed(plan.classification);
 
+  // Link B: when the runtime/environment carries live temporary STS credentials
+  // (security token set), KooCLI/obsutil would not see them (they read S2/S3 only
+  // and R3 forbids writing them to disk). Inject per-command so hcloud actually
+  // authenticates with the platform-provided STS. Injection args are appended to
+  // the EXECUTED args only; classification/approval used the original args.
+  const stsInject = resolveStsInjectArgs(normalizedArgs);
+  if (stsInject.length > 0) {
+    plan.rawArgs = [...plan.rawArgs, ...stsInject];
+  }
+
   const metaDir = options.metaDir;
 
   // KooCLI only switches language globally (`hcloud configure set --cli-lang=cn`); there is no
@@ -411,6 +521,13 @@ function runHcloudOnce(plan, options) {
           result.stdout = String(result.stdout).slice(0, 2000) + `\n...(truncated, full output saved to ${outputFile})`;
         }
       }
+      // Never surface raw args (may include the injected temporary STS) to MCP
+      // clients / agent conversation — redact before resolve. The live `plan`
+      // object itself is left untouched so retries keep executing the real args.
+      if (result.plan && Array.isArray(result.plan.rawArgs)) {
+        const redactedPlan = { ...result.plan, rawArgs: redactArgsWithObs(result.plan.rawArgs) };
+        result.plan = redactedPlan;
+      }
       resolve(result);
     }
 
@@ -509,7 +626,7 @@ function quoteShellArg(value) {
 function planningWarnings(args) {
   const joined = args.join(' ');
   const warnings = [];
-  if (/adminPass|password|passwd|secret|token/i.test(joined)) {
+  if (/admin[_-]?pass|password|passwd|secret|token/i.test(joined)) {
     warnings.push(
       'This command appears to contain a password or secret field. Do not leave plaintext secrets in shell history; prefer local-only input or a runtime injection pattern.',
     );

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

@@ -130,3 +130,26 @@ export function applyUserDelta(entry, delta, style) {
   if (delta.enabled === false) merged.enabled = false;
   return merged;
 }
+
+// Collect user-owned environment variables from peer DevKit server entries in the
+// same MCP map (e.g. market-preset keys like `huaweicloud-devkit_1` that carry the
+// user's temporary STS credentials HW_ACCESS_KEY / HW_SECRET_KEY / HW_SECURITY_TOKEN).
+// When the installer writes a NEW `huaweicloud-devkit` entry these must be inherited
+// so the freshly installed key also has the user's credentials (the CodeArts Work
+// UI never surfaces them; they live only in mcp_settings.json).
+export function inheritPeerUserEnv(mcpMap) {
+  if (!isPlainObject(mcpMap)) return null;
+  const collected = {};
+  for (const [key, entry] of Object.entries(mcpMap)) {
+    if (key === 'huaweicloud-devkit') continue;
+    if (!/^huaweicloud-devkit(?:_|$)/i.test(key) && key !== 'HuaweiCloud DevKit') continue;
+    const env = isPlainObject(entry?.environment) ? entry.environment : isPlainObject(entry?.env) ? entry.env : null;
+    if (!env) continue;
+    for (const [k, v] of Object.entries(env)) {
+      if (REQUIRED_ENV_KEYS.has(k)) continue;
+      if (typeof v !== 'string' || v === '') continue;
+      if (!(k in collected)) collected[k] = v;
+    }
+  }
+  return Object.keys(collected).length > 0 ? collected : null;
+}

package/plugins/huaweicloud-core/src/risk-rule-engine.mjs

@@ -19,7 +19,7 @@ export function loadRiskRules(options = {}) {
 function redactEvidence(text) {
   return String(text)
     .replace(
-      /((?:access[_-]?key|secret[_-]?key|security[_-]?token|x[_-]?auth[_-]?token|authorization|password|passwd|adminPass|credential)\s*[:=]\s*)("[^"]*"|'[^']*'|[^\s,;]+)/gi,
+      /((?:access[_-]?key|secret[_-]?key|security[_-]?token|x[_-]?auth[_-]?token|token|authorization|password|passwd|admin[_-]?pass|credential)\s*[:=]\s*)("[^"]*"|'[^']*'|[^\s,;]+)/gi,
       '$1<redacted>',
     )
     .replace(/(AK|SK)\s*[:=]\s*("[^"]*"|'[^']*'|[^\s,;]+)/g, '$1=<redacted>');

package/plugins/huaweicloud-core/src/safety-policy.mjs

@@ -39,7 +39,7 @@ function redactString(text) {
       // Redact the ENTIRE value of this arg — not just the first whitespace token.
       .replace(/((?:user[_-]?data|metadata|private[_-]?key)\s*[:=]\s*).*/gi, '$1<redacted>')
       .replace(
-        /((?:access[_-]?key|secret[_-]?key|security[_-]?token|x[_-]?auth[_-]?token|authorization|password|passwd|adminPass|credential)\s*[:=]\s*)("[^"]*"|'[^']*'|[^\s,;]+)/gi,
+        /((?:access[_-]?key|secret[_-]?key|security[_-]?token|x[_-]?auth[_-]?token|token|authorization|password|passwd|admin[_-]?pass|credential)\s*[:=]\s*)("[^"]*"|'[^']*'|[^\s,;]+)/gi,
         '$1<redacted>',
       )
       .replace(/(AK|SK)\s*[:=]\s*("[^"]*"|'[^']*'|[^\s,;]+)/g, '$1=<redacted>')

package/plugins/huaweicloud-core/src/sandbox/hdkitservice-api.mjs

@@ -65,6 +65,16 @@ async function hdkitRequest(method, path, body, timeoutMs = 300000) {
     err.code = code;
     err.status = resp.status;
     err.traceId = data.traceId;
+    if (code === 'HDKIT_CRED_INVALID') {
+      err.remediation = {
+        hint: '已保存的凭证(S1)可能已失效。请执行以下操作之一：',
+        steps: [
+          '运行 huaweicloud_auth_status 查看当前凭证状态（S1 指纹 vs 环境注入指纹）',
+          '若环境注入了有效凭证：运行 huaweicloud_auth_switch action=clear 清除 runtime 凭证，或删除 ~/.config/huaweicloud/credentials.json 让平台凭证接管',
+          '若需更新 S1：运行 npx huaweicloud-devkit auth init 重新配置有效 AK/SK',
+        ],
+      };
+    }
     throw err;
   }
 
@@ -119,6 +129,7 @@ export async function hdkitVoucherStatus(domainId) {
       claimed: false,
       message: error?.message || 'Incentive service unavailable, please try again later',
       code: error?.code,
+      ...(error?.remediation ? { remediation: error.remediation } : {}),
     };
   }
 }
@@ -132,6 +143,7 @@ export async function hdkitVoucherClaim(domainId) {
       claimed: false,
       message: error?.message || 'Incentive service unavailable, please try again later',
       code: error?.code,
+      ...(error?.remediation ? { remediation: error.remediation } : {}),
     };
   }
 }

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

@@ -1,4 +1,5 @@
 import {
+  chmodSync,
   copyFileSync,
   existsSync,
   mkdirSync,
@@ -36,7 +37,13 @@ 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 {
+  mergeCommandStyle,
+  mergeArgsStyle,
+  extractUserDelta,
+  applyUserDelta,
+  inheritPeerUserEnv,
+} from './mcp-config-merge.mjs';
 import { readAgentDelta, saveAgentDelta, takeAgentDelta, purgeBackup } from './mcp-config-backup.mjs';
 import { isUsableOfficeaceRoot, readOfficeaceRootMarker, writeOfficeaceRootMarker } from './officeace-paths.mjs';
 import { queryDistTagsFetch, determineTarget, semverCompare } from './update-check.mjs';
@@ -123,7 +130,12 @@ function codeartsWorkSkillsDir() {
   return join(homedir(), '.codeartswork', 'skills');
 }
 function codeartsWorkMcpSettingsFile() {
-  return join(homedir(), '.codeartswork', 'mcp', 'mcp_settings.json');
+  // Post platform migration the marketplace presets the plugin under ~/.codearts
+  // (new layout); legacy ~/.codeartswork is kept as fallback while still in
+  // service. Default to the new dir when it exists, otherwise legacy.
+  const newDir = join(homedir(), '.codearts', 'mcp');
+  const legacy = join(homedir(), '.codeartswork', 'mcp', 'mcp_settings.json');
+  return existsSync(newDir) ? join(newDir, 'mcp_settings.json') : legacy;
 }
 function codeartsWorkPluginsDir() {
   return join(homedir(), '.codeartswork', 'huaweicloud-plugins');
@@ -524,6 +536,22 @@ function copyFileVerified(src, dest) {
   );
 }
 
+// R5: write an MCP settings JSON file with least-privilege permissions
+// (parent dir 0700, file 0600) so the platform-injected temporary credentials
+// (HW_ACCESS_KEY/HW_SECRET_KEY/HW_SECURITY_TOKEN) are not world-readable.
+function writeMcpSettingsFile(configPath, config) {
+  mkdirSync(dirname(configPath), { recursive: true, mode: 0o700 });
+  writeFileSync(configPath, JSON.stringify(config, null, 2), { encoding: 'utf8', mode: 0o600 });
+  try {
+    chmodSync(configPath, 0o600);
+    // Re-assert the parent dir mode too — later un-mode'd mkdirSync calls can
+    // produce a broader default (e.g. 0775) on existing trees.
+    chmodSync(dirname(configPath), 0o700);
+  } catch {
+    // best-effort; unsupported on some platforms
+  }
+}
+
 function copyDir(src, dest) {
   if (!existsSync(src)) return;
   mkdirSync(dest, { recursive: true });
@@ -625,7 +653,7 @@ function updateOpenCodeConfig(pluginDir) {
     }
     if (existing && changed) {
       config.mcp['huaweicloud-devkit'] = entry;
-      writeFileSync(configPath, JSON.stringify(config, null, 2));
+      writeMcpSettingsFile(configPath, config);
       console.log(`  OpenCode MCP config merged (user fields preserved): ${configPath}`);
       return;
     }
@@ -635,7 +663,7 @@ function updateOpenCodeConfig(pluginDir) {
   // 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));
+  writeMcpSettingsFile(configPath, config);
   console.log(`  OpenCode config updated: ${configPath}`);
 }
 
@@ -666,7 +694,7 @@ function writeMcpServersFile(pluginDest, mcpPath, agentKey) {
     if (delta)
       next.mcpServers['huaweicloud-devkit'] = applyUserDelta(next.mcpServers['huaweicloud-devkit'], delta, 'args');
   }
-  writeFileSync(configPath, JSON.stringify(next, null, 2));
+  writeMcpSettingsFile(configPath, next);
   console.log(`  MCP Config -> ${configPath}`);
 }
 
@@ -695,7 +723,7 @@ function removeOpenCodeConfig() {
   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));
+  writeMcpSettingsFile(configPath, config);
   console.log(`  OpenCode MCP config cleaned: ${configPath}`);
 }
 
@@ -1267,7 +1295,7 @@ function registerCodeartsMcp(configPath, agentKey = 'codearts') {
       }
       config.mcpServers['huaweicloud-devkit'] = entry;
       mkdirSync(dirname(configPath), { recursive: true });
-      writeFileSync(configPath, JSON.stringify(config, null, 2));
+      writeMcpSettingsFile(configPath, config);
       console.log(`  MCP config merged (user fields preserved): ${configPath}`);
       return;
     }
@@ -1280,7 +1308,7 @@ function registerCodeartsMcp(configPath, agentKey = 'codearts') {
   if (delta) entry = applyUserDelta(entry, delta, 'args');
   config.mcpServers['huaweicloud-devkit'] = entry;
   mkdirSync(dirname(configPath), { recursive: true });
-  writeFileSync(configPath, JSON.stringify(config, null, 2));
+  writeMcpSettingsFile(configPath, config);
   console.log(`  MCP config updated: ${configPath}`);
 }
 
@@ -1375,7 +1403,7 @@ function uninstallCodeArts() {
       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));
+      writeMcpSettingsFile(configPath, config);
       console.log(`  Config cleaned: ${configPath}`);
     }
   }
@@ -1446,7 +1474,7 @@ function registerCodeartsWorkMcp() {
       }
       config.mcp['huaweicloud-devkit'] = merged;
       mkdirSync(dirname(configPath), { recursive: true });
-      writeFileSync(configPath, JSON.stringify(config, null, 2));
+      writeMcpSettingsFile(configPath, config);
       console.log(`  MCP config merged (user fields preserved): ${configPath}`);
       return;
     }
@@ -1454,12 +1482,16 @@ function registerCodeartsWorkMcp() {
   config.mcp = config.mcp || {};
   let entry = mergeCommandStyle(undefined, { mcpPath }).entry;
   entry.environment = { ...environment };
+  // Inherit user-owned env (e.g. market-preset `huaweicloud-devkit_1` carrying the
+  // user's temporary STS credentials) so a freshly installed key also has them.
+  const peerEnv = inheritPeerUserEnv(config.mcp);
+  if (peerEnv) entry.environment = { ...peerEnv, ...entry.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));
+  writeMcpSettingsFile(configPath, config);
   console.log(`  MCP config updated: ${configPath}`);
 }
 
@@ -1530,7 +1562,7 @@ function uninstallCodeArtsWork() {
       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));
+      writeMcpSettingsFile(configPath, config);
       console.log(`  Config cleaned: ${configPath}`);
     }
   }
@@ -1591,7 +1623,7 @@ function ensureWorkbuddyMcpConfig() {
       }
       config.mcpServers['huaweicloud-devkit'] = entry;
       mkdirSync(dirname(configPath), { recursive: true });
-      writeFileSync(configPath, JSON.stringify(config, null, 2));
+      writeMcpSettingsFile(configPath, config);
       console.log(`  MCP config merged (user fields preserved): ${configPath}`);
       return true;
     }
@@ -1603,7 +1635,7 @@ function ensureWorkbuddyMcpConfig() {
   if (delta) entry = applyUserDelta(entry, delta, 'args');
   config.mcpServers['huaweicloud-devkit'] = entry;
   mkdirSync(dirname(configPath), { recursive: true });
-  writeFileSync(configPath, JSON.stringify(config, null, 2));
+  writeMcpSettingsFile(configPath, config);
   console.log(`  MCP config updated: ${configPath}`);
   return true;
 }
@@ -1817,7 +1849,7 @@ function uninstallWorkBuddy() {
       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));
+      writeMcpSettingsFile(configPath, config);
       console.log(`  MCP config cleaned: ${configPath}`);
     }
   }
@@ -1923,7 +1955,7 @@ function ensureAtomcodeMcpConfig() {
       }
       config.mcpServers['huaweicloud-devkit'] = entry;
       mkdirSync(dirname(configPath), { recursive: true });
-      writeFileSync(configPath, JSON.stringify(config, null, 2));
+      writeMcpSettingsFile(configPath, config);
       console.log(`  MCP config merged (user fields preserved): ${configPath}`);
       return true;
     }
@@ -1935,7 +1967,7 @@ function ensureAtomcodeMcpConfig() {
   if (delta) entry = applyUserDelta(entry, delta, 'args');
   config.mcpServers['huaweicloud-devkit'] = entry;
   mkdirSync(dirname(configPath), { recursive: true });
-  writeFileSync(configPath, JSON.stringify(config, null, 2));
+  writeMcpSettingsFile(configPath, config);
   console.log(`  MCP config updated: ${configPath}`);
   return true;
 }
@@ -2009,7 +2041,7 @@ function uninstallAtomCode() {
       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));
+      writeMcpSettingsFile(configPath, config);
       console.log(`  MCP config cleaned: ${configPath}`);
     }
   }