huaweicloud-devkit 1.1.0-next.10 → 1.1.0-next.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "huaweicloud-devkit",
-  "version": "1.1.0-next.10",
+  "version": "1.1.0-next.11",
   "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.10",
+  "version": "1.1.0-next.11",
   "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.10",
+  "version": "1.1.0-next.11",
   "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.10",
+  "version": "1.1.0-next.11",
   "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.10",
+  "version": "1.1.0-next.11",
   "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.10",
+  "version": "1.1.0-next.11",
   "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.0-next.10",
+  "version": "1.1.0-next.11",
   "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/setup-cli.mjs

@@ -2070,26 +2070,19 @@ function removeHermesHooksConfigBlock() {
   const configPath = hermesConfigFile();
   if (!existsSync(configPath)) return;
   const lines = readFileSync(configPath, 'utf8').split(/\r?\n/);
+  let inHooksBlock = false;
   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:') {
+    const trimmed = line.trim();
+    if (trimmed === 'hooks:' && !inHooksBlock) {
+      inHooksBlock = true;
       continue;
     }
-    if (/^\s*- matcher:\s*"terminal"/.test(line)) {
-      continue;
+    if (inHooksBlock) {
+      if (trimmed === '' || line.startsWith(' ') || line.startsWith('\t')) {
+        continue;
+      }
+      inHooksBlock = false;
     }
     out.push(line);
   }
@@ -2186,6 +2179,36 @@ async function updateHermes() {
 function uninstallHermes() {
   const skillsDir = hermesSkillsDir();
   let removed = 0;
+
+  // 1. Remove hook config from config.yaml (before deleting script files)
+  removeHermesHooksConfigBlock();
+  console.log('  Hooks config removed');
+
+  // 2. Clean shell-hooks-allowlist.json (remove approved hook references)
+  const hermesHome = hermesHomeDir();
+  const allowlistPath = join(hermesHome, 'shell-hooks-allowlist.json');
+  if (existsSync(allowlistPath)) {
+    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,
+      );
+      if (allowlist.approvals.length < before) {
+        writeFileSync(allowlistPath, JSON.stringify(allowlist, null, 2));
+        console.log(`  Removed ${before - allowlist.approvals.length} hook approvals from allowlist`);
+      }
+    } catch {
+      removeIfExists(allowlistPath);
+      console.log('  Removed hook allowlist file');
+    }
+  }
+
+  // 3. Remove MCP config from config.yaml
+  removeHermesMcpConfigBlock();
+  console.log('  MCP config removed');
+
+  // 4. Remove skills (file deletion comes after config cleanup)
   if (existsSync(skillsDir)) {
     for (const entry of readdirSync(skillsDir, { withFileTypes: true })) {
       if (entry.name.startsWith('huawei')) {
@@ -2202,11 +2225,10 @@ function uninstallHermes() {
     } catch {}
   }
 
+  // 5. Remove plugin directory (hook script files deleted last)
   if (removeIfExists(hermesPluginsDir())) {
     console.log('  Removed MCP server, safety policy and hooks');
   }
-  removeHermesMcpConfigBlock();
-  removeHermesHooksConfigBlock();
 }
 
 function hermesStatus() {