huaweicloud-devkit 1.1.4-next.6 → 1.1.5

package/README.md

@@ -4,7 +4,7 @@
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE)
 [![CI](https://github.com/huaweicloud/huaweicloud-devkit/actions/workflows/ci.yml/badge.svg)](https://github.com/huaweicloud/huaweicloud-devkit/actions/workflows/ci.yml)
 [![npm version](https://img.shields.io/npm/v/huaweicloud-devkit)](https://www.npmjs.com/package/huaweicloud-devkit)
-[![Beta](https://img.shields.io/badge/beta-v1.1.4-orange)](https://github.com/huaweicloud/huaweicloud-devkit)
+[![Beta](https://img.shields.io/badge/beta-v1.1.5-orange)](https://github.com/huaweicloud/huaweicloud-devkit)
 
 **[中文](README.zh-CN.md) | English**
 

package/README.zh-CN.md

@@ -4,7 +4,7 @@
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE)
 [![CI](https://github.com/huaweicloud/huaweicloud-devkit/actions/workflows/ci.yml/badge.svg)](https://github.com/huaweicloud/huaweicloud-devkit/actions/workflows/ci.yml)
 [![npm version](https://img.shields.io/npm/v/huaweicloud-devkit)](https://www.npmjs.com/package/huaweicloud-devkit)
-[![Beta](https://img.shields.io/badge/beta-v1.1.4-orange)](https://github.com/huaweicloud/huaweicloud-devkit)
+[![Beta](https://img.shields.io/badge/beta-v1.1.5-orange)](https://github.com/huaweicloud/huaweicloud-devkit)
 
 **中文 | [English](README.md)**
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "huaweicloud-devkit",
   "mcpName": "io.github.huaweicloud/huaweicloud-devkit",
-  "version": "1.1.4-next.6",
+  "version": "1.1.5",
   "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.6",
+  "version": "1.1.5",
   "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.6",
+  "version": "1.1.5",
   "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.6",
+  "version": "1.1.5",
   "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.6",
+  "version": "1.1.5",
   "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.6",
+  "version": "1.1.5",
   "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.6",
+  "version": "1.1.5",
   "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/skills/huawei-sandbox/SKILL.md

@@ -8,6 +8,24 @@ version: 1
 
 **STOP - Do not answer from general knowledge.** Follow the procedure below.
 
+## Target-Selection Gate (MANDATORY — do not skip)
+
+When the developer asks to **deploy / host / publish / 上线 / 部署 / 发布 / 搭建** a website, web app, or static site WITHOUT naming a specific target, you MUST present the target options and obtain an explicit choice BEFORE calling any sandbox lifecycle tool (`huaweicloud_sandbox_check_user`, `huaweicloud_sandbox_connect`, `huaweicloud_sandbox_upload_project`, `huaweicloud_sandbox_deploy_nginx`, etc.).
+
+Use the `question` tool and present, in this exact order:
+
+1. **沙箱 (Sandbox)** — temporary runtime, instant preview URL (recommended for quick preview)
+2. **OBS 静态托管** — long-term static hosting + CDN + custom domain
+3. **ECS** — server-based hosting
+4. **CCE** — container-based hosting
+
+Hard rules:
+
+- **NEVER infer or default the target** when it is unstated. Calling `huaweicloud_sandbox_connect` before this choice is made is a violation.
+- Only skip the question when: (a) the developer already named a target (e.g. "部署到 ECS", "用 OBS"), or (b) the developer explicitly asked for a temporary / sandbox / preview runtime.
+- "部署到华为云" / "deploy to Huawei Cloud" / "上线" alone is NOT a named target — still run the gate.
+- After the choice: sandbox → continue with this skill; OBS → `huawei-obs`; ECS → `huawei-ecs` / `huawei-iac`; CCE → `huawei-cce`.
+
 ## Overview
 
 Domain expertise for Huawei Cloud Sandbox (DevStation) instances and workspace terminal execution. Covers sandbox lifecycle via hdkitservice API and remote terminal command execution via hwlink protocol.
@@ -15,7 +33,7 @@ Domain expertise for Huawei Cloud Sandbox (DevStation) instances and workspace t
 ## Activation
 
 - **Proactive offering**: when the developer's task needs a temporary runtime (e.g. "deploy this web app", "run this app and preview it"), offer the sandbox proactively — the developer never has to say "use sandbox". Prompt: "This task can be satisfied by a sandbox — use it?"
-- **Static website hosting — present options, sandbox first**: when the developer asks to deploy/host/publish a static website or web app without naming a target, do NOT silently pick a service. Present the target options in this order: ① 沙箱 (recommended — temporary runtime, instant preview URL) ② OBS 静态托管 (long-term static hosting/CDN) ③ ECS ④ CCE, then follow the developer's choice. Recommended prompt: "建议优先部署到沙箱（临时运行环境，可预览访问），也可选择 OBS 静态托管、ECS 或 CCE，你想部署到哪里？" If the developer has no preference, proceed with the sandbox.
+- **Static website hosting — present options, sandbox first (MANDATORY)**: when the developer asks to deploy/host/publish a static website or web app without naming a target, do NOT silently pick a service and do NOT default to the sandbox. Run the [Target-Selection Gate](#target-selection-gate-mandatory--do-not-skip) via the `question` tool first. Present, in order: ① 沙箱 (recommended — temporary runtime, instant preview URL) ② OBS 静态托管 (long-term static hosting/CDN) ③ ECS ④ CCE. Recommended prompt: "建议优先部署到沙箱（临时运行环境，可预览访问），也可选择 OBS 静态托管、ECS 或 CCE，你想部署到哪里？" Only if the developer, after being asked, expresses no preference may you proceed with the sandbox.
 - **Detect web apps in deploy-a-repo prompts**: prompts like "部署 GitHub - <owner>/<repo>" or "deploy <github repo>" do not say "web app". Clone or inspect the repository first (package.json with dev/serve/build scripts, index.html, frontend framework dependencies such as vue/react/angular/vite, static sites, Dockerfile running a web server). If it is a web application, offer the sandbox first: "检测到该项目是 Web 应用，建议优先使用沙箱部署（临时运行环境，可预览访问），是否使用？"
 - **Clone into the sandbox workspace directory**: always put project code under `/workspace/<repo-name>` (create the directory if missing) — `/workspace` is the sandbox's dedicated workspace mount at the filesystem root, not `$HOME/workspace`. Never use `/tmp` or other ephemeral locations. This keeps the project with the sandbox session, is easy to reference for serving/exposing, and survives session-level restarts of the shell.
 - **Deployment must end with a public URL**: after deploying and exposing the app with DevBridge, always return the tunnel URL to the developer as the final result — a deployment without an accessible link is incomplete.
@@ -86,6 +104,8 @@ Domain expertise for Huawei Cloud Sandbox (DevStation) instances and workspace t
 
 ## Workflow
 
+**Step 0 — Target-Selection Gate (MANDATORY)**: before any sandbox lifecycle tool, confirm the target. If the developer asked to deploy/host/publish a site without naming a target, STOP and run the [Target-Selection Gate](#target-selection-gate-mandatory--do-not-skip) first; do NOT call `huaweicloud_sandbox_connect` until it is resolved. Proceed with this workflow only if the target is already confirmed as sandbox (or a temporary runtime).
+
 Setup is a **plugin-side preflight** — the developer should be asked a question only once, when the agreement actually needs signing:
 
 1. **Check user** (transparent): `huaweicloud_sandbox_check_user` — returns `realnameVerified`/`agreementSigned` (200) when all good, OR throws a 403 error with one of these codes:
@@ -836,6 +856,7 @@ Returns `complete: true/false`, `score`, and `nextStep` to fix missing items.
 
 | Trap                                 | Why                                                                                                                                                                                                                                     |
 | ------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Target not confirmed                 | "部署到华为云" without a named target is NOT a go signal. You MUST run the Target-Selection Gate and get an explicit choice before calling any sandbox lifecycle tool. Skipping it and defaulting to the sandbox is a violation.        |
 | Agreement required first             | `sandbox_connect` fails if the agreement isn't signed; the `sandbox_check_user` preflight detects this, so surface it to the developer only when signing is needed                                                                      |
 | Real-name required                   | `sandbox_connect` fails if `realnameVerified=false`; tell the developer once and stop, don't loop on connect                                                                                                                            |
 | Never expose tunnel details          | Do not mention "DevBridge"/"tunnel"/"devbridge" to the developer — say "正在生成访问地址..." and hand over only the URL                                                                                                                 |

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-protocol.mjs

@@ -92,5 +92,9 @@ export async function dispatch(method, params, opts = {}) {
     return { resources: [] };
   }
 
-  throw new Error(`Unsupported method: ${method}`);
+  // JSON-RPC 2.0: unknown methods must surface as -32601 (Method not found),
+  // not the generic -32603 internal error (#650 D9-2).
+  const methodError = new Error(`Method not found: ${method}`);
+  methodError.code = -32601;
+  throw methodError;
 }

package/plugins/huaweicloud-core/src/mcp-server-remote.mjs

@@ -60,7 +60,7 @@ export async function startRemoteServer({ port = DEFAULT_PORT, host = DEFAULT_HO
       response = {
         jsonrpc: '2.0',
         id: message.id,
-        error: { code: -32603, message: error.message },
+        error: { code: Number.isSafeInteger(error.code) ? error.code : -32603, message: error.message },
       };
     }
 

package/plugins/huaweicloud-core/src/mcp-server.mjs

@@ -166,7 +166,7 @@ function runStdioServer() {
         jsonrpc: '2.0',
         id: message.id,
         error: {
-          code: -32603,
+          code: Number.isSafeInteger(error.code) ? error.code : -32603,
           message: error.message,
         },
       });

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/safety-policy.mjs

@@ -66,11 +66,38 @@ export function redactSecrets(value, policy = DEFAULT_POLICY) {
 
 function stripExecutable(args) {
   if (!args.length) return [];
-  const first = String(args[0]).toLowerCase();
+  let current = args;
+  // Unwrap shell wrappers (bash -c / sh -c 'hcloud ...', sudo hcloud ...) so
+  // wrapped write commands keep their deny classification (#650 D4-16).
+  for (let depth = 0; depth < 5; depth++) {
+    const first = String(current[0]).toLowerCase();
+    const isShell = [
+      'bash',
+      'sh',
+      'zsh',
+      'dash',
+      'bash.exe',
+      'sh.exe',
+      '/bin/bash',
+      '/bin/sh',
+      '/bin/zsh',
+      '/bin/dash',
+    ].includes(first);
+    if (isShell && String(current[1]).toLowerCase() === '-c' && current[2]) {
+      current = splitSimpleCommand(current[2]);
+      continue;
+    }
+    if (first === 'sudo' && current.length > 1) {
+      current = current.slice(1);
+      continue;
+    }
+    break;
+  }
+  const first = String(current[0]).toLowerCase();
   if (first === 'hcloud' || first.endsWith('/hcloud') || first.endsWith('\\hcloud') || first === 'hcloud.exe') {
-    return args.slice(1);
+    return current.slice(1);
   }
-  return args;
+  return current;
 }
 
 function commandOperation(args) {
@@ -123,8 +150,44 @@ function applyRawCommandRiskRules(base, command, options = {}) {
   return mergeRiskDecision(base, risk);
 }
 
+// Find hcloud command segments split by shell operators (; && || |) so a write
+// command in the middle of a concatenated string keeps its deny classification
+// (#650 review edge 1).
+function findHcloudCommandSegments(text) {
+  return String(text)
+    .split(/(?:\|\||&&|;|\|)/)
+    .map((segment) => segment.trim())
+    .filter(Boolean)
+    .map((segment) => splitSimpleCommand(segment))
+    .filter((tokens) => {
+      const first = String(tokens[0] || '').toLowerCase();
+      return first === 'hcloud' || first.endsWith('/hcloud') || first.endsWith('\\hcloud') || first === 'hcloud.exe';
+    });
+}
+
 export function classifyHcloudArgs(args, options = {}) {
   const policy = options.policy || DEFAULT_POLICY;
+  // Second pass for shell-wrapped input (#650 D4-16 review edge 1): when the
+  // leading command is not hcloud but a concatenated segment contains one,
+  // classify every hcloud segment and merge to the most severe decision.
+  const unwrappedTokens = stripExecutable(Array.isArray(args) ? args.map(String) : []);
+  const unwrappedFirst = String(unwrappedTokens[0] || '').toLowerCase();
+  const unwrappedIsHcloud =
+    unwrappedFirst === 'hcloud' ||
+    unwrappedFirst.endsWith('/hcloud') ||
+    unwrappedFirst.endsWith('\\hcloud') ||
+    unwrappedFirst === 'hcloud.exe';
+  if (!unwrappedIsHcloud && !options._segmentDepth) {
+    const hcloudSegments = findHcloudCommandSegments(unwrappedTokens.join(' '));
+    if (hcloudSegments.length > 0) {
+      const results = hcloudSegments.map((segment) => classifyHcloudArgs(segment, { ...options, _segmentDepth: 1 }));
+      return (
+        results.find((result) => result.decision === 'deny') ||
+        results.find((result) => ['write', 'execution', 'secret', 'credential'].includes(result.risk)) ||
+        results[0]
+      );
+    }
+  }
   const { service, operation, args: normalizedArgs } = commandOperation(args);
   const joined = normalizedArgs.join(' ');
 
@@ -342,6 +405,26 @@ export function classifyTextCommand(command, options = {}) {
     };
   }
 
+  // Credential variable references bypass the env-command gate above: HW_ is
+  // the plugin's own documented credential prefix (HW_ACCESS_KEY/HW_SECRET_KEY/
+  // HW_SECURITY_TOKEN), and `echo $HW_SECRET_KEY` / `printenv HW_ACCESS_KEY`
+  // previously fell through to allow (#650 D4-2).
+  //
+  // The negative lookbehind exempts literal-NAME references — backslash-escaped
+  // (`\$HW_*`) or single-quoted (`'$HW_*'`, which the shell never expands) —
+  // while unescaped `$HW_*` is a potential expansion/dump regardless of the
+  // command. No command-name whitelist, so no false negative (#650 review).
+  if (
+    /(?<!['\\])\$\{?(?:HUAWEICLOUD|HWC|HW|OS)_(?:ACCESS_KEY|SECRET_KEY|SECURITY_TOKEN)/i.test(text) ||
+    /(?:^|\s)printenv\s+(?:HUAWEICLOUD|HWC|HW|OS)_(?:ACCESS_KEY|SECRET_KEY|SECURITY_TOKEN)/i.test(text)
+  ) {
+    return {
+      decision: 'deny',
+      risk: 'credential',
+      reason: 'Printing cloud credential environment variables is blocked.',
+    };
+  }
+
   if (/(^|\s)hcloud(\.exe)?\s+/i.test(text)) {
     return classifyHcloudArgs(splitSimpleCommand(text), { ...options, rawCommand: text });
   }

package/plugins/huaweicloud-core/src/tools.mjs

@@ -2015,8 +2015,15 @@ function explainError({ service = 'unknown', errorCode = '', message = '', reque
   }
   if (!suggestions.length) {
     suggestions.push(
-      'Collect service name, operation, region, project_id, request_id, and the full redacted error message.',
+      'No known error-code pattern matched. Re-run the failing command with --debug to capture ' +
+        'X-Request-Id from the response headers, then re-call explain_error with service, operation, ' +
+        'region, the full redacted message, and requestId.',
     );
+    if (errorCode) {
+      suggestions.push(
+        `Search the error code "${errorCode}" in the Huawei Cloud error center (support.huaweicloud.com) for the authoritative cause.`,
+      );
+    }
   }
 
   if (requestId) {