huaweicloud-devkit 1.1.5 → 1.1.6-next.1

package/plugins/huaweicloud-core/src/officeace-paths.mjs

@@ -0,0 +1,51 @@
+// Shared OfficeAce config-root resolution used by both the installer
+// (setup-cli.mjs) and the MCP runtime (tools.mjs), so skills are installed
+// to and read from the same location (#559).
+//
+// OfficeAce exposes no API for the plugin to query the current user or
+// install directory, so the root is located by probing. The probe result is
+// persisted in a marker file so a non-standard directory (entered via prompt,
+// whose OFFICE_CLAW_CONFIG_ROOT env does not survive across processes) is
+// still found by later uninstall/update runs.
+
+import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
+import { join, resolve, dirname } from 'node:path';
+import { homedir } from 'node:os';
+
+function markerPath() {
+  return join(process.env.HUAWEICLOUD_HOME || homedir(), '.config', 'huaweicloud', 'devkit-officeace-root.json');
+}
+
+function sqliteSibling(dir) {
+  return join(resolve(dir, '..'), 'data', 'mcp-connectors.sqlite');
+}
+
+// A directory is a usable OfficeAce config root when it exists and carries
+// OfficeAce evidence — capabilities.json, the connector DB, or DevKit's own
+// installed artifacts. Deliberately more lenient than "capabilities.json must
+// exist" so uninstall/update still find the root after it was removed.
+export function isUsableOfficeaceRoot(dir) {
+  if (!dir || !existsSync(dir)) return false;
+  return (
+    existsSync(join(dir, 'capabilities.json')) ||
+    existsSync(sqliteSibling(dir)) ||
+    existsSync(join(dir, 'skills')) ||
+    existsSync(join(dir, 'huaweicloud-plugins'))
+  );
+}
+
+export function readOfficeaceRootMarker() {
+  try {
+    const marker = JSON.parse(readFileSync(markerPath(), 'utf8'));
+    return isUsableOfficeaceRoot(marker.root) ? marker.root : null;
+  } catch {
+    return null;
+  }
+}
+
+export function writeOfficeaceRootMarker(root) {
+  try {
+    mkdirSync(dirname(markerPath()), { recursive: true });
+    writeFileSync(markerPath(), JSON.stringify({ root, savedAt: new Date().toISOString() }, null, 2));
+  } catch {}
+}

package/plugins/huaweicloud-core/src/risk-rule-engine.mjs

@@ -108,15 +108,57 @@ function evaluate(stage, inputs, options = {}) {
   };
 }
 
+function isNonEmptyString(value) {
+  return typeof value === 'string' && value.trim().length > 0;
+}
+
+function isNonEmptyContainer(value) {
+  if (Array.isArray(value)) return value.length > 0;
+  if (value && typeof value === 'object') return Object.keys(value).length > 0;
+  return false;
+}
+
+// A risk check that could not inspect its input must never report "allow"
+// (fail-open) — it reports deny with an `invalid` risk and a synthetic finding
+// so the reason is visible through the tool response (#564).
+function invalidRiskResult(stage, reason) {
+  return {
+    decision: 'deny',
+    risk: 'invalid',
+    findings: [
+      {
+        ruleId: 'invalid-input',
+        title: 'Invalid input for risk check',
+        category: 'invalid',
+        severity: 'deny',
+        message: reason,
+        remediation: 'Provide a valid, non-empty input before re-running the check.',
+        source: stage,
+        evidence: '',
+      },
+    ],
+  };
+}
+
 export function evaluateCommandRisk(command, options = {}) {
+  if (!isNonEmptyString(command)) {
+    return invalidRiskResult('command', 'command must be a non-empty string.');
+  }
   return evaluate('command', { command }, options);
 }
 
 export function evaluateArtifacts(artifacts, options = {}) {
-  return evaluate('artifact', Array.isArray(artifacts) ? artifacts : [], options);
+  if (!Array.isArray(artifacts) || artifacts.length === 0) {
+    return invalidRiskResult('artifact', 'artifacts must be a non-empty array.');
+  }
+  return evaluate('artifact', artifacts, options);
 }
 
 export function evaluateDeployPlan(plan, options = {}) {
+  const valid = isNonEmptyString(plan) || (plan != null && typeof plan === 'object' && isNonEmptyContainer(plan));
+  if (!valid) {
+    return invalidRiskResult('deploy_plan', 'plan must be a non-empty object, array, or string.');
+  }
   return evaluate('deploy_plan', { plan }, options);
 }
 

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

@@ -22,9 +22,18 @@ import { trackSandboxConnect, trackSandboxDisconnect } from '../telemetry/teleme
 
 const execFileAsync = promisify(execFile);
 
+// Public tunnel URL domain for the DevBridge s2 gateway. The pre-migration Huawei Cloud
+// bridge domain was retired in Sep 2026 and now serves a 「服务已迁移」 placeholder page with
+// HTTP 200 — never construct tunnel URLs from it.
+const DEVBRIDGE_TUNNEL_DOMAIN = 'devbridge-s2.hwtunnel.com';
+// Migration placeholder page marker — a tunnel URL returning this body must be treated as unreachable.
+const DEVBRIDGE_MIGRATION_MARKER = '服务已迁移';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
 export const WS_EXEC_INDEX_URL = pathToFileURL(join(__dirname, '..', 'ws-exec', 'index.js')).href;
 
+export const TUNNEL_URL_PATTERN = /TUNNEL_URL:(https:\/\/[A-Za-z0-9_-]+-\d+\.devbridge-s2\.hwtunnel\.com)/;
+
 let currentWorkspaceId = process.env.HW_WORKSPACE_ID || null;
 
 function getCurrentWorkspaceId() {
@@ -180,6 +189,24 @@ export function splitBase64Chunks(base64, chunkSize = UPLOAD_CHUNK_SIZE) {
   return chunks;
 }
 
+export function formatPortConflictWarning(basePort, targetPort) {
+  return targetPort !== basePort ? `Port ${basePort} is in use — auto-assigned port ${targetPort}` : undefined;
+}
+
+export function formatPortDriftWarning(basePort, targetPort) {
+  if (targetPort === basePort) return undefined;
+  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 function buildExposeRemediation(port) {
+  return `In the sandbox: source /tmp/hw_creds.sh; source /tmp/hw_api_key 2>/dev/null; devbridge delete-all; devbridge create <name>; devbridge port create <tunnelId> -p ${port} --protocol http -a; nohup devbridge host <tunnelId> -p ${port} > /tmp/host.log 2>&1 & If deploy_nginx reported a different (auto-incremented) port in its "port" field, use THAT port instead of the one shown here. Full procedure in huawei-sandbox skill, Step 7 (Expose via DevBridge).`;
+}
+
 export async function uploadFileWithSession(workspaceId, localPath, remotePath, username = 'root', timeoutMs = 30000) {
   if (!existsSync(localPath)) {
     throw new Error(`sandbox upload: local file not found: ${localPath}`);
@@ -728,7 +755,6 @@ export async function deployNginx(
   const basePort = nginxType === 'proxy' ? listenPort : port;
 
   let targetPort = basePort;
-  let portWarning;
   const maxPortAttempts = 10;
   for (let offset = 0; offset < maxPortAttempts; offset += 1) {
     targetPort = basePort + offset;
@@ -740,9 +766,6 @@ export async function deployNginx(
         10000,
       );
       if (!String(portCheck.stdout || '').includes('IN_USE')) break;
-      if (offset === 0) {
-        portWarning = `Port ${basePort} is in use — auto-assigned port ${targetPort}`;
-      }
     } catch {}
     if (offset === maxPortAttempts - 1) {
       throw new Error(
@@ -840,9 +863,11 @@ fi`;
 
   let tunnelActive = false;
   try {
+    // Version-aware: devbridge 0.1.x exposes JSON via `list -j`; 0.2.x removed -j and
+    // prints a table whose data rows start with the 8-char base32 tunnel ID.
     const tunnelCheck = await execOneShot(
       workspaceId,
-      'devbridge list -j 2>/dev/null | grep -q \'"tunnelId"\' && echo "ACTIVE" || echo "INACTIVE"',
+      '(devbridge list -j 2>/dev/null | grep -q \'"tunnelId"\' || devbridge list 2>/dev/null | grep -Eq \'^[a-z2-7]{8}[[:space:]]\') && echo "ACTIVE" || echo "INACTIVE"',
       username,
       10000,
     );
@@ -860,9 +885,17 @@ fi`;
     stdout: result.stdout,
     nextStep: 'expose_via_devbridge',
     warning:
-      (!tunnelActive
-        ? 'No active DevBridge tunnel — deployment is incomplete. Proceed to Step 7 to expose the app.'
-        : portWarning) || undefined,
+      [
+        !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,
   };
 }
 
@@ -918,7 +951,13 @@ export async function deployCheck(
     `fi`,
     ``,
     `TOTAL=$((TOTAL+1))`,
+    `DB_TUNNEL_ACTIVE=0`,
     `if devbridge list -j 2>/dev/null | grep -q '"tunnelId"'; then`,
+    `  DB_TUNNEL_ACTIVE=1`,
+    `elif devbridge list 2>/dev/null | grep -Eq '^[a-z2-7]{8}[[:space:]]'; then`,
+    `  DB_TUNNEL_ACTIVE=1`,
+    `fi`,
+    `if [ "$DB_TUNNEL_ACTIVE" = "1" ]; then`,
     `  echo "devbridge_tunnel:PASS"`,
     `  PASS=$((PASS+1))`,
     `else`,
@@ -927,18 +966,29 @@ export async function deployCheck(
     ``,
     `TOTAL=$((TOTAL+1))`,
     `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)"`,
-    `    PASS=$((PASS+1))`,
-    `  else`,
-    `    echo "tunnel_url_accessible:FAIL ($TUNNEL_URL -> HTTP $HTTP_CODE)"`,
-    `  fi`,
+    `if [ -z "$TUNNEL_ID" ]; then`,
+    `  TUNNEL_ID=$(devbridge list 2>/dev/null | grep -E '^[a-z2-7]{8}[[:space:]]' | awk '{print $1}' | head -1)`,
+    `fi`,
+    `TUNNEL_URL="https://\${TUNNEL_ID}-${port}.${DEVBRIDGE_TUNNEL_DOMAIN}"`,
+    `probe_tunnel() {`,
+    `  local url="$1" code`,
+    `  code=$(curl -s -o /tmp/.dc_tunnel_body -w "%{http_code}" --max-time 10 "$url" 2>/dev/null || echo "000")`,
+    `  [ "$code" = "000" ] && return 1`,
+    `  # A migrated gateway serves a placeholder page with HTTP 200 — treat it as unreachable.`,
+    `  if grep -q "${DEVBRIDGE_MIGRATION_MARKER}" /tmp/.dc_tunnel_body 2>/dev/null; then return 1; fi`,
+    `  rm -f /tmp/.dc_tunnel_body`,
+    `  [ "$code" = "200" ] || [ "$code" = "304" ] || return 1`,
+    `  return 0`,
+    `}`,
+    `if [ -n "$TUNNEL_ID" ] && probe_tunnel "$TUNNEL_URL"; then`,
+    `  echo "tunnel_url_accessible:PASS ($TUNNEL_URL)"`,
+    `  PASS=$((PASS+1))`,
+    `elif [ -n "$TUNNEL_ID" ]; then`,
+    `  echo "tunnel_url_accessible:FAIL ($TUNNEL_URL -> unreachable, tunnel not found, or migration placeholder page)"`,
     `else`,
-    `  echo "tunnel_url_accessible:FAIL (no tunnel URL)"`,
+    `  echo "tunnel_url_accessible:FAIL (no tunnel)"`,
     `fi`,
+    `rm -f /tmp/.dc_tunnel_body 2>/dev/null || true`,
     ``,
     `${`
 TOTAL=$((TOTAL+1))
@@ -999,7 +1049,7 @@ fi
     if (m) checks[m[1]] = { status: m[2], detail: (m[3] || '').trim() };
   }
   const scoreMatch = cleanStdout.match(/SCORE:(\d+)\/(\d+)/);
-  const tunnelMatch = cleanStdout.match(/TUNNEL_URL:(https:\/\/[^\s]+)/);
+  const tunnelMatch = cleanStdout.match(TUNNEL_URL_PATTERN);
   const complete = /VERDICT:COMPLETE/.test(cleanStdout);
 
   const missing = [];
@@ -1015,6 +1065,18 @@ fi
       ? 'Check output parsing failed — individual check results could not be extracted. See rawOutput for details.'
       : undefined;
 
+  const nextStepValue = !complete
+    ? missing.includes('devbridge_tunnel') || missing.includes('tunnel_url_accessible')
+      ? 'expose_via_devbridge'
+      : missing.includes('nginx_serving')
+        ? 'configure_nginx'
+        : missing.includes('qr_code')
+          ? 'generate_qr_code'
+          : parseWarning
+            ? 'review_raw_output'
+            : 'review_checks'
+    : 'complete';
+
   return {
     ok: true,
     complete,
@@ -1025,17 +1087,8 @@ fi
     missingSteps: missing.length > 0 ? missing.join(', ') : undefined,
     parseWarning,
     rawOutput: parseWarning ? stdout.trim() : undefined,
-    nextStep: !complete
-      ? missing.includes('devbridge_tunnel') || missing.includes('tunnel_url_accessible')
-        ? 'expose_via_devbridge'
-        : missing.includes('nginx_serving')
-          ? 'configure_nginx'
-          : missing.includes('qr_code')
-            ? 'generate_qr_code'
-            : parseWarning
-              ? 'review_raw_output'
-              : 'review_checks'
-      : 'complete',
+    nextStep: nextStepValue,
+    remediation: nextStepValue === 'expose_via_devbridge' ? buildExposeRemediation(port) : undefined,
   };
 }
 

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

@@ -37,7 +37,8 @@ import {
 } from './proxy/proxy-config.mjs';
 import { removeKooCli, removeObsConfig } from './sandbox/uninstall-cleanup.mjs';
 import { mergeCommandStyle, mergeArgsStyle, extractUserDelta, applyUserDelta } from './mcp-config-merge.mjs';
-import { saveAgentDelta, takeAgentDelta, purgeBackup } from './mcp-config-backup.mjs';
+import { readAgentDelta, saveAgentDelta, takeAgentDelta, purgeBackup } from './mcp-config-backup.mjs';
+import { isUsableOfficeaceRoot, readOfficeaceRootMarker, writeOfficeaceRootMarker } from './officeace-paths.mjs';
 import { queryDistTagsFetch, determineTarget, semverCompare } from './update-check.mjs';
 import { getKooCliVersion, compareVersion, kooCliDownloadBase, KOO_CLI_BASE } from './koocli-version.mjs';
 import { findHcloudBin, hcloudProbeNextStep, probeHcloud } from './hcloud-probe.mjs';
@@ -185,11 +186,17 @@ function readOfficeaceRegistryInstallDir() {
 
 function officeaceCapabilitiesDir() {
   const configRoot = process.env.OFFICE_CLAW_CONFIG_ROOT;
-  if (configRoot && existsSync(join(configRoot, 'capabilities.json'))) return configRoot;
+  if (isUsableOfficeaceRoot(configRoot)) return configRoot;
+  const markerRoot = readOfficeaceRootMarker();
+  if (markerRoot) return markerRoot;
+  // Skip system probes (registry / Program Files) so automated environments can
+  // keep OfficeAce detection hermetic — those probes can leak a real OfficeAce
+  // install into a sandboxed/fake HOME (#654).
+  if (process.env.HUAWEICLOUD_DEVKIT_SKIP_OFFICEACE_DETECT === '1') return null;
   const regDir = readOfficeaceRegistryInstallDir();
   if (regDir) {
     const dir = join(regDir, '.office-claw');
-    if (existsSync(join(dir, 'capabilities.json'))) return dir;
+    if (isUsableOfficeaceRoot(dir)) return dir;
   }
   if (platform() === 'win32') {
     const bases = [process.env.ProgramFiles, 'C:\\Program Files', 'D:\\Program Files'];
@@ -197,7 +204,7 @@ function officeaceCapabilitiesDir() {
     for (const base of bases) {
       if (!base) continue;
       const dir = join(base, 'OfficeAce', '.office-claw');
-      if (existsSync(join(dir, 'capabilities.json'))) return dir;
+      if (isUsableOfficeaceRoot(dir)) return dir;
     }
   }
   return null;
@@ -242,7 +249,7 @@ function ensureOfficeaceMcpInSqlite() {
   if (!existsSync(dbPath)) {
     console.log(`  \x1b[31mOfficeAce database not found: ${dbPath}\x1b[0m`);
     console.log(`  \x1b[33mPlease ensure OfficeAce is installed and has been launched at least once.\x1b[0m`);
-    return false;
+    return 'db-missing';
   }
 
   const mcpPath = join(officeacePluginsDir(), 'src', 'mcp-server.mjs').replace(/\\/g, '/');
@@ -281,21 +288,27 @@ function ensureOfficeaceMcpInSqlite() {
       if (existing.command === 'node' && existing.args_json === nextArgsJson && existing.env_json === nextEnvJson) {
         console.log(`  MCP config unchanged: ${dbPath}`);
         db.close();
-        return true;
+        return 'ok';
       }
       db.prepare(
         'UPDATE mcp_connectors SET command = ?, args_json = ?, env_json = ?, updated_at = ?, status = ?, enabled = 1 WHERE id = ?',
       ).run('node', nextArgsJson, nextEnvJson, now, 'disconnected', existing.id);
       console.log(`  MCP config merged (user fields preserved): ${dbPath}`);
     } else {
-      const ownerUserId = officeaceGetOwnerUserId();
+      // Restore user identity + args saved by a previous uninstall (#559).
+      // owner_user_id has no queryable source: we copy it from an existing
+      // row, and fall back to the value backed up before a prior uninstall so
+      // an emptied table does not make registration permanently impossible.
+      const officeaceDelta = readAgentDelta('officeace');
+      const ownerUserId = officeaceGetOwnerUserId() || (officeaceDelta && officeaceDelta.ownerUserId);
       if (!ownerUserId) {
-        console.log(`  \x1b[31mCannot determine owner_user_id from database\x1b[0m`);
+        console.log(`  \x1b[31mCannot determine owner_user_id for the huaweicloud-devkit connector.\x1b[0m`);
+        console.log(
+          `  \x1b[33mThe OfficeAce connector database has no rows to copy the user id from and no prior registration is backed up. Open OfficeAce, add/enable any connector once, then re-run the install.\x1b[0m`,
+        );
         db.close();
-        return false;
+        return 'owner-missing';
       }
-      // Restore user args saved by a previous uninstall (issue #615).
-      const officeaceDelta = takeAgentDelta('officeace');
       const insertArgsJson =
         officeaceDelta && Array.isArray(officeaceDelta.argsExtra)
           ? JSON.stringify([mcpPath, ...officeaceDelta.argsExtra])
@@ -304,10 +317,12 @@ function ensureOfficeaceMcpInSqlite() {
         `INSERT INTO mcp_connectors (id, owner_user_id, type, name, normalized_name, transport, timeout_ms, command, args_json, env_json, enabled, status, created_at, updated_at, version, seeded)
          VALUES (?, ?, 'custom', 'huaweicloud-devkit', 'huaweicloud-devkit', 'stdio', 60000, 'node', ?, ?, 1, 'disconnected', ?, ?, 1, 0)`,
       ).run(randomUUID(), ownerUserId, insertArgsJson, envJson, now, now);
+      // Consume the backup only after a successful insert so a DB failure keeps it for the next retry.
+      takeAgentDelta('officeace');
       console.log(`  MCP config created: ${dbPath}`);
     }
     db.close();
-    return true;
+    return 'ok';
   } catch (error) {
     if (db) {
       try {
@@ -315,7 +330,7 @@ function ensureOfficeaceMcpInSqlite() {
       } catch {}
     }
     console.log(`  \x1b[31mFailed to write MCP config: ${error.message}\x1b[0m`);
-    return false;
+    return 'error';
   }
 }
 
@@ -325,17 +340,28 @@ function removeOfficeaceMcpFromSqlite() {
   let db;
   try {
     db = openOfficeaceDb();
-    // Back up user args before deleting the connector row (issue #615).
+    // Back up user identity + args before deleting the connector row:
+    // owner_user_id is copied from existing rows on reinstall, so an empty
+    // table after this delete would make registration impossible (#559).
     try {
-      const row = db.prepare("SELECT args_json FROM mcp_connectors WHERE name = 'huaweicloud-devkit'").get();
-      const parsed = row ? JSON.parse(row.args_json || '[]') : [];
-      if (Array.isArray(parsed) && parsed.length > 1) {
-        saveAgentDelta('officeace', { argsExtra: parsed.slice(1) });
-      }
+      const row = db
+        .prepare("SELECT owner_user_id, args_json FROM mcp_connectors WHERE name = 'huaweicloud-devkit'")
+        .get();
+      const delta = {};
+      if (row?.owner_user_id) delta.ownerUserId = row.owner_user_id;
+      try {
+        const parsed = row ? JSON.parse(row.args_json || '[]') : [];
+        if (Array.isArray(parsed) && parsed.length > 1) delta.argsExtra = parsed.slice(1);
+      } catch {}
+      if (Object.keys(delta).length > 0) saveAgentDelta('officeace', delta);
+    } catch {}
+    // mcp_connector_tools may not exist on minimal installs — deleting it must
+    // not abort deleting the connector row itself.
+    try {
+      db.prepare(
+        "DELETE FROM mcp_connector_tools WHERE connector_id IN (SELECT id FROM mcp_connectors WHERE name = 'huaweicloud-devkit')",
+      ).run();
     } catch {}
-    db.prepare(
-      "DELETE FROM mcp_connector_tools WHERE connector_id IN (SELECT id FROM mcp_connectors WHERE name = 'huaweicloud-devkit')",
-    ).run();
     const result2 = db.prepare("DELETE FROM mcp_connectors WHERE name = 'huaweicloud-devkit'").run();
     if (result2.changes > 0) {
       console.log(`  MCP config removed: ${dbPath}`);
@@ -565,7 +591,10 @@ function installRuntimeDeps(pluginsDir) {
 function removeIfExists(p) {
   if (existsSync(p)) {
     try {
-      rmSync(p, { recursive: true, force: true });
+      // Retry transient EBUSY/EPERM/ENOTEMPTY (locked files on Windows) before
+      // giving up — uninstall should not leave a skill behind just because a
+      // handle was momentarily open (#556).
+      rmSync(p, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
       return true;
     } catch (error) {
       console.log(`  \x1b[33m[WARN]\x1b[0m Could not remove ${p}: ${error.message}`);
@@ -824,8 +853,7 @@ function uninstallOpenCode() {
   if (existsSync(skills)) {
     for (const entry of readdirSync(skills, { withFileTypes: true })) {
       if (entry.name.startsWith('huawei')) {
-        removeIfExists(join(skills, entry.name));
-        removed++;
+        if (removeIfExists(join(skills, entry.name))) removed++;
       }
     }
     console.log(`  Removed ${removed} skills`);
@@ -836,8 +864,7 @@ function uninstallOpenCode() {
   if (existsSync(commands)) {
     for (const entry of readdirSync(commands, { withFileTypes: true })) {
       if (entry.name.startsWith('huawei')) {
-        removeIfExists(join(commands, entry.name));
-        cmdRemoved++;
+        if (removeIfExists(join(commands, entry.name))) cmdRemoved++;
       }
     }
     if (cmdRemoved > 0) console.log(`  Removed ${cmdRemoved} commands`);
@@ -863,8 +890,7 @@ function pruneStale(targetDir, sourceDir) {
   for (const entry of readdirSync(targetDir, { withFileTypes: true })) {
     if (!entry.name.startsWith('huawei')) continue;
     if (!sourceNames.has(entry.name)) {
-      removeIfExists(join(targetDir, entry.name));
-      removed++;
+      if (removeIfExists(join(targetDir, entry.name))) removed++;
     }
   }
   return removed;
@@ -1011,8 +1037,7 @@ function uninstallOpenClaw() {
   if (existsSync(skillsDir)) {
     for (const entry of readdirSync(skillsDir, { withFileTypes: true })) {
       if (entry.name.startsWith('huawei')) {
-        removeIfExists(join(skillsDir, entry.name));
-        removed++;
+        if (removeIfExists(join(skillsDir, entry.name))) removed++;
       }
     }
     console.log(`  Removed ${removed} skills`);
@@ -1023,8 +1048,7 @@ function uninstallOpenClaw() {
   if (existsSync(cmdDir)) {
     for (const entry of readdirSync(cmdDir, { withFileTypes: true })) {
       if (entry.name.startsWith('huawei')) {
-        removeIfExists(join(cmdDir, entry.name));
-        cmdRemoved++;
+        if (removeIfExists(join(cmdDir, entry.name))) cmdRemoved++;
       }
     }
     if (cmdRemoved > 0) console.log(`  Removed ${cmdRemoved} commands`);
@@ -1170,8 +1194,7 @@ function uninstallCodexDesktop() {
   if (existsSync(skillsDir)) {
     for (const entry of readdirSync(skillsDir, { withFileTypes: true })) {
       if (entry.name.startsWith('huawei')) {
-        removeIfExists(join(skillsDir, entry.name));
-        removed++;
+        if (removeIfExists(join(skillsDir, entry.name))) removed++;
       }
     }
     console.log(`  Removed ${removed} skills`);
@@ -1182,8 +1205,7 @@ function uninstallCodexDesktop() {
   if (existsSync(cmdDir)) {
     for (const entry of readdirSync(cmdDir, { withFileTypes: true })) {
       if (entry.name.startsWith('huawei')) {
-        removeIfExists(join(cmdDir, entry.name));
-        cmdRemoved++;
+        if (removeIfExists(join(cmdDir, entry.name))) cmdRemoved++;
       }
     }
     if (cmdRemoved > 0) console.log(`  Removed ${cmdRemoved} commands`);
@@ -1327,8 +1349,7 @@ function uninstallCodeArts() {
     if (!existsSync(skillsDir)) continue;
     for (const entry of readdirSync(skillsDir, { withFileTypes: true })) {
       if (entry.name.startsWith('huawei')) {
-        removeIfExists(join(skillsDir, entry.name));
-        removed++;
+        if (removeIfExists(join(skillsDir, entry.name))) removed++;
       }
     }
   }
@@ -1488,8 +1509,7 @@ function uninstallCodeArtsWork() {
     let removed = 0;
     for (const entry of readdirSync(skillsDir, { withFileTypes: true })) {
       if (entry.name.startsWith('huawei')) {
-        removeIfExists(join(skillsDir, entry.name));
-        removed++;
+        if (removeIfExists(join(skillsDir, entry.name))) removed++;
       }
     }
     if (removed > 0) console.log(`  Removed ${removed} skills`);
@@ -1776,8 +1796,7 @@ function uninstallWorkBuddy() {
   if (existsSync(skillsDir)) {
     for (const entry of readdirSync(skillsDir, { withFileTypes: true })) {
       if (entry.name.startsWith('huawei')) {
-        removeIfExists(join(skillsDir, entry.name));
-        removed++;
+        if (removeIfExists(join(skillsDir, entry.name))) removed++;
       }
     }
     if (removed > 0) console.log(`  Removed ${removed} skills`);
@@ -1813,9 +1832,10 @@ function uninstallWorkBuddy() {
     if (settings.hooks?.PostToolUse) {
       const before = settings.hooks.PostToolUse.length;
       settings.hooks.PostToolUse = settings.hooks.PostToolUse.filter((e) => e?.matcher !== '*');
-      if (settings.hooks.PostToolUse.length === 0) delete settings.hooks.PostToolUse;
+      const after = settings.hooks.PostToolUse.length;
+      if (after === 0) delete settings.hooks.PostToolUse;
       if (Object.keys(settings.hooks).length === 0) delete settings.hooks;
-      if (before !== settings.hooks.PostToolUse?.length) {
+      if (before !== after) {
         writeFileSync(settingsPath, JSON.stringify(settings, null, 4) + '\n');
         console.log(`  PostToolUse hook removed from ${settingsPath}`);
       }
@@ -1966,8 +1986,7 @@ function uninstallAtomCode() {
   if (existsSync(skillsDir)) {
     for (const entry of readdirSync(skillsDir, { withFileTypes: true })) {
       if (entry.name.startsWith('huawei')) {
-        removeIfExists(join(skillsDir, entry.name));
-        removed++;
+        if (removeIfExists(join(skillsDir, entry.name))) removed++;
       }
     }
     if (removed > 0) console.log(`  Removed ${removed} skills`);
@@ -2281,8 +2300,7 @@ function uninstallDsh() {
   if (existsSync(skillsDir)) {
     for (const entry of readdirSync(skillsDir, { withFileTypes: true })) {
       if (entry.name.startsWith('huawei')) {
-        removeIfExists(join(skillsDir, entry.name));
-        removed++;
+        if (removeIfExists(join(skillsDir, entry.name))) removed++;
       }
     }
     if (removed > 0) console.log(`  Removed ${removed} skills`);
@@ -2377,8 +2395,17 @@ async function installOfficeAce() {
   console.log(`  Safety Policy -> ${join(pluginDest, 'safety')}`);
 
   installRuntimeDeps(pluginDest);
-  ensureOfficeaceMcpInSqlite();
+  if (ensureOfficeaceMcpInSqlite() === 'owner-missing') {
+    throw new Error(
+      'OfficeAce MCP connector registration failed (owner_user_id unavailable). ' +
+        'Open OfficeAce, add/enable any connector once, then re-run install.',
+    );
+  }
   registerOfficeaceSkillEntries();
+  // Persist the resolved root so a later uninstall/update (new process, no
+  // OFFICE_CLAW_CONFIG_ROOT env) still targets the same directory (#559).
+  const resolvedRoot = officeaceCapabilitiesDir();
+  if (resolvedRoot) writeOfficeaceRootMarker(resolvedRoot);
 }
 
 async function updateOfficeAce() {
@@ -2395,8 +2422,15 @@ async function updateOfficeAce() {
   copyDir(safetyDir, join(pluginDest, 'safety'));
   console.log(`  Safety Policy updated -> ${join(pluginDest, 'safety')}`);
   installRuntimeDeps(pluginDest);
-  ensureOfficeaceMcpInSqlite();
+  if (ensureOfficeaceMcpInSqlite() === 'owner-missing') {
+    console.log(
+      `  \x1b[31m[WARN]\x1b[0m OfficeAce MCP connector registration failed (owner_user_id unavailable). ` +
+        `The connector may stay disconnected until you add/enable any connector once in OfficeAce and re-run update.`,
+    );
+  }
   registerOfficeaceSkillEntries();
+  const resolvedRoot = officeaceCapabilitiesDir();
+  if (resolvedRoot) writeOfficeaceRootMarker(resolvedRoot);
   mkdirSync(pluginDest, { recursive: true });
   writeFileSync(join(pluginDest, '.installed'), new Date().toISOString());
 }
@@ -2407,8 +2441,7 @@ function uninstallOfficeAce() {
   if (existsSync(skillsDir)) {
     for (const entry of readdirSync(skillsDir, { withFileTypes: true })) {
       if (entry.name.startsWith('huawei')) {
-        removeIfExists(join(skillsDir, entry.name));
-        removed++;
+        if (removeIfExists(join(skillsDir, entry.name))) removed++;
       }
     }
     if (removed > 0) console.log(`  Removed ${removed} skills`);
@@ -2991,8 +3024,7 @@ function uninstallHermes() {
   if (existsSync(skillsDir)) {
     for (const entry of readdirSync(skillsDir, { withFileTypes: true })) {
       if (entry.name.startsWith('huawei')) {
-        removeIfExists(join(skillsDir, entry.name));
-        removed++;
+        if (removeIfExists(join(skillsDir, entry.name))) removed++;
       }
     }
     if (removed > 0) console.log(`  Removed ${removed} skills`);
@@ -4133,7 +4165,7 @@ async function cmdDoctor() {
     console.log('\x1b[33mFix failures above, then restart your session.\x1b[0m');
   }
   if (fail === 0 && mcpConfigured) {
-    console.log('\n\x1b[32mAll checks passed.\x1b[0m Restart your session, then describe your Huawei Cloud task');
+    console.log('\n\x1b[32mAll checks passed.\x1b[0m You can now describe your Huawei Cloud task');
   }
 
   // Detect "installed but not restarted" — check all supported agents