huaweicloud-devkit 1.1.2-next.7 → 1.1.2

package/package.json

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

@@ -112,7 +112,13 @@ Setup is a **plugin-side preflight** — the developer should be asked a questio
    sudo nginx -s reload 2>/dev/null || true
    ```
 
-7. **Inject credentials** (optional): `huaweicloud_sandbox_credentials` — enables cloud API access from sandbox. After injection, credentials are also written to `/tmp/hw_creds.sh` for shell access:
+7. **Inject credentials** (optional): `huaweicloud_sandbox_credentials` — enables cloud API access from sandbox. Pass `session_id` **or** `dev_stage_id` (at least one; both come from `sandbox_connect`, and `dev_stage_id` may be omitted to reuse the most recent connect). The tool validates the AK/SK against IAM first — an invalid SK is rejected here instead of failing later with `APIGW.0301` during exec. Example:
+
+   ```json
+   { "dev_stage_id": "<dev_stage_id from connect>" }
+   ```
+
+   After injection, credentials are also written to `/tmp/hw_creds.sh` for shell access (includes `HW_PROJECT_ID` when resolvable):
 
    ```bash
    # Source credentials in any sandbox shell before using hcloud/devbridge:

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

@@ -10,7 +10,7 @@ import {
 } from 'node:fs';
 import { join, dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { homedir, platform } from 'node:os';
+import { homedir, platform, tmpdir } from 'node:os';
 import { createInterface } from 'node:readline';
 import { spawnSync } from 'node:child_process';
 import { randomUUID } from 'node:crypto';
@@ -3120,6 +3120,10 @@ async function cmdInstall() {
   if (target === 'codearts-work' || target === 'all') {
     await runInstallStep('codearts-work', '\n[CodeArts Work]', installCodeArtsWork);
   }
+  if (target === 'codearts-work' || target === 'all') {
+    console.log('\n[CodeArts Work]');
+    await installCodeArtsWork();
+  }
   if (target === 'workbuddy' || target === 'all') {
     await runInstallStep('workbuddy', '\n[WorkBuddy]', installWorkBuddy);
   }
@@ -3138,6 +3142,26 @@ async function cmdInstall() {
   if (target === 'atomcode' || target === 'all') {
     await runInstallStep('atomcode', '\n[AtomCode]', installAtomCode);
   }
+  if (target === 'dsh' || target === 'all') {
+    console.log('\n[DSH]');
+    await installDsh();
+  }
+  if (target === 'officeace' || target === 'all') {
+    console.log('\n[OfficeAce]');
+    await installOfficeAce();
+  }
+  if (target === 'hermes' || target === 'all') {
+    console.log('\n[Hermes Agent]');
+    await installHermes();
+  }
+  if (target === 'openclaw' || target === 'all') {
+    console.log('\n[OpenClaw]');
+    await installOpenClaw();
+  }
+  if (target === 'atomcode' || target === 'all') {
+    console.log('\n[AtomCode]');
+    await installAtomCode();
+  }
   if (target === 'codex' || target === 'all') {
     await runInstallStep('codex', '\n[Codex]', () => {
       if (!hasCodexCLI()) {
@@ -3404,72 +3428,89 @@ async function promptGlobalCleanup() {
   }
 }
 
+function openclawStatus() {
+  const cdPluginDir = openclawPluginsDir();
+  const cdSkillsDir = openclawSkillsDir();
+  console.log(
+    `  MCP Server: ${existsSync(join(cdPluginDir, 'src', 'mcp-server.mjs')) ? '\x1b[32mInstalled\x1b[0m' : '\x1b[31mNot installed\x1b[0m'}`,
+  );
+  console.log(
+    `  Safety Policy: ${existsSync(join(cdPluginDir, 'safety', 'policy.json')) ? '\x1b[32mInstalled\x1b[0m' : '\x1b[31mNot installed\x1b[0m'}`,
+  );
+  let cdSkillCount = 0;
+  if (existsSync(cdSkillsDir)) {
+    cdSkillCount = readdirSync(cdSkillsDir, { withFileTypes: true }).filter(
+      (d) => d.isDirectory() && d.name.startsWith('huawei'),
+    ).length;
+  }
+  console.log(
+    `  Skills: ${cdSkillCount > 0 ? `\x1b[32m${cdSkillCount} installed\x1b[0m` : '\x1b[31mNot installed\x1b[0m'}`,
+  );
+}
+
+function codexSectionStatus() {
+  if (!hasCodexCLI()) {
+    console.log('  \x1b[33mCodex CLI not found.\x1b[0m');
+  } else {
+    console.log(`  Plugin: ${codexStatus() ? '\x1b[32mInstalled\x1b[0m' : '\x1b[31mNot installed\x1b[0m'}`);
+  }
+}
+
 async function cmdStatus() {
-  const target = parseTarget();
+  const scope = parseTarget();
   console.log(BANNER);
   console.log(`HuaweiCloud DevKit Status\n`);
 
-  if (target === 'opencode' || target === 'all') {
-    console.log('[OpenCode]');
-    opencodeStatus();
-  }
-  if (target === 'codearts' || target === 'all') {
-    console.log('\n[CodeArts]');
-    codeartsStatus();
-  }
-  if (target === 'codearts-work' || target === 'all') {
-    console.log('\n[CodeArts Work]');
-    codeartsWorkStatus();
-  }
-  if (target === 'workbuddy' || target === 'all') {
-    console.log('\n[WorkBuddy]');
-    workbuddyStatus();
-  }
-  if (target === 'dsh' || target === 'all') {
-    console.log('\n[DSH]');
-    dshStatus();
-  }
-  if (target === 'officeace' || target === 'all') {
-    console.log('\n[OfficeAce]');
-    officeaceStatus();
-  }
-  if (target === 'hermes' || target === 'all') {
-    console.log('\n[Hermes Agent]');
-    hermesStatus();
-  }
-  if (target === 'openclaw' || target === 'all') {
-    console.log('\n[OpenClaw]');
-    const cdPluginDir = openclawPluginsDir();
-    const cdSkillsDir = openclawSkillsDir();
-    console.log(
-      `  MCP Server: ${existsSync(join(cdPluginDir, 'src', 'mcp-server.mjs')) ? '\x1b[32mInstalled\x1b[0m' : '\x1b[31mNot installed\x1b[0m'}`,
-    );
-    console.log(
-      `  Safety Policy: ${existsSync(join(cdPluginDir, 'safety', 'policy.json')) ? '\x1b[32mInstalled\x1b[0m' : '\x1b[31mNot installed\x1b[0m'}`,
-    );
-    let cdSkillCount = 0;
-    if (existsSync(cdSkillsDir)) {
-      cdSkillCount = readdirSync(cdSkillsDir, { withFileTypes: true }).filter(
-        (d) => d.isDirectory() && d.name.startsWith('huawei'),
-      ).length;
-    }
-    console.log(
-      `  Skills: ${cdSkillCount > 0 ? `\x1b[32m${cdSkillCount} installed\x1b[0m` : '\x1b[31mNot installed\x1b[0m'}`,
-    );
-  }
-  if (target === 'atomcode' || target === 'all') {
-    console.log('\n[AtomCode]');
-    atomcodeStatus();
-  }
-  if (target === 'codex' || target === 'all') {
-    console.log('\n[Codex]');
-    if (!hasCodexCLI()) {
-      console.log('  \x1b[33mCodex CLI not found.\x1b[0m');
-    } else {
-      console.log(`  Plugin: ${codexStatus() ? '\x1b[32mInstalled\x1b[0m' : '\x1b[31mNot installed\x1b[0m'}`);
+  const sections = [
+    { name: 'OpenCode', run: opencodeStatus, on: (target) => target === 'opencode' || target === 'all' },
+    { name: 'CodeArts', run: codeartsStatus, on: (target) => target === 'codearts' || target === 'all' },
+    { name: 'CodeArts Work', run: codeartsWorkStatus, on: (target) => target === 'codearts-work' || target === 'all' },
+    { name: 'WorkBuddy', run: workbuddyStatus, on: (target) => target === 'workbuddy' || target === 'all' },
+    { name: 'DSH', run: dshStatus, on: (target) => target === 'dsh' || target === 'all' },
+    { name: 'OfficeAce', run: officeaceStatus, on: (target) => target === 'officeace' || target === 'all' },
+    { name: 'Hermes Agent', run: hermesStatus, on: (target) => target === 'hermes' || target === 'all' },
+    { name: 'OpenClaw', run: openclawStatus, on: (target) => target === 'openclaw' || target === 'all' },
+    { name: 'AtomCode', run: atomcodeStatus, on: (target) => target === 'atomcode' || target === 'all' },
+    { name: 'Codex', run: codexSectionStatus, on: (target) => target === 'codex' || target === 'all' },
+  ];
+
+  // Capture each section's output so results can be grouped by install state
+  // (installed first) instead of the fixed agent order.
+  const originalLog = console.log;
+  const results = [];
+  for (const section of sections) {
+    if (!section.on(scope)) continue;
+    const lines = [];
+    console.log = (...args) => lines.push(args.map((a) => String(a)).join(' '));
+    try {
+      section.run();
+    } finally {
+      console.log = originalLog;
     }
+    const plain = lines.join('\n');
+    const hasInstalled = /Installed/.test(plain);
+    const hasMissing = /Not installed|not found/i.test(plain);
+    const state = hasInstalled && hasMissing ? 'partial' : hasInstalled ? 'installed' : hasMissing ? 'not' : 'unknown';
+    results.push({ name: section.name, lines, state });
+  }
+
+  const stateOrder = { installed: 0, partial: 1, unknown: 2, not: 3 };
+  results.sort((a, b) => stateOrder[a.state] - stateOrder[b.state]);
+
+  const namesIn = (state) => results.filter((r) => r.state === state).map((r) => r.name);
+  const summaryParts = [];
+  if (namesIn('installed').length) summaryParts.push(`已安装: ${namesIn('installed').join(', ')}`);
+  if (namesIn('partial').length) summaryParts.push(`部分安装: ${namesIn('partial').join(', ')}`);
+  if (namesIn('not').length) summaryParts.push(`未安装: ${namesIn('not').join(', ')}`);
+  if (summaryParts.length) console.log(`  ${summaryParts.join(' | ')}\n`);
+
+  for (const result of results) {
+    console.log(`[${result.name}]`);
+    for (const line of result.lines) console.log(line);
+    console.log('');
   }
-  console.log('\nEnvironment:');
+
+  console.log('Environment:');
   console.log(`  Node.js: ${process.version}`);
   console.log(`  Platform: ${platform()}`);
 }
@@ -3812,6 +3853,7 @@ async function cmdDoctor() {
     { path: join(codeartsPluginsDir(), '.installed'), name: 'CodeArts' },
     { path: join(codeartsWorkPluginsDir(), '.installed'), name: 'CodeArts Work' },
     { path: join(dshPluginsDir(), '.installed'), name: 'DSH' },
+    { path: join(hermesPluginsDir(), '.installed'), name: 'Hermes Agent' },
     { path: join(officeacePluginsDir(), '.installed'), name: 'OfficeAce' },
     { path: join(atomcodePluginsDir(), '.installed'), name: 'AtomCode' },
   ];
@@ -4167,32 +4209,102 @@ async function cmdInstallHcloud() {
         printSandboxWarning('沙箱模式拦截了 KooCLI 自动安装（无法创建/写入安装目录）。');
       }
     }
-  } else if (os === 'linux') {
-    console.log('[Linux] Auto-install (pinned to KooCLI <version>):'.replace('<version>', kooCliVersion || ''));
-    const pkg = arch === 'arm64' ? 'linux-arm64' : 'linux-amd64';
-    console.log(`  curl -LO "${baseUrl}/huaweicloud-cli-${pkg}.tar.gz"`);
-    console.log(`  tar -zxvf huaweicloud-cli-${pkg}.tar.gz`);
-    console.log(`  mv hcloud ~/.local/bin/`);
-    console.log(`  hcloud version`);
-    console.log(`\n  Or one-liner (installs LATEST, may differ from pinned ${kooCliVersion || ''}):`);
-    console.log(`  curl -sSL ${latestUrl}/hcloud_install.sh -o ./hcloud_install.sh && bash ./hcloud_install.sh -y`);
-    console.log(
-      `  \x1b[33m⚠️  The one-liner installs the latest KooCLI. If \`hcloud version\` != ${kooCliVersion}, doctor/check_cli will warn — use the pinned download above instead.\x1b[0m`,
-    );
-    console.log(`\nFull guide: https://support.huaweicloud.com/qs-hcli/hcli_02_003_02.html`);
-  } else if (os === 'darwin') {
-    console.log('[macOS] Auto-install (pinned to KooCLI <version>):'.replace('<version>', kooCliVersion || ''));
-    const pkg = arch === 'arm64' ? 'mac-arm64' : 'mac-amd64';
-    console.log(`  curl -LO "${baseUrl}/huaweicloud-cli-${pkg}.tar.gz"`);
-    console.log(`  tar -zxvf huaweicloud-cli-${pkg}.tar.gz`);
-    console.log(`  mv hcloud /usr/local/bin/`);
-    console.log(`  hcloud version`);
-    console.log(`\n  Or one-liner (installs LATEST, may differ from pinned ${kooCliVersion || ''}):`);
-    console.log(`  curl -sSL ${latestUrl}/hcloud_install.sh -o ./hcloud_install.sh && bash ./hcloud_install.sh -y`);
-    console.log(
-      `  \x1b[33m⚠️  The one-liner installs the latest KooCLI. If \`hcloud version\` != ${kooCliVersion}, doctor/check_cli will warn — use the pinned download above instead.\x1b[0m`,
-    );
-    console.log(`\nFull guide: https://support.huaweicloud.com/qs-hcli/hcli_02_003_03.html`);
+  } else if (os === 'linux' || os === 'darwin') {
+    const label = os === 'linux' ? 'Linux' : 'macOS';
+    const pkg =
+      os === 'linux'
+        ? arch === 'arm64'
+          ? 'linux-arm64'
+          : 'linux-amd64'
+        : arch === 'arm64'
+          ? 'mac-arm64'
+          : 'mac-amd64';
+    const url = `${baseUrl}/huaweicloud-cli-${pkg}.tar.gz`;
+    const binDir = os === 'linux' ? join(homedir(), '.local', 'bin') : '/usr/local/bin';
+    const binPath = join(binDir, 'hcloud');
+
+    const printManual = () => {
+      console.log(`\n[${label}] Manual install (pinned to KooCLI ${kooCliVersion || ''}):`);
+      console.log(`  curl -LO "${url}"`);
+      console.log(`  tar -zxvf huaweicloud-cli-${pkg}.tar.gz`);
+      console.log(`  mv hcloud ${binDir}/`);
+      console.log(`  hcloud version`);
+      console.log(`\n  Or one-liner (installs LATEST, may differ from pinned ${kooCliVersion || ''}):`);
+      console.log(`  curl -sSL ${latestUrl}/hcloud_install.sh -o ./hcloud_install.sh && bash ./hcloud_install.sh -y`);
+      console.log(
+        `  \x1b[33m⚠️  The one-liner installs the latest KooCLI. If \`hcloud version\` != ${kooCliVersion}, doctor/check_cli will warn — use the pinned download above instead.\x1b[0m`,
+      );
+      console.log(
+        `\nFull guide: https://support.huaweicloud.com/qs-hcli/hcli_02_003_0${os === 'linux' ? '2' : '3'}.html`,
+      );
+    };
+
+    if (detectCodeartsSandbox() === 'sandbox') {
+      printSandboxWarning('沙箱模式拦截了 KooCLI 自动安装（无法创建/写入安装目录）。');
+      printManual();
+    } else {
+      console.log(`[${label}] Auto-installing to ${binDir}...`);
+      try {
+        const tmpTar = join(tmpdir(), `huaweicloud-cli-${pkg}.tar.gz`);
+        console.log(`  Downloading ${url}...`);
+        const dl = spawnSync('curl', ['-fL', url, '-o', tmpTar], { stdio: 'inherit', timeout: 180000 });
+        if (dl.status !== 0) throw new Error(`下载失败 (curl exit ${dl.status})`);
+
+        console.log('  Extracting...');
+        const ex = spawnSync('tar', ['-xzf', tmpTar, '-C', tmpdir()], { stdio: 'inherit', timeout: 60000 });
+        if (ex.status !== 0) throw new Error(`解压失败 (tar exit ${ex.status})`);
+        rmSync(tmpTar, { force: true });
+        const extracted = join(tmpdir(), 'hcloud');
+        if (!existsSync(extracted)) throw new Error('hcloud 二进制未生成，可能已被安全软件拦截');
+
+        try {
+          mkdirSync(binDir, { recursive: true });
+        } catch {}
+        console.log('  Installing...');
+        let mv = spawnSync('mv', [extracted, binPath], { stdio: 'inherit', timeout: 30000 });
+        if (mv.status !== 0) {
+          console.log('  目标目录需要权限，尝试 sudo mv...');
+          mv = spawnSync('sudo', ['mv', extracted, binPath], { stdio: 'inherit', timeout: 30000 });
+          if (mv.status !== 0) throw new Error(`安装失败 (mv exit ${mv.status})`);
+        }
+
+        console.log(`\n\x1b[32mInstall complete.\x1b[0m`);
+        console.log(`  Verify: ${binPath} version`);
+
+        // Ask user before accepting the privacy agreement — never auto-accept.
+        if (process.stdin.isTTY && process.stdout.isTTY) {
+          const rl = createInterface({ input: process.stdin, output: process.stdout });
+          const agree = await new Promise((resolve) => {
+            rl.question('\n  KooCLI requires accepting its privacy agreement. Do you accept? (y/N) ', (answer) => {
+              rl.close();
+              resolve(/^\s*y\s*$/i.test(answer));
+            });
+          });
+          if (agree) {
+            const r = spawnSync(binPath, ['version'], {
+              input: 'y\n',
+              encoding: 'utf8',
+              timeout: 15000,
+            });
+            console.log(
+              r.status === 0
+                ? '  \x1b[32mPrivacy agreement accepted. KooCLI ready.\x1b[0m'
+                : '  \x1b[33m无法写入配置目录。请在终端运行: hcloud version 并按提示操作\x1b[0m',
+            );
+          } else {
+            console.log('  \x1b[33m请手动接受隐私协议：在终端运行 hcloud version 并按提示操作\x1b[0m');
+          }
+        } else {
+          console.log('  \x1b[33m非交互会话：请稍后在终端运行 hcloud version 并按提示接受隐私协议\x1b[0m');
+        }
+      } catch (error) {
+        console.log(`\n\x1b[33mAuto-install failed: ${error.message}\x1b[0m`);
+        printManual();
+        if (detectCodeartsSandbox() === 'sandbox') {
+          printSandboxWarning('沙箱模式拦截了 KooCLI 自动安装（无法创建/写入安装目录）。');
+        }
+      }
+    }
   }
 
   console.log('\nAfter install, set HCLOUD_BIN if hcloud is not on PATH.');

package/plugins/huaweicloud-core/src/update-check.mjs

@@ -323,7 +323,9 @@ export async function upgradePackage({ target = 'all', version = 'latest' } = {}
     return { success: false, error: 'version 参数仅支持 latest。目标版本由插件自动判定。' };
   }
   const { doQuery = queryDistTags, spawnFn = defaultSpawn } = options;
-  const previousVersion = readInstalledVersion();
+  // Tests inject currentVersion explicitly - the repo package.json version changes
+  // between prerelease and stable lines, which must not flip the upgrade-tag logic.
+  const previousVersion = options.currentVersion || readInstalledVersion();
   let distTags;
   try {
     distTags = await doQuery();