huaweicloud-devkit 1.1.0-next.16 → 1.1.0-next.17

package/README.md

@@ -14,6 +14,14 @@ Supports OpenCode, Codex, CodeArts Agent, WorkBuddy, DeepSeek Harness (DSH), Off
 
 - Node.js >= 22
 
+> **China mainland users**: If you experience slow downloads or connection issues with the default npm registry, configure the Huawei Cloud npm mirror:
+>
+> ```bash
+> npm config set registry https://mirrors.huaweicloud.com/repository/npm/
+> ```
+>
+> Restore the default registry: `npm config delete registry`
+
 ## Quick Start
 
 > If `--target` is omitted, the installer auto-detects agents on your machine. When multiple agents are detected, **all of them** will be installed. Specify `--target` to control which agent receives the install.

package/README.zh-CN.md

@@ -14,6 +14,14 @@
 
 - Node.js >= 22
 
+> **国内用户**：使用默认 npm 镜像时可能遇到下载缓慢或连接失败的问题，建议配置华为云 npm 镜像：
+>
+> ```bash
+> npm config set registry https://mirrors.huaweicloud.com/repository/npm/
+> ```
+>
+> 恢复默认镜像：`npm config delete registry`
+
 ## 快速开始
 
 > 省略 `--target` 时，安装器会自动检测机器上的 agent，检测到多个时**全部安装**。建议始终指定 `--target` 以明确安装目标。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "huaweicloud-devkit",
-  "version": "1.1.0-next.16",
+  "version": "1.1.0-next.17",
   "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.16",
+  "version": "1.1.0-next.17",
   "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.16",
+  "version": "1.1.0-next.17",
   "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.16",
+  "version": "1.1.0-next.17",
   "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.16",
+  "version": "1.1.0-next.17",
   "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.16",
+  "version": "1.1.0-next.17",
   "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

@@ -138,6 +138,31 @@ def first_denied_command_rule(text):
     return None
 
 
+def evaluate(tool_name, tool_input):
+    """Run the full safety check and return a raw block reason, or None to allow.
+
+    Shared by the CLI shell (``main``) and the Hermes Python-plugin hook, which
+    reuses this module via ``importlib`` so a single implementation enforces the
+    policy everywhere. The returned reason does NOT include ``DENY_PREFIX`` —
+    callers decide the exact output shape.
+    """
+    text = command_text(tool_input)
+
+    if CONFIG_FILE_RE and CONFIG_FILE_RE.search(text):
+        return "reading Huawei Cloud credential/profile files can expose AK/SK or tokens. Use redacted toolkit tools."
+    if ENV_DUMP_RE.search(text):
+        return "dumping cloud credential environment variables is not allowed."
+    if SECRET_READ_RE and SECRET_READ_RE.search(text):
+        return "direct secret value retrieval would put plaintext secrets into the agent context."
+    denied_rule = first_denied_command_rule(text)
+    if denied_rule:
+        return f"{denied_rule.get('message')} Remediation: {denied_rule.get('remediation')}"
+    if tool_name in ("Bash", "terminal") and HCLOUD_RE.search(text) and WRITE_OPERATION_RE.search(text) and not READ_OPERATION_RE.search(text):
+        return "unapproved Huawei Cloud write operations must be planned first and explicitly approved by the user."
+
+    return None
+
+
 def main():
     try:
         data = json.load(sys.stdin)
@@ -145,20 +170,12 @@ def main():
         allow()
 
     tool_name = data.get("tool_name", "")
-    text = command_text(data.get("tool_input", {}))
+    tool_input = 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.", hermes)
-    if ENV_DUMP_RE.search(text):
-        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.", hermes)
-    denied_rule = first_denied_command_rule(text)
-    if denied_rule:
-        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)
+    reason = evaluate(tool_name, tool_input)
+    if reason:
+        deny(reason, 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.16",
+  "version": "1.1.0-next.17",
   "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-iam/SKILL.md

@@ -42,14 +42,14 @@ Domain expertise for Huawei Cloud Identity and Access Management (IAM). Covers u
 
 ## Common Workflows
 
-| Task                     | Command                                                                                        | Steps                         |
-| ------------------------ | ---------------------------------------------------------------------------------------------- | ----------------------------- |
-| List users               | hcloud IAM ListUsers                                                                           | references/iam-ops.md         |
-| Create group             | hcloud IAM CreateGroup --group.name=<name>                                                     | references/iam-ops.md         |
-| Create custom policy     | hcloud IAM CreateCustomPolicy --policy.name=<n> --policy.document=<json>                       | references/policy-examples.md |
-| Create agency            | hcloud IAM CreateAgency --agency.name=<n> --agency.domain_id=<id> --agency.trust_policy=<json> | references/agency.md          |
-| Get temporary credential | hcloud STS GetTemporaryCredential --agency_name=<n> --domain_id=<id> --duration_seconds=3600   | references/sts.md             |
-| Attach policy            | hcloud IAM AttachGroupPolicy --group_id=<id> --policy_id=<id>                                  | references/iam-ops.md         |
+| Task                     | Command                                                                                                                     | Steps                         |
+| ------------------------ | --------------------------------------------------------------------------------------------------------------------------- | ----------------------------- |
+| List users               | hcloud IAM KeystoneListUsers --cli-region=<r>                                                                               | references/iam-ops.md         |
+| Create group             | hcloud IAM CreateGroupV5 --group_name=<name>                                                                                | references/iam-ops.md         |
+| Create custom policy     | hcloud IAM CreateCloudServiceCustomPolicy --role.display_name=<n> --role.type=<type> --role.policy.Statement.1.Effect=Allow | references/policy-examples.md |
+| Create agency            | hcloud IAM CreateAgency --agency.name=<n> --agency.domain_id=<id> --agency.trust_domain_name=<domain>                       | references/agency.md          |
+| Get temporary credential | hcloud STS AssumeAgency --agency_urn=<urn> --agency_session_name=<n> --duration_seconds=3600                                | references/sts.md             |
+| Attach policy to group   | hcloud IAM AttachGroupPolicyV5 --group_id=<id> --policy_id=<id>                                                             | references/iam-ops.md         |
 
 ## Policy Examples (Least Privilege)
 
@@ -88,10 +88,10 @@ FunctionGraph needs an agency to access VPC resources (RDS, DCS, etc.):
 
 ```bash
 # 1. Create agency with FunctionGraph trust
-hcloud IAM CreateAgency --agency_name=<name> --trust_domain_name=functiongraph
+hcloud IAM CreateAgency --agency.name=<name> --agency.trust_domain_name=functiongraph
 
-# 2. Attach VPC Administrator role
-hcloud IAM GrantRoleToAgency --agency_name=<name> --role_id=<role-id>
+# 2. Grant role to agency
+hcloud IAM AssociateAgencyWithDomainPermission --agency_id=<id> --role_id=<role-id>
 
 # 3. Use in CreateFunction
 hcloud FunctionGraph CreateFunction ... --app_xrole=<agency-name>

package/plugins/huaweicloud-core/skills/huawei-rds/SKILL.md

@@ -55,7 +55,7 @@ hcloud RDS <Operation> --cli-region=<region> [--key=value ...]
 hcloud RDS ListInstances --cli-region=<r>
 hcloud RDS ListFlavors --database_name=<engine> --cli-region=<r>
 hcloud RDS ListDatastores --database_name=<engine> --cli-region=<r>
-hcloud RDS ListEngineFlavors --instance_id=<id> --cli-region=<r>
+hcloud RDS ListEngineFlavors --instance_id=<id> --availability_zone_ids=<az> --ha_mode=<mode> --cli-region=<r>
 ```
 
 ### Create Instance
@@ -150,7 +150,8 @@ hcloud RDS CreateRestoreInstance --instance_id=<id> --backup_id=<id> --name=<new
 ## Read Replicas
 
 ```bash
-hcloud RDS CreateReadReplica --replica_of_id=<primary-id> --name=<name> --flavor_ref=<id> --volume.type=<vol-type> --volume.size=<size> --cli-region=<r>
+# Create a read replica via CreateInstance with --replica_of_id
+hcloud RDS CreateInstance --replica_of_id=<primary-id> --name=<name> --flavor_ref=<id> --volume.type=<vol-type> --volume.size=<size> --cli-region=<r>
 ```
 
 ## Fault Diagnosis
@@ -159,7 +160,7 @@ hcloud RDS CreateReadReplica --replica_of_id=<primary-id> --name=<name> --flavor
 hcloud RDS ListErrorLogs --instance_id=<id> --start_date=2024-01-01T00:00:00Z --end_date=2024-01-31T23:59:59Z --cli-region=<r>
 hcloud RDS ListSlowLogs --instance_id=<id> --start_date=... --end_date=... --cli-region=<r>
 hcloud RDS ShowReplicationStatus --instance_id=<id> --cli-region=<r>
-hcloud RDS ListInstanceDiagnosis --cli-region=<r>
+hcloud RDS ListInstanceDiagnosis --engine=<engine> --cli-region=<r>
 ```
 
 ## Connecting

package/plugins/huaweicloud-core/skills/huawei-sandbox/SKILL.md

@@ -253,7 +253,7 @@ fi
 
 ```bash
 # Step A: List all tunnels (both active and stale)
-devbridge ls --all
+devbridge list -j
 # Step B: Remove all stale tunnels
 devbridge delete-all
 # Step C: Retry tunnel creation
@@ -265,6 +265,7 @@ This eliminates the most common deployment failure — historical tunnels from p
 
 - The public URL has the form `https://<id>-<port>.cn-north-4-bridge.myhuaweicloud.com` (from the `Tunnel URL:` line).
 - **Return this URL to the developer as the deployment result link.** Keep the host process running (do not close the session before handing over the URL).
+- Tunnel `description` (`-d`) accepts only Chinese characters, letters, and digits (0-64). Symbols such as `-`/`_`/spaces are rejected (`Invalid tunnel description`).
 - Internal docs: https://huaweicloud.github.io/devspace-devbridge/
 
 **No local downgrade**: if the tunnel tooling cannot be installed in the sandbox, STOP and report a generic error ("无法生成访问地址") without technical detail. Never install it on the developer's local machine — a local install would defeat the purpose of sandbox deployment.
@@ -751,7 +752,7 @@ Follow the standard [Expose the deployed app](#expose-the-deployed-app-public-ur
 
 Use `exec_with_session` to background DevBridge. For SSR, DevBridge tunnels the nginx public port (not the Node port directly).
 
-**Pre-flight**: always run `devbridge delete-all` before creating a new tunnel to prevent `10006: quota exceeded` from accumulated stale tunnels. If you still get quota error, list tunnels with `devbridge ls --all`, delete stale ones, and retry.
+**Pre-flight**: always run `devbridge delete-all` before creating a new tunnel to prevent `10006: quota exceeded` from accumulated stale tunnels. If you still get quota error, list tunnels with `devbridge list -j`, delete stale ones, and retry.
 
 Extract the tunnel URL from DevBridge output. The public URL has the form `https://<id>-<port>.cn-north-4-bridge.myhuaweicloud.com`. **Return this URL to the developer as the deployment result.**
 

package/plugins/huaweicloud-core/skills/huawei-waf-aad/SKILL.md

@@ -29,8 +29,8 @@ Domain expertise for WAF and Anti-DDoS. Covers WAF policy/rules, AAD protection,
 
 | Task                | Operation                                                       |
 | ------------------- | --------------------------------------------------------------- |
-| List WAF instances  | `ListInstances --cli-region=<r> --project_id=<p>`               |
-| List policies       | `ListPolicies --cli-region=<r> --project_id=<p>`                |
+| List WAF instances  | `ListCompositeHosts --cli-region=<r> --project_id=<p>`          |
+| List policies       | `ListPolicy --cli-region=<r> --project_id=<p>`                  |
 | Create custom rule  | `BatchCreateCustomRule --cli-region=<r> --project_id=<p>`       |
 | Create IP blacklist | `BatchCreateWhiteblackipRule --cli-region=<r> --project_id=<p>` |
 | Create CC rule      | `BatchCreateCcRule --cli-region=<r> --project_id=<p>`           |
@@ -39,8 +39,11 @@ Domain expertise for WAF and Anti-DDoS. Covers WAF policy/rules, AAD protection,
 ### AAD
 
 ```bash
-hcloud AAD ListInstances --cli-region=<r> --project_id=<p>
-hcloud AAD CreateInstance --cli-region=<r> --project_id=<p>
+# List AAD instances (requires --cli-region=cn-north-4 or ap-southeast-1)
+hcloud AAD ListInstance --cli-region=<r> --project_id=<p>
+
+# List DDoS attack events
+hcloud AAD ListDDoSAttackEvent --cli-region=<r> --project_id=<p>
 ```
 
 ## Troubleshooting

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

@@ -836,7 +836,7 @@ fi`;
   try {
     const tunnelCheck = await execOneShot(
       workspaceId,
-      'devbridge ls 2>/dev/null | grep -q "Tunnel URL" && echo "ACTIVE" || echo "INACTIVE"',
+      'devbridge list -j 2>/dev/null | grep -q \'"tunnelId"\' && echo "ACTIVE" || echo "INACTIVE"',
       username,
       10000,
     );
@@ -912,7 +912,7 @@ export async function deployCheck(
     `fi`,
     ``,
     `TOTAL=$((TOTAL+1))`,
-    `if devbridge ls 2>/dev/null | grep -q "Tunnel URL"; then`,
+    `if devbridge list -j 2>/dev/null | grep -q '"tunnelId"'; then`,
     `  echo "devbridge_tunnel:PASS"`,
     `  PASS=$((PASS+1))`,
     `else`,
@@ -920,8 +920,9 @@ export async function deployCheck(
     `fi`,
     ``,
     `TOTAL=$((TOTAL+1))`,
-    `TUNNEL_URL=$(devbridge ls 2>/dev/null | grep -oP "Tunnel URL: \\Khttps://[^ ]+")`,
-    `if [ -n "$TUNNEL_URL" ]; then`,
+    `TUNNEL_ID=$(devbridge list -j 2>/dev/null | grep -oP '"tunnelId":\\s*"\\K[^"]+' | head -1)`,
+    `TUNNEL_URL="https://\${TUNNEL_ID}-${port}.cn-north-4-bridge.myhuaweicloud.com"`,
+    `if [ -n "$TUNNEL_ID" ] && [ -n "$TUNNEL_URL" ]; then`,
     `  HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" --max-time 10 "$TUNNEL_URL" 2>/dev/null || echo "000")`,
     `  if [ "$HTTP_CODE" = "200" ] || [ "$HTTP_CODE" = "304" ]; then`,
     `    echo "tunnel_url_accessible:PASS ($TUNNEL_URL -> $HTTP_CODE)"`,

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

@@ -2108,6 +2108,14 @@ function hermesPluginsDir() {
   return join(hermesHomeDir(), 'huaweicloud-plugins');
 }
 
+function hermesPythonPluginsDir() {
+  return join(hermesHomeDir(), 'plugins');
+}
+
+function hermesSafetyPluginDir() {
+  return join(hermesPythonPluginsDir(), 'huaweicloud-safety');
+}
+
 function hermesConfigFile() {
   return join(hermesHomeDir(), 'config.yaml');
 }
@@ -2186,17 +2194,26 @@ function removeHermesMcpConfigBlock() {
   console.log('  MCP config cleaned');
 }
 
+function hermesHookScript() {
+  return join(hermesPluginsDir(), 'hooks', 'huaweicloud-safety.py').replace(/\\/g, '/');
+}
+
+function hermesHookCommand() {
+  const pythonBin = process.platform === 'win32' ? 'python' : 'python3';
+  return `${pythonBin} ${hermesHookScript()}`;
+}
+
 function ensureHermesHooksConfig() {
   const configPath = hermesConfigFile();
-  const pluginDest = hermesPluginsDir();
-  const hookScript = join(pluginDest, 'hooks', 'huaweicloud-safety.py').replace(/\\/g, '/');
+  const hookCommand = hermesHookCommand();
 
   const blockLines = [
     'hooks:',
     '  pre_tool_call:',
     '    - matcher: "terminal"',
-    `      command: "python3 ${hookScript}"`,
+    `      command: "${hookCommand}"`,
     '      timeout: 5',
+    '      fail_closed: true',
   ];
   const block = blockLines.join('\n');
 
@@ -2205,10 +2222,21 @@ function ensureHermesHooksConfig() {
     try {
       existing = readFileSync(configPath, 'utf8');
     } catch {}
-    if (existing.includes('hooks:') && existing.includes('huaweicloud-safety.py')) {
+    if (
+      existing.includes('hooks:') &&
+      existing.includes(`command: "${hookCommand}"`) &&
+      existing.includes('fail_closed: true')
+    ) {
       console.log(`  Hooks config unchanged: ${configPath}`);
       return false;
     }
+    removeHermesHooksConfigBlock();
+    existing = '';
+    if (existsSync(configPath)) {
+      try {
+        existing = readFileSync(configPath, 'utf8');
+      } catch {}
+    }
   }
   mkdirSync(dirname(configPath), { recursive: true });
   const newContent = existing ? `${existing.trimEnd()}\n\n${block}\n` : `${block}\n`;
@@ -2217,6 +2245,154 @@ function ensureHermesHooksConfig() {
   return true;
 }
 
+function hermesHookScriptMtime() {
+  const scriptPath = hermesHookScript();
+  try {
+    return statSync(scriptPath).mtime.toISOString();
+  } catch {
+    return null;
+  }
+}
+
+function hermesAllowlistPath() {
+  return join(hermesHomeDir(), 'shell-hooks-allowlist.json');
+}
+
+function ensureHermesHookAllowlist() {
+  const hookCommand = hermesHookCommand();
+  const allowlistPath = hermesAllowlistPath();
+
+  let data = { approvals: [] };
+  if (existsSync(allowlistPath)) {
+    try {
+      const parsed = JSON.parse(readFileSync(allowlistPath, 'utf8'));
+      if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+        data = parsed;
+      }
+    } catch {}
+  }
+  const approvals = Array.isArray(data.approvals) ? data.approvals : [];
+  const already = approvals.some(
+    (a) => a && typeof a === 'object' && a.event === 'pre_tool_call' && a.command === hookCommand,
+  );
+  if (already) {
+    console.log(`  Hook allowlist unchanged: ${allowlistPath}`);
+    return false;
+  }
+
+  const entry = {
+    event: 'pre_tool_call',
+    command: hookCommand,
+    approved_at: new Date().toISOString(),
+    script_mtime_at_approval: hermesHookScriptMtime(),
+  };
+  data.approvals = [...approvals, entry];
+  mkdirSync(dirname(allowlistPath), { recursive: true });
+  writeFileSync(allowlistPath, JSON.stringify(data, null, 2));
+  console.log(`  Hook allowlist updated: ${allowlistPath}`);
+  return true;
+}
+
+function hermesHookAllowlisted() {
+  const allowlistPath = hermesAllowlistPath();
+  if (!existsSync(allowlistPath)) return false;
+  try {
+    const data = JSON.parse(readFileSync(allowlistPath, 'utf8'));
+    const cmd = hermesHookCommand();
+    return (
+      Array.isArray(data?.approvals) &&
+      data.approvals.some((a) => a && typeof a === 'object' && a.event === 'pre_tool_call' && a.command === cmd)
+    );
+  } catch {
+    return false;
+  }
+}
+
+function hermesHookPluginInit() {
+  const script = hermesHookScript();
+  return [
+    'import importlib.util',
+    '',
+    `SAFETY_SCRIPT = ${JSON.stringify(script)}`,
+    '',
+    '',
+    'def _load_safety():',
+    '    spec = importlib.util.spec_from_file_location("huaweicloud_safety_hook", SAFETY_SCRIPT)',
+    '    module = importlib.util.module_from_spec(spec)',
+    '    spec.loader.exec_module(module)',
+    '    return module',
+    '',
+    '',
+    '_safety = _load_safety()',
+    '',
+    '',
+    'def register(ctx):',
+    '    ctx.register_hook("pre_tool_call", _check)',
+    '',
+    '',
+    'def _check(tool_name=None, args=None, **kwargs):',
+    '    if tool_name != "terminal":',
+    '        return None',
+    '    if not (isinstance(args, dict) and "command" in args):',
+    '        return None',
+    '    reason = _safety.evaluate(tool_name, args)',
+    '    if reason:',
+    '        return {"action": "block", "message": _safety.DENY_PREFIX + reason}',
+    '    return None',
+    '',
+  ].join('\n');
+}
+
+function ensureHermesHookPlugin() {
+  const pluginDir = hermesSafetyPluginDir();
+  const manifestPath = join(pluginDir, 'plugin.yaml');
+  const initPath = join(pluginDir, '__init__.py');
+
+  const manifest = [
+    'name: huaweicloud-safety',
+    `version: "${pkgVersion}"`,
+    'description: Huawei Cloud safety pre_tool_call hook',
+    'author: HuaweiCloud Mate',
+    'provides_hooks:',
+    '  - pre_tool_call',
+    '',
+  ].join('\n');
+  const init = hermesHookPluginInit();
+
+  const manifestCurrent = existsSync(manifestPath) ? readFileSync(manifestPath, 'utf8') : '';
+  const initCurrent = existsSync(initPath) ? readFileSync(initPath, 'utf8') : '';
+  if (manifestCurrent === manifest && initCurrent === init) {
+    console.log(`  Hook plugin unchanged: ${pluginDir}`);
+    return false;
+  }
+
+  mkdirSync(pluginDir, { recursive: true });
+  writeFileSync(manifestPath, manifest);
+  writeFileSync(initPath, init);
+  console.log(`  Hook plugin installed: ${pluginDir}`);
+  return true;
+}
+
+function removeHermesHookPlugin() {
+  const pluginDir = hermesSafetyPluginDir();
+  if (!existsSync(pluginDir)) return false;
+  rmSync(pluginDir, { recursive: true, force: true });
+  console.log(`  Removed hook plugin: ${pluginDir}`);
+  const parent = hermesPythonPluginsDir();
+  try {
+    if (existsSync(parent) && readdirSync(parent).length === 0) {
+      rmSync(parent, { recursive: true, force: true });
+    }
+  } catch {}
+  return true;
+}
+
+function hermesHookPluginInstalled() {
+  return (
+    existsSync(join(hermesSafetyPluginDir(), 'plugin.yaml')) && existsSync(join(hermesSafetyPluginDir(), '__init__.py'))
+  );
+}
+
 function removeHermesHooksConfigBlock() {
   const configPath = hermesConfigFile();
   if (!existsSync(configPath)) return;
@@ -2299,6 +2475,8 @@ async function installHermes() {
 
   if (!skipMcp) ensureHermesMcpConfig();
   ensureHermesHooksConfig();
+  ensureHermesHookAllowlist();
+  ensureHermesHookPlugin();
   if (!skipMcp) installRuntimeDeps(pluginDest);
   if (!skipMcp) ensureHermesMcpSdk();
 }
@@ -2321,6 +2499,8 @@ async function updateHermes() {
   console.log(`  Safety Hooks updated -> ${join(pluginDest, 'hooks')}`);
   ensureHermesMcpConfig();
   ensureHermesHooksConfig();
+  ensureHermesHookAllowlist();
+  ensureHermesHookPlugin();
   ensureHermesMcpSdk();
   mkdirSync(pluginDest, { recursive: true });
   writeFileSync(join(pluginDest, '.installed'), new Date().toISOString());
@@ -2335,6 +2515,9 @@ function uninstallHermes() {
   removeHermesHooksConfigBlock();
   console.log('  Hooks config removed');
 
+  // 1b. Remove the Python safety hook plugin (v0.9.0+ enforcement path)
+  removeHermesHookPlugin();
+
   // 2. Clean shell-hooks-allowlist.json (remove approved hook references)
   const hermesHome = hermesHomeDir();
   const allowlistPath = join(hermesHome, 'shell-hooks-allowlist.json');
@@ -2342,9 +2525,10 @@ function uninstallHermes() {
     try {
       const allowlist = JSON.parse(readFileSync(allowlistPath, 'utf8'));
       const before = (allowlist.approvals || []).length;
-      allowlist.approvals = (allowlist.approvals || []).filter((a) =>
-        typeof a === 'string' ? !a.includes('huaweicloud-safety.py') : true,
-      );
+      allowlist.approvals = (allowlist.approvals || []).filter((a) => {
+        const cmd = typeof a === 'string' ? a : a?.command;
+        return !(typeof cmd === 'string' && cmd.includes('huaweicloud-safety.py'));
+      });
       if (allowlist.approvals.length < before) {
         writeFileSync(allowlistPath, JSON.stringify(allowlist, null, 2));
         console.log(`  Removed ${before - allowlist.approvals.length} hook approvals from allowlist`);
@@ -2394,6 +2578,12 @@ function hermesStatus() {
   console.log(
     `  Safety Hooks: ${existsSync(join(pluginDir, 'hooks', 'huaweicloud-safety.py')) ? '\x1b[32mInstalled\x1b[0m' : '\x1b[31mNot installed\x1b[0m'}`,
   );
+  console.log(
+    `  Hook allowlist: ${hermesHookAllowlisted() ? '\x1b[32mApproved\x1b[0m' : '\x1b[31mNot allowlisted\x1b[0m'}`,
+  );
+  console.log(
+    `  Hook plugin: ${hermesHookPluginInstalled() ? '\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)) {