huaweicloud-devkit 1.1.0-next.6 → 1.1.0-next.8

package/README.md

@@ -8,7 +8,7 @@
 
 Help AI coding agents use Huawei Cloud safely and accurately — a single integration that gives agents cloud knowledge, CLI tooling, and safety guardrails.
 
-Supports OpenCode, CodeArts Agent, WorkBuddy, DeepSeek Harness (DSH), OfficeAce, OpenClaw, and AtomCode.
+Supports OpenCode, CodeArts Agent, WorkBuddy, DeepSeek Harness (DSH), OfficeAce, Hermes, OpenClaw, and AtomCode.
 
 ## Prerequisites
 
@@ -98,6 +98,25 @@ npx --yes huaweicloud-devkit update --target officeace
 npx --yes huaweicloud-devkit uninstall --target officeace
 ```
 
+### Hermes
+
+```bash
+npx --yes huaweicloud-devkit install --target hermes
+```
+
+**Restart the Hermes session** after installation.
+
+```bash
+npx --yes huaweicloud-devkit doctor --target hermes
+npx --yes huaweicloud-devkit status --target hermes
+npx --yes huaweicloud-devkit update --target hermes
+npx --yes huaweicloud-devkit uninstall --target hermes
+```
+
+> **Safety hooks**: The installer configures Hermes shell hooks (`config.yaml` → `hooks.pre_tool_call`) to intercept unsafe terminal commands such as credential file reads, environment variable dumps, and unapproved `hcloud` write operations. Hermes shows a consent prompt the first time; approve it or set `hooks_auto_accept: true` in `config.yaml` to auto-accept.
+> **MCP Python SDK**: The installer automatically installs the `mcp` Python package required by Hermes for MCP tool discovery. If you see `[FAIL] Hermes MCP Python SDK` in `doctor`, run `pip3 install mcp` manually.
+> **Windows**: Hermes on Windows stores data under `%LOCALAPPDATA%\hermes` instead of `~/.hermes`. The installer detects this automatically.
+
 ### OpenClaw
 
 ```bash

package/README.zh-CN.md

@@ -8,7 +8,7 @@
 
 帮助 AI 编码助手安全、准确地使用华为云——一站式集成云知识、CLI 工具和安全护栏。
 
-支持 OpenCode、码道（CodeArts Agent）、WorkBuddy、DeepSeek Harness（DSH）、OfficeAce、OpenClaw、AtomCode。
+支持 OpenCode、码道（CodeArts Agent）、WorkBuddy、DeepSeek Harness（DSH）、OfficeAce、Hermes、OpenClaw、AtomCode。
 
 ## 前置条件
 
@@ -98,6 +98,25 @@ npx --yes huaweicloud-devkit update --target officeace
 npx --yes huaweicloud-devkit uninstall --target officeace
 ```
 
+### Hermes
+
+```bash
+npx --yes huaweicloud-devkit install --target hermes
+```
+
+安装后**重启 Hermes 会话**。
+
+```bash
+npx --yes huaweicloud-devkit doctor --target hermes
+npx --yes huaweicloud-devkit status --target hermes
+npx --yes huaweicloud-devkit update --target hermes
+npx --yes huaweicloud-devkit uninstall --target hermes
+```
+
+> **安全钩子（Safety hooks）**：安装器会在 `config.yaml` 中写入 shell hooks 配置（`hooks.pre_tool_call`），拦截不安全的终端命令，如读取凭据文件、导出环境变量、未审批的 `hcloud` 写操作。Hermes 首次使用时会弹出同意提示，可批准或设置 `hooks_auto_accept: true` 自动批准。
+> **MCP Python SDK**：安装器会自动安装 Hermes 所需的 `mcp` Python 包。如果 doctor 显示 `[FAIL] Hermes MCP Python SDK`，手动执行 `pip3 install mcp`。
+> **Windows**：Hermes 在 Windows 上数据存储在 `%LOCALAPPDATA%\hermes` 而非 `~/.hermes`，安装器会自动检测适配。
+
 ### OpenClaw
 
 ```bash

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "huaweicloud-devkit",
-  "version": "1.1.0-next.6",
+  "version": "1.1.0-next.8",
   "description": "Agent toolkit that helps coding agents use Huawei Cloud Skills, KooCLI, APIs, SDKs, and future MCP capabilities safely and accurately.",
   "type": "module",
   "files": [

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.0-next.6",
+  "version": "1.1.0-next.8",
   "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.0-next.6",
+  "version": "1.1.0-next.8",
   "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.0-next.6",
+  "version": "1.1.0-next.8",
   "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.0-next.6",
+  "version": "1.1.0-next.8",
   "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.0-next.6",
+  "version": "1.1.0-next.8",
   "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/hooks/huaweicloud-safety.py

@@ -53,16 +53,23 @@ READ_OPERATION_RE = re.compile(r"\b(List|Show|Get|Describe|NovaList|NovaShow)\w*
 READ_OPERATION_RE = re.compile(r"\b(List|Show|Get|Describe|NovaList|NovaShow)\w*", re.I)
 
 
-def deny(reason):
-    json.dump(
-        {
-            "hookSpecificOutput": {
-                "hookEventName": "PreToolUse",
-                "permissionDecision": "deny",
-                "permissionDecisionReason": DENY_PREFIX + reason,
+def deny(reason, hermes=False):
+    sys.stdout.write(
+        json.dumps(
+            {
+                "action": "block",
+                "message": DENY_PREFIX + reason,
             }
-        },
-        sys.stdout,
+            if hermes
+            else {
+                "hookSpecificOutput": {
+                    "hookEventName": "PreToolUse",
+                    "permissionDecision": "deny",
+                    "permissionDecisionReason": DENY_PREFIX + reason,
+                }
+            }
+        )
+        + "\n"
     )
     sys.exit(0)
 
@@ -139,18 +146,19 @@ def main():
 
     tool_name = data.get("tool_name", "")
     text = command_text(data.get("tool_input", {}))
+    hermes = "hook_event_name" in data
 
     if CONFIG_FILE_RE and CONFIG_FILE_RE.search(text):
-        deny("reading Huawei Cloud credential/profile files can expose AK/SK or tokens. Use redacted toolkit tools.")
+        deny("reading Huawei Cloud credential/profile files can expose AK/SK or tokens. Use redacted toolkit tools.", hermes)
     if ENV_DUMP_RE.search(text):
-        deny("dumping cloud credential environment variables is not allowed.")
+        deny("dumping cloud credential environment variables is not allowed.", hermes)
     if SECRET_READ_RE and SECRET_READ_RE.search(text):
-        deny("direct secret value retrieval would put plaintext secrets into the agent context.")
+        deny("direct secret value retrieval would put plaintext secrets into the agent context.", hermes)
     denied_rule = first_denied_command_rule(text)
     if denied_rule:
-        deny(f"{denied_rule.get('message')} Remediation: {denied_rule.get('remediation')}")
-    if tool_name == "Bash" and HCLOUD_RE.search(text) and WRITE_OPERATION_RE.search(text) and not READ_OPERATION_RE.search(text):
-        deny("unapproved Huawei Cloud write operations must be planned first and explicitly approved by the user.")
+        deny(f"{denied_rule.get('message')} Remediation: {denied_rule.get('remediation')}", hermes)
+    if tool_name in ("Bash", "terminal") and HCLOUD_RE.search(text) and WRITE_OPERATION_RE.search(text) and not READ_OPERATION_RE.search(text):
+        deny("unapproved Huawei Cloud write operations must be planned first and explicitly approved by the user.", hermes)
 
     allow()
 

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

@@ -2,7 +2,7 @@
   "name": "huaweicloud-devkit",
   "id": "huaweicloud-devkit",
   "displayName": "HuaweiCloud DevKit",
-  "version": "1.1.0-next.6",
+  "version": "1.1.0-next.8",
   "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/skills/huawei-sandbox/SKILL.md

@@ -72,6 +72,8 @@ Domain expertise for Huawei Cloud Sandbox (DevStation) instances and workspace t
 { "timeout_ms": 300000 }
 ```
 
+**Session recovery**: if `exec_with_session` returns `session is not ready`, the WebSocket connection has dropped. Do NOT retry the same session — fall back to `exec_one_shot` for that command instead. To recover state (cd, env vars), reconstruct them explicitly in the one-shot command.
+
 ## Workflow
 
 Setup is a **plugin-side preflight** — the developer should be asked a question only once, when the agreement actually needs signing:
@@ -84,10 +86,21 @@ Setup is a **plugin-side preflight** — the developer should be asked a questio
 3. **Sign agreement only** (`HDKIT_NOT_AGREEMENT`): **STOP and do NOT sign on your own.** Ask the developer: "Huawei Cloud sandbox requires signing the latest developer service agreement. May I sign it for you?" Then **wait for the developer to explicitly agree** (e.g. "签署" / "确认" / "sign it"). Only after explicit consent call `huaweicloud_sandbox_sign_agreement` and return its result (`signed`/`signedCount`) to the developer. **Never sign a legal agreement on the developer's behalf without their explicit, unambiguous consent.** Do not expose the underlying sandbox/DevBridge service as a separate entity the developer must understand or sign up for
 4. **Both missing** (`HDKIT_NOT_REALNAME_AND_AGREEMENT`): present **both** requirements together in one message — the real-name verification steps (console, step 2) **and** the agreement-signing request (step 3, wait for explicit consent) — so the developer can complete both at once
 5. **Connect**: `huaweicloud_sandbox_connect` — returns `session_id`, `dev_stage_id`, `connection_id`, `connection_address`
-6. **Inject credentials** (optional): `huaweicloud_sandbox_credentials` — enables cloud API access from sandbox
-7. **Execute commands**: use `huaweicloud_sandbox_exec_with_session` for interactive work (cd, env setup), or `huaweicloud_sandbox_exec_one_shot` for long-running builds/installs. See [Tool Selection Guide](#tool-selection-guide).
-8. **Upload project** (if deploying local code): `huaweicloud_sandbox_upload_project` to transfer a local project directory into `/workspace/<name>` — uses HTTP tunnel, much faster than base64 for multi-file projects. Use `huaweicloud_sandbox_upload_file` for single files.
-9. **Expose the deployed app and return the public URL**: set up a public access link for the app port and give the URL to the developer as the final result (see "Expose the deployed app (public URL)") — this step uses an internal tunnel mechanism that must never be mentioned to the developer
+6. **Cleanup previous deployments** (after first connect to a sandbox): nginx configs and DevBridge tunnels from previous deployments can cause port conflicts and quota errors. Run cleanup immediately after connect:
+
+   ```bash
+   # Remove stale nginx configs from previous deployments
+   sudo rm -f /etc/nginx/conf.d/app.conf /etc/nginx/conf.d/*.conf.bak 2>/dev/null
+   # Remove stale DevBridge tunnels
+   devbridge delete-all 2>/dev/null || true
+   # Reload nginx to apply
+   sudo nginx -s reload 2>/dev/null || true
+   ```
+
+7. **Inject credentials** (optional): `huaweicloud_sandbox_credentials` — enables cloud API access from sandbox
+8. **Execute commands**: use `huaweicloud_sandbox_exec_with_session` for interactive work (cd, env setup), or `huaweicloud_sandbox_exec_one_shot` for long-running builds/installs. See [Tool Selection Guide](#tool-selection-guide).
+9. **Upload project** (if deploying local code): `huaweicloud_sandbox_upload_project` to transfer a local project directory into `/workspace/<name>` — uses HTTP tunnel, much faster than base64 for multi-file projects. Use `huaweicloud_sandbox_upload_file` for single files.
+10. **Expose the deployed app and return the public URL**: set up a public access link for the app port and give the URL to the developer as the final result (see "Expose the deployed app (public URL)") — this step uses an internal tunnel mechanism that must never be mentioned to the developer
 
 ## File Transfer (local → sandbox)
 
@@ -103,7 +116,7 @@ Setup is a **plugin-side preflight** — the developer should be asked a questio
   "remote_dir": "/workspace",
   "extract": true,
   "exclude": [
-    "node_modules",
+    "**/node_modules",
     ".git",
     "__pycache__",
     ".next",
@@ -240,7 +253,7 @@ Follow the standard [Workflow](#workflow) steps 1-6 to connect to the sandbox, t
   "local_dir": "<projectPath>",
   "remote_dir": "/workspace",
   "exclude": [
-    "node_modules",
+    "**/node_modules",
     ".git",
     "__pycache__",
     ".next",
@@ -258,20 +271,20 @@ Follow the standard [Workflow](#workflow) steps 1-6 to connect to the sandbox, t
 
 **Always exclude build artifacts and dependency directories** — they will be re-installed/built inside the sandbox:
 
-| Pattern        | Why excluded                                   |
-| -------------- | ---------------------------------------------- |
-| `node_modules` | Dependencies — reinstall in sandbox            |
-| `.git`         | Version control — not needed for deployment    |
-| `__pycache__`  | Python bytecode cache                          |
-| `.next`        | Next.js build output — rebuild in sandbox      |
-| `.nuxt`        | Nuxt build cache — rebuild in sandbox          |
-| `.output`      | Nuxt production output — rebuild in sandbox    |
-| `.turbo`       | Turborepo cache — re-run in sandbox            |
-| `.cache`       | Generic tool cache (Parcel, Storybook, etc.)   |
-| `.swc`         | Taro/Webpack SWC cache — regenerate in sandbox |
-| `dist`         | Build output — rebuild in sandbox              |
-| `coverage`     | Test coverage reports — not needed for deploy  |
-| `*.pyc`        | Python compiled files                          |
+| Pattern           | Why excluded                                   |
+| ----------------- | ---------------------------------------------- |
+| `**/node_modules` | Dependencies — reinstall in sandbox            |
+| `.git`            | Version control — not needed for deployment    |
+| `__pycache__`     | Python bytecode cache                          |
+| `.next`           | Next.js build output — rebuild in sandbox      |
+| `.nuxt`           | Nuxt build cache — rebuild in sandbox          |
+| `.output`         | Nuxt production output — rebuild in sandbox    |
+| `.turbo`          | Turborepo cache — re-run in sandbox            |
+| `.cache`          | Generic tool cache (Parcel, Storybook, etc.)   |
+| `.swc`            | Taro/Webpack SWC cache — regenerate in sandbox |
+| `dist`            | Build output — rebuild in sandbox              |
+| `coverage`        | Test coverage reports — not needed for deploy  |
+| `*.pyc`           | Python compiled files                          |
 
 **Post-upload permission fix**: after `upload_project` extracts the project, fix file permissions lost during transfer (native binaries from other platforms, .bin symlinks):
 
@@ -420,7 +433,14 @@ if timeout_error; then
   tail -30 /tmp/build.log 2>/dev/null
   echo "=== Checking output ==="
   if [ -d <outputDir> ] && [ "$(ls -A <outputDir> 2>/dev/null)" ]; then
-    echo "Build output detected despite timeout — continuing with deployment"
+    # Verify at least one key output file exists (not just empty dir from broken build)
+    if [ -f <outputDir>/index.html ] || [ -f <outputDir>/server.js ] || [ -f <outputDir>/app.js ]; then
+      echo "Build output detected despite timeout — continuing with deployment"
+    else
+      echo "ERROR: Output directory exists but missing expected files (index.html/server.js). Build may have failed silently."
+      echo "Full log: /tmp/build.log"
+      exit 1
+    fi
   else
     echo "ERROR: Build did not complete. Output directory empty or missing."
     echo "Full log: /tmp/build.log"

package/plugins/huaweicloud-core/src/sandbox/session-manager.mjs

@@ -1,7 +1,16 @@
 import { spawn, execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import { createConnection as netConnect } from 'node:net';
-import { existsSync, readFileSync, statSync, mkdirSync, rmSync, createReadStream, appendFileSync } from 'node:fs';
+import {
+  existsSync,
+  readFileSync,
+  statSync,
+  mkdirSync,
+  rmSync,
+  createReadStream,
+  appendFileSync,
+  unlinkSync,
+} from 'node:fs';
 import { createHash, randomBytes } from 'node:crypto';
 import { join, dirname, basename } from 'node:path';
 import { tmpdir } from 'node:os';
@@ -269,6 +278,17 @@ function uploadLog(message) {
   } catch {}
 }
 
+function rotateUploadLog(maxBytes = 100 * 1024) {
+  try {
+    if (existsSync(UPLOAD_LOG_PATH)) {
+      const stat = statSync(UPLOAD_LOG_PATH);
+      if (stat.size > maxBytes) {
+        unlinkSync(UPLOAD_LOG_PATH);
+      }
+    }
+  } catch {}
+}
+
 function generateUploadToken() {
   return randomBytes(16).toString('hex');
 }
@@ -279,14 +299,20 @@ async function createTarGz(localDir, exclude = []) {
   mkdirSync(archiveDir, { recursive: true });
   const archivePath = join(archiveDir, archiveName);
 
-  const args = [
-    ...exclude.flatMap((p) => ['--exclude', p]),
-    '-czf',
-    archivePath,
-    '-C',
-    dirname(localDir),
-    basename(localDir),
-  ];
+  const args = [];
+  for (const pattern of exclude) {
+    if (pattern.startsWith('**/')) {
+      const base = pattern.slice(3);
+      for (let depth = 0; depth <= 4; depth++) {
+        const prefix = depth === 0 ? '' : '*/'.repeat(depth);
+        args.push('--exclude', `${prefix}${base}`);
+      }
+    } else {
+      args.push('--exclude', pattern);
+    }
+  }
+  args.push('-czf', archivePath, '-C', dirname(localDir), basename(localDir));
+
   await execFileAsync('tar', args);
   return archivePath;
 }
@@ -557,6 +583,8 @@ export async function uploadProjectWithSession(
     throw new Error(`sandbox upload project: path is not a directory: ${localDir}`);
   }
 
+  rotateUploadLog();
+
   const projectName = basename(localDir);
   const targetParentDir = remoteDir || '/workspace';
   const archiveRemotePath = `${targetParentDir}/${projectName}.tar.gz`;
@@ -567,6 +595,15 @@ export async function uploadProjectWithSession(
 
   uploadLog(`uploadProject: ${localDir} -> ${archiveRemotePath} (archive=${archiveSize} bytes, md5=${expectedMd5})`);
 
+  const SIZE_50MB = 50 * 1024 * 1024;
+  if (archiveSize > SIZE_50MB) {
+    uploadLog(
+      `uploadProject: archive size ${(archiveSize / (1024 * 1024)).toFixed(1)}MB exceeds 50MB. ` +
+        `Dependencies or platform binaries may have been included. ` +
+        `Ensure exclude list contains "**/node_modules" to match all nesting levels.`,
+    );
+  }
+
   let result;
   let tunnelError;
   for (let attempt = 0; attempt < UPLOAD_MAX_RETRIES; attempt++) {
@@ -577,7 +614,8 @@ export async function uploadProjectWithSession(
       break;
     } catch (error) {
       tunnelError = error;
-      uploadLog(`uploadProject: attempt ${attempt + 1}/${UPLOAD_MAX_RETRIES} failed: ${error.message}`);
+      const errorType = error.code || error.name || 'unknown';
+      uploadLog(`uploadProject: attempt ${attempt + 1}/${UPLOAD_MAX_RETRIES} failed [${errorType}]: ${error.message}`);
       await new Promise((r) => setTimeout(r, 5000));
     }
   }

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

@@ -2035,28 +2035,135 @@ function removeHermesMcpConfigBlock() {
   console.log('  MCP config cleaned');
 }
 
+function ensureHermesHooksConfig() {
+  const configPath = hermesConfigFile();
+  const pluginDest = hermesPluginsDir();
+  const hookScript = join(pluginDest, 'hooks', 'huaweicloud-safety.py').replace(/\\/g, '/');
+
+  const blockLines = [
+    'hooks:',
+    '  pre_tool_call:',
+    '    - matcher: "terminal"',
+    `      command: "python3 ${hookScript}"`,
+    '      timeout: 5',
+  ];
+  const block = blockLines.join('\n');
+
+  let existing = '';
+  if (existsSync(configPath)) {
+    try {
+      existing = readFileSync(configPath, 'utf8');
+    } catch {}
+    if (existing.includes('hooks:') && existing.includes('huaweicloud-safety.py')) {
+      console.log(`  Hooks config unchanged: ${configPath}`);
+      return false;
+    }
+  }
+  mkdirSync(dirname(configPath), { recursive: true });
+  const newContent = existing ? `${existing.trimEnd()}\n\n${block}\n` : `${block}\n`;
+  writeFileSync(configPath, newContent);
+  console.log(`  Hooks config updated: ${configPath}`);
+  return true;
+}
+
+function removeHermesHooksConfigBlock() {
+  const configPath = hermesConfigFile();
+  if (!existsSync(configPath)) return;
+  const lines = readFileSync(configPath, 'utf8').split(/\r?\n/);
+  const out = [];
+  let skip = false;
+  for (const line of lines) {
+    if (/^\s*huaweicloud-safety\.py/.test(line.trim())) {
+      skip = true;
+      continue;
+    }
+    if (skip) {
+      if (line.trim() === '') continue;
+      if (/^\s{2,}/.test(line) && line.trim() !== '') continue;
+      skip = false;
+    }
+    if (line.trim() === 'hooks:') {
+      continue;
+    }
+    if (line.trim() === 'pre_tool_call:') {
+      continue;
+    }
+    if (/^\s*- matcher:\s*"terminal"/.test(line)) {
+      continue;
+    }
+    out.push(line);
+  }
+  const cleaned = out.join('\n').trimEnd();
+  writeFileSync(configPath, cleaned ? `${cleaned}\n` : '');
+  console.log('  Hooks config cleaned');
+}
+
+function ensureHermesMcpSdk() {
+  const pythonBin = process.platform === 'win32' ? 'python' : 'python3';
+  try {
+    const r = spawnSync(pythonBin, ['-c', 'import mcp; print("ok")'], { encoding: 'utf8', timeout: 5000 });
+    if (r.status === 0 && r.stdout.trim() === 'ok') {
+      console.log('  MCP Python SDK: \x1b[32mAlready installed\x1b[0m');
+      return true;
+    }
+  } catch {}
+  console.log('  Installing Hermes MCP Python SDK...');
+  try {
+    const pip = spawnSync(pythonBin, ['-m', 'pip', 'install', 'mcp', '--quiet'], { encoding: 'utf8', timeout: 60000 });
+    if (pip.status === 0) {
+      console.log('  MCP Python SDK: \x1b[32mInstalled\x1b[0m');
+      return true;
+    }
+    console.log(`  MCP Python SDK: \x1b[33mInstall failed\x1b[0m`);
+    console.log(`  \x1b[33m  Run manually: ${pythonBin} -m pip install mcp\x1b[0m`);
+  } catch (error) {
+    console.log(`  MCP Python SDK: \x1b[33m${error.message}\x1b[0m`);
+    console.log(`  \x1b[33m  Run manually: ${pythonBin} -m pip install mcp\x1b[0m`);
+  }
+  return false;
+}
+
+function hermesMcpSdkOk() {
+  const pythonBin = process.platform === 'win32' ? 'python' : 'python3';
+  try {
+    const r = spawnSync(pythonBin, ['-c', 'import mcp; print("ok")'], { encoding: 'utf8', timeout: 5000 });
+    return r.status === 0 && r.stdout.trim() === 'ok';
+  } catch {
+    return false;
+  }
+}
+
 async function installHermes() {
   const skillsSrc = join(PLUGIN_ROOT, 'skills');
   const srcDir = join(PLUGIN_ROOT, 'src');
   const safetyDir = join(PLUGIN_ROOT, 'safety');
+  const hooksDir = join(PLUGIN_ROOT, 'hooks');
   const pluginDest = hermesPluginsDir();
+  const skipMcp = process.argv.includes('--skip-mcp-server');
 
   copyDir(skillsSrc, hermesSkillsDir());
   console.log(`  Skills -> ${hermesSkillsDir()}`);
 
-  copyDir(srcDir, join(pluginDest, 'src'));
-  console.log(`  MCP Server -> ${join(pluginDest, 'src')}`);
+  if (!skipMcp) {
+    copyDir(srcDir, join(pluginDest, 'src'));
+    console.log(`  MCP Server -> ${join(pluginDest, 'src')}`);
+  }
   copyDir(safetyDir, join(pluginDest, 'safety'));
   console.log(`  Safety Policy -> ${join(pluginDest, 'safety')}`);
+  copyDir(hooksDir, join(pluginDest, 'hooks'));
+  console.log(`  Safety Hooks -> ${join(pluginDest, 'hooks')}`);
 
-  ensureHermesMcpConfig();
-  installRuntimeDeps(pluginDest);
+  if (!skipMcp) ensureHermesMcpConfig();
+  ensureHermesHooksConfig();
+  if (!skipMcp) installRuntimeDeps(pluginDest);
+  if (!skipMcp) ensureHermesMcpSdk();
 }
 
 async function updateHermes() {
   const skillsSrc = join(PLUGIN_ROOT, 'skills');
   const srcDir = join(PLUGIN_ROOT, 'src');
   const safetyDir = join(PLUGIN_ROOT, 'safety');
+  const hooksDir = join(PLUGIN_ROOT, 'hooks');
   const pluginDest = hermesPluginsDir();
 
   copyDir(skillsSrc, hermesSkillsDir());
@@ -2066,7 +2173,11 @@ async function updateHermes() {
   console.log(`  MCP Server updated -> ${join(pluginDest, 'src')}`);
   copyDir(safetyDir, join(pluginDest, 'safety'));
   console.log(`  Safety Policy updated -> ${join(pluginDest, 'safety')}`);
+  copyDir(hooksDir, join(pluginDest, 'hooks'));
+  console.log(`  Safety Hooks updated -> ${join(pluginDest, 'hooks')}`);
   ensureHermesMcpConfig();
+  ensureHermesHooksConfig();
+  ensureHermesMcpSdk();
   mkdirSync(pluginDest, { recursive: true });
   writeFileSync(join(pluginDest, '.installed'), new Date().toISOString());
   installRuntimeDeps(pluginDest);
@@ -2092,9 +2203,10 @@ function uninstallHermes() {
   }
 
   if (removeIfExists(hermesPluginsDir())) {
-    console.log('  Removed MCP server and safety policy');
+    console.log('  Removed MCP server, safety policy and hooks');
   }
   removeHermesMcpConfigBlock();
+  removeHermesHooksConfigBlock();
 }
 
 function hermesStatus() {
@@ -2106,6 +2218,10 @@ function hermesStatus() {
   console.log(
     `  Safety Policy: ${existsSync(join(pluginDir, 'safety', 'policy.json')) ? '\x1b[32mInstalled\x1b[0m' : '\x1b[31mNot installed\x1b[0m'}`,
   );
+  console.log(
+    `  Safety Hooks: ${existsSync(join(pluginDir, 'hooks', 'huaweicloud-safety.py')) ? '\x1b[32mInstalled\x1b[0m' : '\x1b[31mNot installed\x1b[0m'}`,
+  );
+  console.log(`  MCP Python SDK: ${hermesMcpSdkOk() ? '\x1b[32mReady\x1b[0m' : '\x1b[31mMissing\x1b[0m'}`);
   let skillCount = 0;
   if (existsSync(skillsDir)) {
     skillCount = readdirSync(skillsDir, { withFileTypes: true }).filter(
@@ -2119,13 +2235,17 @@ function hermesStatus() {
   if (existsSync(configPath)) {
     try {
       const config = readFileSync(configPath, 'utf8');
-      const configured = config.includes('mcp_servers:') && config.includes('huaweicloud-devkit');
-      console.log(`  MCP config: ${configured ? '\x1b[32mConfigured\x1b[0m' : '\x1b[31mNot configured\x1b[0m'}`);
+      const mcpConfigured = config.includes('mcp_servers:') && config.includes('huaweicloud-devkit');
+      const hooksConfigured = config.includes('hooks:') && config.includes('huaweicloud-safety.py');
+      console.log(`  MCP config: ${mcpConfigured ? '\x1b[32mConfigured\x1b[0m' : '\x1b[31mNot configured\x1b[0m'}`);
+      console.log(`  Hooks config: ${hooksConfigured ? '\x1b[32mConfigured\x1b[0m' : '\x1b[31mNot configured\x1b[0m'}`);
     } catch {
       console.log(`  MCP config: \x1b[31mInvalid\x1b[0m`);
+      console.log(`  Hooks config: \x1b[31mInvalid\x1b[0m`);
     }
   } else {
     console.log(`  MCP config: \x1b[31mNot found\x1b[0m`);
+    console.log(`  Hooks config: \x1b[31mNot found\x1b[0m`);
   }
 }
 
@@ -2684,6 +2804,14 @@ async function cmdDoctor() {
     mcpCfgTarget ? `Found in ${mcpCfgTarget} config` : 'Run: npx huaweicloud-devkit install',
   );
 
+  // Hermes MCP Python SDK (only checked when Hermes config is found)
+  if (
+    mcpCfgTarget === 'Hermes Agent' ||
+    (existsSync(hermesConfigFile()) && readFileSync(hermesConfigFile(), 'utf8').includes('mcp_servers'))
+  ) {
+    check('Hermes MCP Python SDK', hermesMcpSdkOk(), 'Run: pip3 install mcp');
+  }
+
   // hcloud CLI
   const hcloudBin = findHcloudBin() || process.env.HCLOUD_BIN || 'hcloud';
   const hcloudCheck = spawnSync(`"${hcloudBin}" version`, [], {

package/plugins/huaweicloud-core/src/ws-exec/ws-exec-client.js

@@ -38,15 +38,36 @@ function closeQuietly(ws) {
   }
 }
 
-function escapeRegExp(text) {
-  return text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
-
 function stripEchoedLine(text, line, options = {}) {
-  const escaped = escapeRegExp(line);
-  const stripped = text.replace(new RegExp(`(^|\\r?\\n)${escaped}\\r?\\n?`), '$1');
-  if (!options.allowAttached || stripped !== text) return stripped;
-  return text.replace(new RegExp(`${escaped}(?:\\r?\\n){0,2}$`), '');
+  if (text.startsWith(line)) {
+    text = text.slice(line.length);
+    text = text.replace(/^\r?\n/, '');
+    if (!options.allowAttached) return text;
+  }
+
+  for (const nl of ['\r\n', '\n']) {
+    const idx = text.indexOf(nl + line);
+    if (idx !== -1) {
+      const before = text.slice(0, idx + nl.length);
+      const after = text.slice(idx + nl.length + line.length);
+      text = before + after.replace(/^\r?\n/, '');
+      if (!options.allowAttached) return text;
+      break;
+    }
+  }
+
+  if (options.allowAttached) {
+    for (let trail = 2; trail >= 0; trail--) {
+      for (const nl of ['\r\n', '\n']) {
+        const suffix = nl.repeat(trail);
+        if (text.endsWith(line + suffix)) {
+          return text.slice(0, text.length - line.length - suffix.length);
+        }
+      }
+    }
+  }
+
+  return text;
 }
 
 function buildMarkers(nonce = randomBytes(8).toString('hex')) {