huaweicloud-devkit 1.1.8-next.0 → 1.1.8-next.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "huaweicloud-devkit",
   "mcpName": "io.github.huaweicloud/huaweicloud-devkit",
-  "version": "1.1.8-next.0",
+  "version": "1.1.8-next.1",
   "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.8-next.0",
+  "version": "1.1.8-next.1",
   "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.8-next.0",
+  "version": "1.1.8-next.1",
   "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.8-next.0",
+  "version": "1.1.8-next.1",
   "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.8-next.0",
+  "version": "1.1.8-next.1",
   "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.8-next.0",
+  "version": "1.1.8-next.1",
   "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.8-next.0",
+  "version": "1.1.8-next.1",
   "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

@@ -785,7 +785,7 @@ check_port <nodePort>
 | SPA/SSG/Cross-platform | nginx port (from `framework.detect`) | Kill old process, then configure nginx |
 | SSR                    | nginx public port + Node app port    | Kill old processes on both ports       |
 
-If the port cannot be freed (different user/process), increment to the next available port: `<port>+1`, update all subsequent nginx config and DevBridge references accordingly.
+If the port cannot be freed (different user/process), the `deploy_nginx` tool auto-increments to the next available port (up to 10 attempts). For SSR (proxy) mode, nginx listens on the resolved `targetPort`, and the Node app follows the returned `nodePort` field — bind the Node process to the `nodePort` that `deploy_nginx` returns, and update all subsequent nginx config and DevBridge references accordingly.
 
 #### Configure Nginx
 
@@ -806,7 +806,7 @@ Use `huaweicloud_sandbox_deploy_nginx` to write the correct template, fix direct
 - `port` — listen port from framework detection
 - `project` — project dir name under `/workspace`
 - `output_dir` — build output dir relative to `/workspace/<project>`
-- `node_port` — Node.js app port for SSR proxy. Defaults to `<port> + 1` if omitted, and the result includes `nodePort` so you know which port to bind the Node process to.
+- `node_port` — Node.js app port for SSR proxy. When omitted it defaults to the resolved nginx listen port plus one (`targetPort + 1`), and the result includes `nodePort` so you know which port to bind the Node process to. When the nginx port auto-increments, `nodePort` follows it.
 - `public_port` — public listen port for SSR proxy (optional, defaults to `port`)
 
 The tool automatically handles:
@@ -834,7 +834,7 @@ If the status code is not 2xx/3xx:
 ### Step 6: Start the App [REQUIRED]
 
 - **Static (SPA/SSG/cross-platform)**: nginx is already serving. Skip.
-- **SSR**: `PORT=<nodePort>` prefix is REQUIRED before `<serveCmd>`. nginx `proxy_pass` targets `<nodePort>`, not `<port>` — the two must differ. `deployNginx` returns `nodePort` in its result (defaults to `<port> + 1` for proxy type).
+- **SSR**: `PORT=<nodePort>` prefix is REQUIRED before `<serveCmd>`. nginx `proxy_pass` targets `<nodePort>`, not `<port>` — the two must differ. `deployNginx` returns `nodePort` in its result (defaults to the resolved `targetPort + 1` for proxy type). Always use the returned `port`/`nodePort` values — they follow any auto-increment.
 
   **Runtime environment variables**: SSR apps often need `DATABASE_URL`, `NEXTAUTH_URL`, `NEXTAUTH_SECRET`, etc. at runtime. Before starting, verify env vars from Step 4a are still loaded, and re-source `.env` if the shell session was reset:
 

package/plugins/huaweicloud-core/skills/huaweicloud-cli-and-auth/SKILL.md

@@ -65,7 +65,14 @@ One-liner (installs `latest`, may drift from v7.2.12):
 curl -sSL https://cn-north-4-hdn-koocli.obs.cn-north-4.myhuaweicloud.com/cli/latest/hcloud_install.sh -o ./hcloud_install.sh && bash ./hcloud_install.sh -y
 ```
 
-Agent processes find executables through `PATH`. If OpenCode/Codex cannot find `hcloud`, restart after updating `PATH`, or set `HCLOUD_BIN`.
+**No restart needed after install**: DevKit locates `hcloud` dynamically on every
+call — it checks `HCLOUD_BIN`, then the fixed install dirs (`~/.local/bin/hcloud`
+on Linux, `/usr/local/bin/hcloud` on macOS, `~/hcloud/hcloud.exe` on Windows),
+then PATH. Once `install-hcloud` or the background auto-install writes the binary
+to one of those dirs, the very next `check_cli` / `run_*` call uses it. Do not
+tell users to restart the agent.
+
+Agent processes find executables through `PATH`; `HCLOUD_BIN` overrides it. DevKit re-locates hcloud from its **fixed install dirs** on every call, so a freshly installed binary (`~/.local/bin` on Linux, `/usr/local/bin` on macOS, `~/hcloud` on Windows) or a re-set `HCLOUD_BIN` is picked up by the next `check_cli` / `run_*` call without restarting the agent. A custom `PATH` entry is only honored via `HCLOUD_BIN` or the PATH locator fallback, and shell `PATH` changes take effect only for processes started after the update.
 
 ## Configure Credentials Outside Chat
 

package/plugins/huaweicloud-core/src/data/icons-manifest.v1.json

@@ -5,7 +5,7 @@
   "icons": [
     {
       "id": "codeartsdoer",
-      "name": "华为云码道（CodeArts）代码智能体",
+      "name": "华为云码道CodeArts代码智能体",
       "category": "人工智能",
       "subcategory": "智能体",
       "description": "更懂你编码需求的AI研发专家",
@@ -41,13 +41,13 @@
     },
     {
       "id": "modelarts",
-      "name": "魔坊（ModelArts）模型训推平台",
+      "name": "魔坊（ModelArts）",
       "category": "人工智能",
       "subcategory": "模型开发平台",
       "description": "“数-训-推-强”，一站式AI开发平台",
       "product_url": "https://www.huaweicloud.com/product/modelarts.html",
       "logo": {
-        "source_url": "https://res-static.hc-cdn.cn/cloudbu-site/public/new-product-icon/AI/ModelArts.png",
+        "source_url": "https://res-static.hc-cdn.cn/cloudbu-site/public/%E6%96%B0%E7%89%88/CF057503-AE1E-48CA-E8C1-1919F51A1261.png",
         "local_path": "icons/assets/logo/modelarts.png"
       },
       "architecture": {
@@ -155,8 +155,8 @@
       "description": "高效敏捷安全的一站式企业级智能体平台",
       "product_url": "https://www.huaweicloud.com/product/agentarts.html",
       "logo": {
-        "source_url": "https://res-static.hc-cdn.cn/cloudbu-site/public/new-product-icon/aPaaS/Versatile.svg",
-        "local_path": "icons/assets/logo/agentarts.svg"
+        "source_url": "https://res-static.hc-cdn.cn/cloudbu-site/china/zh-cn/%E6%99%BA%E6%9E%9CAgentArts/AgentArts-%E5%AE%98%E7%BD%91%E4%BA%A7%E5%93%81%E9%A1%B5%E5%88%87%E5%9B%BE/bannerlogo.png",
+        "local_path": "icons/assets/logo/agentarts.png"
       },
       "architecture": {
         "status": "planned",
@@ -165,6 +165,24 @@
       "aliases": ["agentarts"],
       "tags": ["人工智能", "智能体平台", "agentarts"]
     },
+    {
+      "id": "officeace",
+      "name": "果办OfficeAce 办公智能体",
+      "category": "人工智能",
+      "subcategory": "智能体",
+      "description": "专业办公级AI助手，PPT一键生成、专家团研讨，安全高效随时待命",
+      "product_url": "https://www.huaweicloud.com/product/agentarts/officeace.html",
+      "logo": {
+        "source_url": "https://res-static.hc-cdn.cn/cloudbu-site/china/zh-cn/yunying/product/OfficeAce-v2.svg",
+        "local_path": "icons/assets/logo/officeace.svg"
+      },
+      "architecture": {
+        "status": "planned",
+        "local_path": "icons/assets/architecture/officeace.svg"
+      },
+      "aliases": ["officeace", "office-ace"],
+      "tags": ["人工智能", "智能体", "办公", "officeace"]
+    },
     {
       "id": "pangu-nlp",
       "name": "LLM大模型",

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

@@ -69,6 +69,17 @@ function pruneStale(map, now = Date.now()) {
   return changed;
 }
 
+// Approval token lifecycle states, surfaced to callers so they can emit the
+// precise JSON contract required by D4-24 (#745):
+//   'valid'            — token exists, not expired, not yet consumed
+//   'expired'          — token exists but createdAt is past APPROVAL_TTL_MS
+//   'already_consumed' — token was consumed on a prior call (tombstone kept)
+//   'not_found'        — token was never created (unknown / typo / pruned)
+const TOKEN_STATE_VALID = 'valid';
+const TOKEN_STATE_EXPIRED = 'expired';
+const TOKEN_STATE_ALREADY_CONSUMED = 'already_consumed';
+const TOKEN_STATE_NOT_FOUND = 'not_found';
+
 export function createApprovalToken(rawArgs) {
   const token = randomUUID();
   const map = readApprovals();
@@ -82,16 +93,36 @@ export function createApprovalToken(rawArgs) {
   return token;
 }
 
+// Inspect a token's lifecycle state WITHOUT consuming it. Used by
+// runApprovedCommand to decide between the 'expired' / 'already_consumed'
+// / 'not_found' JSON shapes. A consumed token leaves a tombstone
+// ({ consumedAt }) until it ages out past APPROVAL_TTL_MS.
+export function inspectApprovalToken(token) {
+  const map = readApprovals();
+  const entry = map[token];
+  if (!entry) return { state: TOKEN_STATE_NOT_FOUND };
+  if (entry.consumedAt !== undefined) return { state: TOKEN_STATE_ALREADY_CONSUMED };
+  if (Date.now() - entry.createdAt > APPROVAL_TTL_MS) return { state: TOKEN_STATE_EXPIRED };
+  return { state: TOKEN_STATE_VALID, entry };
+}
+
+// Backward-compatible single-use consume. Returns the stored entry on first
+// call, then null. After consumption a tombstone ({ consumedAt }) is written
+// so a second call can be distinguished from an unknown token via
+// inspectApprovalToken. Kept for existing tests that assert null on reuse.
 export function consumeApprovalToken(token) {
   const map = readApprovals();
   const entry = map[token];
   if (!entry) return null;
+  if (entry.consumedAt !== undefined) return null;
   if (Date.now() - entry.createdAt > APPROVAL_TTL_MS) {
     delete map[token];
     writeApprovals(map);
     return null;
   }
-  delete map[token];
+  // Mark as consumed (tombstone) instead of deleting outright, so a repeat
+  // call can be classified as already_processed rather than not_found.
+  map[token] = { consumedAt: Date.now(), createdAt: entry.createdAt };
   writeApprovals(map);
   return entry;
 }

package/plugins/huaweicloud-core/src/hcloud-probe.mjs

@@ -4,6 +4,7 @@ import { homedir } from 'node:os';
 import { join } from 'node:path';
 
 import { compareVersion, getKooCliVersion, parseHcloudVersion } from './koocli-version.mjs';
+import { kooCliInstallLogPath } from './preflight.mjs';
 import { redactSecrets } from './safety-policy.mjs';
 
 const VERSION_RE = /KooCLI|Current.*version|当前KooCLI/i;
@@ -13,7 +14,11 @@ export function findHcloudBin() {
   const candidates =
     process.platform === 'win32'
       ? [join(homedir(), 'hcloud', 'hcloud.exe')]
-      : [join(homedir(), '.local', 'bin', 'hcloud'), join(homedir(), 'hcloud', 'hcloud')];
+      : [
+          join(homedir(), '.local', 'bin', 'hcloud'),
+          join(homedir(), 'hcloud', 'hcloud'),
+          join('/', 'usr', 'local', 'bin', 'hcloud'),
+        ];
   const found = candidates.find((candidate) => existsSync(candidate));
   if (found) return found;
 
@@ -148,7 +153,10 @@ export function hcloudProbeNextStep(probe) {
     return 'KooCLI requires accepting its one-time privacy agreement. Run hcloud version in a real terminal and accept the prompt, then restart the agent.';
   }
   if (probe.status === 'not_found') {
-    return 'hcloud executable not found. Set HCLOUD_BIN to the full hcloud path, or install KooCLI: npx huaweicloud-devkit install-hcloud. Then restart the agent.';
+    return (
+      'KooCLI is not installed yet. Background auto-install may be running — please retry shortly instead of assuming failure. To install now: npx huaweicloud-devkit install-hcloud. DevKit picks up the binary from its fixed install dirs (~/.local/bin on Linux, /usr/local/bin on macOS, ~/hcloud on Windows) or HCLOUD_BIN on the next call — no agent restart needed. Install progress: ' +
+      kooCliInstallLogPath()
+    );
   }
   return 'Install Huawei Cloud KooCLI: npx huaweicloud-devkit install-hcloud. Configure credentials outside the agent conversation.';
 }

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

@@ -9,6 +9,7 @@ import { dispatch } from './mcp-protocol.mjs';
 import { DEFAULT_PORT, DEFAULT_HOST } from './mcp-server-remote.mjs';
 import { getCachedUpdateInfo, readInstalledVersion } from './update-check.mjs';
 import { detectAgent } from './telemetry/agent-detect.mjs';
+import { maybePreinstallKooCli } from './preflight.mjs';
 
 const transportIdx = process.argv.indexOf('--transport');
 const transport = transportIdx > -1 && process.argv[transportIdx + 1] ? process.argv[transportIdx + 1] : 'stdio';
@@ -53,6 +54,14 @@ try {
   if (existsSync(marker)) rmSync(marker, { force: true });
 } catch {}
 
+// First-use UX: if KooCLI is missing, kick off a background install so the first
+// cloud command doesn't hit a bare "command not found". Non-blocking + log-backed.
+// Runs at import time (before the transport branch below) so both the stdio and
+// remote transports benefit, and `HUAWEICLOUD_SKIP_HCLOUD_PREINSTALL=1` disables it.
+try {
+  maybePreinstallKooCli();
+} catch {}
+
 if (transport === 'remote') {
   const { startRemoteServer } = await import('./mcp-server-remote.mjs');
   startRemoteServer({ port: remotePort, host: remoteHost }).catch((error) => {

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

@@ -0,0 +1,125 @@
+import { spawn } from 'node:child_process';
+import { createWriteStream, existsSync, mkdirSync, readFileSync, rmSync, statSync, writeFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { dirname, join } from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+
+import { findHcloudBin } from './hcloud-probe.mjs';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+// Cross-process install lock so concurrent MCP processes / sessions don't all
+// spawn `install-hcloud` at cold start. A stale lock (older than TTL) is
+// reclaimed; a live lock makes this process yield to the in-flight installer.
+const INSTALL_LOCK_TTL_MS = 15 * 60 * 1000;
+const INSTALL_LOG_MAX_BYTES = 1024 * 1024;
+
+export function kooCliInstallLogPath() {
+  return join(homedir(), '.config', 'huaweicloud', 'logs', 'koocli-install.log');
+}
+
+export function kooCliInstallLockPath() {
+  return join(homedir(), '.config', 'huaweicloud', '.koocli-install.lock');
+}
+
+// Atomically acquire the cross-process install lock (exclusive create). Reclaims
+// a stale lock. Returns { acquired: true } or { acquired: false, reason }.
+export function acquireInstallLock(lockPath = kooCliInstallLockPath()) {
+  try {
+    mkdirSync(dirname(lockPath), { recursive: true });
+    let replace = false;
+    try {
+      const ts = Number(String(readFileSync(lockPath, 'utf8')).trim());
+      if (Number.isFinite(ts) && Date.now() - ts > INSTALL_LOCK_TTL_MS) replace = true;
+    } catch {}
+    if (replace) {
+      try {
+        rmSync(lockPath, { force: true });
+      } catch (error) {
+        return { acquired: false, reason: `stale lock cleanup failed: ${error.message}` };
+      }
+    }
+    writeFileSync(lockPath, String(Date.now()), { encoding: 'utf8', mode: 0o600, flag: 'wx' });
+    return { acquired: true };
+  } catch (error) {
+    return {
+      acquired: false,
+      reason: error.code === 'EEXIST' ? 'another process is installing' : `lock error: ${error.message}`,
+    };
+  }
+}
+
+export function releaseInstallLock(lockPath = kooCliInstallLockPath()) {
+  try {
+    rmSync(lockPath, { force: true });
+  } catch {}
+}
+
+// Open the install log, rotating (reset) once it exceeds INSTALL_LOG_MAX_BYTES
+// and pinning 0600 so the path holds no sensitive mount-down rights for others.
+export function openKooCliInstallLog(logPath = kooCliInstallLogPath()) {
+  try {
+    const st = existsSync(logPath) ? statSync(logPath) : null;
+    if (st && st.size > INSTALL_LOG_MAX_BYTES) rmSync(logPath, { force: true });
+    mkdirSync(dirname(logPath), { recursive: true });
+  } catch {}
+  return createWriteStream(logPath, { flags: 'a', mode: 0o600 });
+}
+
+// Entry that dispatches `install-hcloud` into this file's own `main()` on import,
+// exactly like bin/setup.cjs — but resolved as a sibling (src/setup-cli.mjs) so it
+// works in copied install trees where the repo-top bin/ directory is absent.
+export function resolvePreinstallCliEntry() {
+  return join(__dirname, 'setup-cli.mjs');
+}
+
+let installStarted = false;
+
+// Starts a one-shot background install of KooCLI when it is missing. Never throws
+// and never blocks: on failure the child's output is captured in the log file and
+// the session continues normally (the friendly not_found hint will point at the log).
+//
+// Trust boundary (P4): this runs `install-hcloud` unattended, i.e. it downloads and
+// executes the official HTTPS installer without checksum verification. Only enable
+// on trusted networks / over HTTPS; do not bypass with proxies you don't control.
+export function maybePreinstallKooCli({ force = false } = {}) {
+  if (installStarted && !force) return { launched: false, reason: 'already_launched' };
+  if (process.env.HUAWEICLOUD_SKIP_HCLOUD_PREINSTALL === '1') {
+    return { launched: false, reason: 'disabled_by_env' };
+  }
+  if (findHcloudBin()) {
+    return { launched: false, reason: 'already installed' };
+  }
+
+  const lock = acquireInstallLock();
+  if (!lock.acquired) {
+    return { launched: false, reason: lock.reason };
+  }
+
+  installStarted = true;
+  const entryPath = resolvePreinstallCliEntry();
+  if (!existsSync(entryPath)) {
+    releaseInstallLock();
+    console.error(`[preflight] install entry missing: ${entryPath}`);
+    return { launched: false, reason: `install entry missing: ${entryPath}` };
+  }
+  const entry = pathToFileURL(entryPath).href;
+  const log = openKooCliInstallLog();
+  log.on('error', () => {});
+  const release = () => {
+    log.end();
+    releaseInstallLock();
+  };
+  const child = spawn(process.execPath, [entry, 'install-hcloud'], {
+    stdio: ['ignore', log, log],
+    detached: true,
+    windowsHide: true,
+  });
+  child.unref();
+  child.on('error', (err) => {
+    log.write(`[preflight] spawn failed: ${err.message}\n`);
+    release();
+  });
+  child.on('close', () => release());
+  return { launched: true, reason: 'background install started' };
+}

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

@@ -198,9 +198,17 @@ export function formatPortDriftWarning(basePort, targetPort) {
   return `Port ${basePort} was occupied — nginx now listens on port ${targetPort}. Any DevBridge tunnel bound to port ${basePort} is detached: run "devbridge port create <tunnelId> -p ${targetPort} --protocol http -a" and restart "devbridge host" for the new port.`;
 }
 
-export function formatProxyPortWarning(basePort, targetPort) {
-  if (targetPort === basePort) return undefined;
-  return `Port ${basePort} is in use — the proxy template still listens on port ${basePort}: auto-increment does not apply to proxy configs, so nginx may fail to bind. Free the port or deploy a static/spa build instead.`;
+export async function resolveProxyNodePort(nodePort, nginxListenPort, isPortInUse) {
+  const baseCandidate = nodePort && nodePort !== nginxListenPort ? nodePort : nginxListenPort + 1;
+  let candidate = baseCandidate;
+  for (
+    let attempt = 0;
+    attempt < 10 && (candidate === nginxListenPort || (await isPortInUse(candidate)));
+    attempt += 1
+  ) {
+    candidate += 1;
+  }
+  return candidate;
 }
 
 export function buildExposeRemediation(port) {
@@ -775,7 +783,17 @@ export async function deployNginx(
   }
 
   const effectiveNodePort =
-    nginxType === 'proxy' ? (nodePort && nodePort !== listenPort ? nodePort : listenPort + 1) : undefined;
+    nginxType === 'proxy'
+      ? await resolveProxyNodePort(nodePort, targetPort, async (candidate) => {
+          const portCheck = await execOneShot(
+            workspaceId,
+            `ss -tlnp 2>/dev/null | grep -q ":${candidate} " && echo "IN_USE" || echo "FREE"`,
+            username,
+            10000,
+          );
+          return String(portCheck.stdout || '').includes('IN_USE');
+        })
+      : undefined;
 
   const projectPath = `/workspace/${project}`;
   const outputPath = outputDir.startsWith('/') ? outputDir : `${projectPath}/${outputDir}`;
@@ -803,7 +821,7 @@ fi`;
     }
 }`,
     proxy: `server {
-    listen ${listenPort};
+    listen ${targetPort};
     server_name _;
     large_client_header_buffers 4 32k;
 
@@ -874,6 +892,15 @@ fi`;
     tunnelActive = String(tunnelCheck.stdout || '').includes('ACTIVE');
   } catch {}
 
+  const warnings = [];
+  if (!tunnelActive) {
+    warnings.push('No active DevBridge tunnel — deployment is incomplete. Proceed to Step 7 to expose the app.');
+  }
+  const conflictWarning = formatPortConflictWarning(basePort, targetPort);
+  if (conflictWarning) warnings.push(conflictWarning);
+  const driftWarning = tunnelActive ? formatPortDriftWarning(basePort, targetPort) : undefined;
+  if (driftWarning) warnings.push(driftWarning);
+
   return {
     ok: result.exitCode === 0,
     nginxType,
@@ -884,18 +911,7 @@ fi`;
     exitCode: result.exitCode,
     stdout: result.stdout,
     nextStep: 'expose_via_devbridge',
-    warning:
-      [
-        !tunnelActive
-          ? 'No active DevBridge tunnel — deployment is incomplete. Proceed to Step 7 to expose the app.'
-          : undefined,
-        nginxType === 'proxy'
-          ? formatProxyPortWarning(basePort, targetPort)
-          : formatPortConflictWarning(basePort, targetPort),
-        tunnelActive && nginxType !== 'proxy' ? formatPortDriftWarning(basePort, targetPort) : undefined,
-      ]
-        .filter(Boolean)
-        .join(' ') || undefined,
+    warning: warnings.length > 0 ? warnings.join(' | ') : undefined,
   };
 }
 

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

@@ -4566,27 +4566,33 @@ async function cmdInstallHcloud() {
       const hcloudBin = join(installDir, 'hcloud.exe');
 
       // Ask user before accepting the privacy agreement — never auto-accept.
-      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(hcloudBin, ['version'], {
-          input: 'y\n',
-          encoding: 'utf8',
-          timeout: 10000,
-          windowsHide: true,
+      // Under non-TTY (e.g. preflight spawns with stdin 'ignore'), rl.question()
+      // never resolves — skip the prompt and let the user accept manually.
+      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 (r.status === 0) {
-          console.log('  \x1b[32mPrivacy agreement accepted. KooCLI ready.\x1b[0m');
+        if (agree) {
+          const r = spawnSync(hcloudBin, ['version'], {
+            input: 'y\n',
+            encoding: 'utf8',
+            timeout: 10000,
+            windowsHide: true,
+          });
+          if (r.status === 0) {
+            console.log('  \x1b[32mPrivacy agreement accepted. KooCLI ready.\x1b[0m');
+          } else {
+            console.log('  \x1b[33m无法写入配置目录。请在普通终端运行: echo "y" | hcloud version\x1b[0m');
+          }
         } else {
-          console.log('  \x1b[33m无法写入配置目录。请在普通终端运行: echo "y" | hcloud version\x1b[0m');
+          console.log('  \x1b[33m请手动接受隐私协议：在终端运行 hcloud version 并按提示操作\x1b[0m');
         }
       } else {
-        console.log('  \x1b[33m请手动接受隐私协议：在终端运行 hcloud version 并按提示操作\x1b[0m');
+        console.log('  \x1b[33m非交互会话：请稍后在终端运行 hcloud version 并按提示接受隐私协议\x1b[0m');
       }
 
       console.log('  Or restart terminal and: hcloud version');

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

@@ -8,7 +8,7 @@ import { createHmac, createHash } from 'node:crypto';
 
 import { evaluateArtifacts, evaluateCommandRisk, evaluateDeployPlan } from './risk-rule-engine.mjs';
 import { classifyTextCommand, redactSecrets } from './safety-policy.mjs';
-import { planHcloudCommand, runHcloud, consumeApprovalToken, hashArgs } from './hcloud-cli.mjs';
+import { planHcloudCommand, runHcloud, consumeApprovalToken, inspectApprovalToken, hashArgs } from './hcloud-cli.mjs';
 import { searchMarketplace } from './search-market.mjs';
 import { getServiceIcon } from './icon-library.mjs';
 import { detectFramework } from './detect-framework.mjs';
@@ -1014,6 +1014,11 @@ async function transferGitRepo(args, devStageId, connectResult) {
 }
 
 const pendingConfirms = new Map();
+// Tombstones for confirm tokens already consumed, so a repeat
+// huaweicloud_auth_confirm call can be classified as already_processed
+// instead of not_found (D4-24, #745). Kept in-memory only: confirm tokens
+// are session-scoped and never persisted across processes.
+const consumedConfirms = new Map();
 
 function readImportFile() {
   const path = join(dirname(globalCredentialsPath()), 'creds-import.json');
@@ -1281,9 +1286,18 @@ export async function callTool(name, rawArgs = {}, opts = {}) {
       return persisted;
     }
     case 'huaweicloud_auth_confirm': {
+      // D4-24 precise JSON contract (#745): a missing or already-consumed
+      // confirm token returns a structured result instead of throwing a
+      // generic Error string, mirroring runApprovedCommand's contract.
       const pending = pendingConfirms.get(args.token);
-      if (!pending) throw new Error('confirmToken not found or expired.');
+      if (!pending) {
+        if (args.token && consumedConfirms.has(args.token)) {
+          return { status: 'ok', outcome: 'already_processed' };
+        }
+        return { status: 'rejected', code: 'CONFIRM_TOKEN_NOT_FOUND' };
+      }
       pendingConfirms.delete(args.token);
+      consumedConfirms.set(args.token, { consumedAt: Date.now() });
       if (args.decision === 's1') {
         return { status: 'ok', outcome: 'aborted', message: '保持 S1 现有账号，未覆盖。' };
       }
@@ -1897,9 +1911,33 @@ async function runApprovedCommand(args = {}) {
     throw new Error('approvedByUser must be true after explicit user approval for this exact command.');
   }
   const token = String(args.approvalToken || '');
+
+  // D4-24 precise JSON contract (#745): expired and already-consumed tokens
+  // return a structured result instead of throwing a generic Error string, so
+  // clients can machine-assert the two non-success states.
+  const inspection = inspectApprovalToken(token);
+  if (inspection.state === 'already_consumed') {
+    return { status: 'ok', outcome: 'already_processed' };
+  }
+  if (inspection.state === 'expired') {
+    return { status: 'rejected', code: 'CONFIRM_TOKEN_EXPIRED' };
+  }
+  if (inspection.state === 'not_found') {
+    // A token that was never created (typo / unknown / pruned beyond the
+    // tombstone window) is still a rejection, but carries no expired/already
+    // semantics — surface a distinct code so clients can tell the cases apart.
+    return { status: 'rejected', code: 'CONFIRM_TOKEN_NOT_FOUND' };
+  }
+
   const stored = consumeApprovalToken(token);
   if (!stored) {
-    throw new Error('Invalid or expired approval token. Please re-plan the command.');
+    // Defensive: inspectApprovalToken said 'valid' but consume returned null
+    // (e.g. raced and pruned between the two reads). Re-classify so we never
+    // return a misleading success.
+    const recheck = inspectApprovalToken(token);
+    if (recheck.state === 'expired') return { status: 'rejected', code: 'CONFIRM_TOKEN_EXPIRED' };
+    if (recheck.state === 'already_consumed') return { status: 'ok', outcome: 'already_processed' };
+    return { status: 'rejected', code: 'CONFIRM_TOKEN_NOT_FOUND' };
   }
   const providedArgs = Array.isArray(args.args) ? args.args.map(String) : [];
   if (hashArgs(providedArgs) !== stored.argsHash) {