huaweicloud-devkit 1.1.0-next.9 → 1.1.0

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

@@ -6,7 +6,7 @@ import { spawnSync } from 'node:child_process';
 
 import { evaluateArtifacts, evaluateCommandRisk, evaluateDeployPlan } from './risk-rule-engine.mjs';
 import { classifyTextCommand, redactSecrets } from './safety-policy.mjs';
-import { planHcloudCommand, runHcloud } from './hcloud-cli.mjs';
+import { planHcloudCommand, runHcloud, consumeApprovalToken } from './hcloud-cli.mjs';
 import { searchMarketplace } from './search-market.mjs';
 import { getServiceIcon } from './icon-library.mjs';
 import { detectFramework } from './detect-framework.mjs';
@@ -48,6 +48,10 @@ function codeartsSkillsDir() {
   const home = homedir();
   return join(home, '.codeartsdoer', 'skills');
 }
+function codeartsWorkSkillsDir() {
+  const home = homedir();
+  return join(home, '.codeartswork', 'skills');
+}
 function workbuddySkillsDir() {
   const home = homedir();
   return join(home, '.workbuddy', 'skills');
@@ -102,6 +106,15 @@ function hermesSkillsDir() {
   return join(home, '.hermes', 'skills');
 }
 
+function atomcodeSkillsDir() {
+  const home = process.env.ATOMCODE_HOME || homedir();
+  return join(home, '.atomcode', 'skills');
+}
+
+function codexDesktopSkillsDir() {
+  return join(homedir(), '.agents', 'skills');
+}
+
 export function listSkillDirs(root) {
   if (!existsSync(root)) return [];
   try {
@@ -126,10 +139,13 @@ function resolveSkillsRoot() {
       SKILLS_ROOT_DEV,
       dshSkillsDir(),
       codeartsSkillsDir(),
+      codeartsWorkSkillsDir(),
       opencodeSkillsDir(),
       workbuddySkillsDir(),
       officeaceSkillsRoot(),
       hermesSkillsDir(),
+      atomcodeSkillsDir(),
+      codexDesktopSkillsDir(),
     ]) || SKILLS_ROOT_DEV
   );
 }
@@ -214,16 +230,16 @@ export const TOOL_DEFINITIONS = [
       'Run a write-capable hcloud command only after the exact command has been shown and explicitly approved by the user.',
     inputSchema: {
       type: 'object',
-      required: ['args', 'approvedCommand', 'approvedByUser'],
+      required: ['args', 'approvalToken', 'approvedByUser'],
       properties: {
         args: {
           type: 'array',
           items: { type: 'string' },
           description: 'hcloud arguments, excluding the hcloud executable.',
         },
-        approvedCommand: {
+        approvalToken: {
           type: 'string',
-          description: 'The exact command string previously shown to the user.',
+          description: 'The approvalToken returned by huaweicloud_plan_cli_command.',
         },
         approvedByUser: {
           type: 'boolean',
@@ -449,7 +465,7 @@ export const TOOL_DEFINITIONS = [
         target: {
           type: 'string',
           description:
-            'Agent target to check: opencode, codex, codex-desktop, codearts, workbuddy, dsh, officeace, hermes, openclaw, atomcode, or all (default).',
+            'Agent target to check: opencode, codex, codex-desktop, codearts, codearts-work, workbuddy, dsh, officeace, hermes, openclaw, atomcode, or all (default).',
         },
       },
     },
@@ -464,7 +480,7 @@ export const TOOL_DEFINITIONS = [
         target: {
           type: 'string',
           description:
-            'Agent target to report after sync: opencode, codex, codex-desktop, codearts, workbuddy, dsh, officeace, hermes, or all (default).',
+            'Agent target to report after sync: opencode, codex, codex-desktop, codearts, codearts-work, workbuddy, dsh, officeace, hermes, or all (default).',
         },
       },
     },
@@ -552,7 +568,7 @@ export const TOOL_DEFINITIONS = [
             'Workspace ID from huaweicloud_sandbox_connect return value. Required - must be passed explicitly when HW_WORKSPACE_ID is not set.',
         },
         username: { type: 'string', description: 'Login username (default: root)' },
-        timeout_ms: { type: 'number', description: 'Per-command execution timeout in milliseconds (default: 120000)' },
+        timeout_ms: { type: 'number', description: 'Execution timeout in milliseconds (default: 60000)' },
       },
     },
   },
@@ -614,7 +630,7 @@ export const TOOL_DEFINITIONS = [
         config_name: {
           type: 'string',
           description:
-            'Config file name (without .conf suffix). Defaults to app. Use distinct names (e.g. admin, docs) for multi-app deployments to avoid config overwrites.',
+            'Config file name (without .conf suffix). Defaults to the project name, ensuring each project gets its own config. Override with distinct names (e.g. admin, docs) for sub-app deployments.',
         },
         workspace_id: {
           type: 'string',
@@ -905,7 +921,7 @@ export async function callTool(name, args = {}) {
         );
       }
       const sandboxUser7 = args.username || 'root';
-      const sandboxTimeout7 = args.timeout_ms || 30000;
+      const sandboxTimeout7 = args.timeout_ms || 60000;
       return await deployNginx(
         sandboxWsId7,
         {
@@ -962,7 +978,8 @@ export async function callTool(name, args = {}) {
       return connectResult;
     }
     case 'huaweicloud_sandbox_credentials': {
-      const credResult = await hdkitCredentials(args.session_id, args.dev_stage_id, args.enable_sts !== false);
+      const devStageId = args.dev_stage_id || getCurrentWorkspaceId();
+      const credResult = await hdkitCredentials(args.session_id, devStageId, args.enable_sts !== false);
       const sandboxWsIdCred = args.dev_stage_id || getCurrentWorkspaceId();
       if (sandboxWsIdCred) {
         try {
@@ -1220,12 +1237,17 @@ async function runApprovedCommand(args = {}) {
   if (args.approvedByUser !== true) {
     throw new Error('approvedByUser must be true after explicit user approval for this exact command.');
   }
-  const strictPlan = planHcloudCommand(args.args || [], { allowWrites: false });
-  const plan = planHcloudCommand(args.args || [], { allowWrites: true });
-  if (String(args.approvedCommand || '') !== plan.command) {
-    throw new Error('approvedCommand must exactly match the planned hcloud command.');
+  const token = String(args.approvalToken || '');
+  const storedArgs = consumeApprovalToken(token);
+  if (!storedArgs || storedArgs.length === 0) {
+    throw new Error('Invalid or expired approval token. Please re-plan the command.');
+  }
+  const providedArgs = Array.isArray(args.args) ? args.args.map(String) : [];
+  if (JSON.stringify(storedArgs) !== JSON.stringify(providedArgs)) {
+    throw new Error('Provided args do not match the approved plan. Use the exact args from the plan.');
   }
-  const result = await runHcloud(args.args || [], {
+  const strictPlan = planHcloudCommand(providedArgs, { allowWrites: false });
+  const result = await runHcloud(providedArgs, {
     allowWrites: true,
     timeoutMs: args.timeoutMs,
     maxRetries: args.maxRetries,