openxiangda 1.0.82 → 1.0.83

package/lib/cli.js

@@ -1379,81 +1379,6 @@ async function form(args) {
     return;
   }
 
-  if (subcommand === 'executions') {
-    const [automationKey] = positional;
-    if (!automationKey) fail('用法: openxiangda automation executions <automationCode|automationId>');
-    const target = getWorkspaceTarget(config, profileName, flags);
-    const automationId = resolveAutomationId(target.bound, automationKey, flags);
-    const data = await requestWithAuth(
-      config,
-      target.profileName,
-      apiPathWithQuery(
-        `/openxiangda-api/v1/apps/${encodeURIComponent(target.appType)}/automations/${encodeURIComponent(automationId)}/executions`,
-        {
-          status: flags.status,
-          triggerEventType: flags['trigger-type'],
-          startDate: flags['start-date'],
-          endDate: flags['end-date'],
-          page: flags.page,
-          pageSize: flags['page-size'] || flags.limit,
-        }
-      )
-    );
-    if (flags.json) return writeJson(data);
-    printAutomationExecutionList(data);
-    return;
-  }
-
-  if (subcommand === 'logs') {
-    const [instanceId] = positional;
-    if (!instanceId) fail('用法: openxiangda automation logs <instanceId> [--automation <automationCode|automationId>]');
-    const target = getWorkspaceTarget(config, profileName, flags);
-    const data = await getAutomationExecutionDetailFromCli(
-      config,
-      target,
-      instanceId,
-      flags.automation || flags['automation-code'] || flags['automation-id']
-    );
-    const output = flags.redact ? redactLogValue(data) : data;
-    if (flags.json) return writeJson(output);
-    printAutomationExecutionLogs(output, { summary: Boolean(flags.summary) });
-    return;
-  }
-
-  if (subcommand === 'diagnose') {
-    const [automationKey] = positional;
-    if (!automationKey) fail('用法: openxiangda automation diagnose <automationCode|automationId>');
-    const target = getWorkspaceTarget(config, profileName, flags);
-    const automationId = resolveAutomationId(target.bound, automationKey, flags);
-    const records = await requestWithAuth(
-      config,
-      target.profileName,
-      apiPathWithQuery(
-        `/openxiangda-api/v1/apps/${encodeURIComponent(target.appType)}/automations/${encodeURIComponent(automationId)}/executions`,
-        {
-          status: flags.status || 'failed',
-          page: 1,
-          pageSize: flags['page-size'] || flags.limit || 1,
-        }
-      )
-    );
-    const first = records?.data?.[0];
-    if (!first?.id) {
-      if (flags.json) return writeJson({ found: false, message: '未找到失败执行记录' });
-      print('未找到失败执行记录');
-      return;
-    }
-    const detail = await requestWithAuth(
-      config,
-      target.profileName,
-      `/openxiangda-api/v1/apps/${encodeURIComponent(target.appType)}/automations/${encodeURIComponent(automationId)}/executions/${encodeURIComponent(first.id)}`
-    );
-    const output = flags.redact ? redactLogValue(detail) : detail;
-    if (flags.json) return writeJson({ found: true, detail: output, summary: buildAutomationDiagnosis(output) });
-    print(buildAutomationDiagnosis(output));
-    return;
-  }
-
   if (subcommand === 'publish') {
     const [formKey] = positional;
     if (!formKey || !flags['bundle-url']) {
@@ -1995,6 +1920,81 @@ async function automation(args) {
     return;
   }
 
+  if (subcommand === 'executions') {
+    const [automationKey] = positional;
+    if (!automationKey) fail('用法: openxiangda automation executions <automationCode|automationId>');
+    const target = getWorkspaceTarget(config, profileName, flags);
+    const automationId = resolveAutomationId(target.bound, automationKey, flags);
+    const data = await requestWithAuth(
+      config,
+      target.profileName,
+      apiPathWithQuery(
+        `/openxiangda-api/v1/apps/${encodeURIComponent(target.appType)}/automations/${encodeURIComponent(automationId)}/executions`,
+        {
+          status: flags.status,
+          triggerEventType: flags['trigger-type'],
+          startDate: flags['start-date'],
+          endDate: flags['end-date'],
+          page: flags.page,
+          pageSize: flags['page-size'] || flags.limit,
+        }
+      )
+    );
+    if (flags.json) return writeJson(data);
+    printAutomationExecutionList(data);
+    return;
+  }
+
+  if (subcommand === 'logs') {
+    const [instanceId] = positional;
+    if (!instanceId) fail('用法: openxiangda automation logs <instanceId> [--automation <automationCode|automationId>]');
+    const target = getWorkspaceTarget(config, profileName, flags);
+    const data = await getAutomationExecutionDetailFromCli(
+      config,
+      target,
+      instanceId,
+      flags.automation || flags['automation-code'] || flags['automation-id']
+    );
+    const output = flags.redact ? redactLogValue(data) : data;
+    if (flags.json) return writeJson(output);
+    printAutomationExecutionLogs(output, { summary: Boolean(flags.summary) });
+    return;
+  }
+
+  if (subcommand === 'diagnose') {
+    const [automationKey] = positional;
+    if (!automationKey) fail('用法: openxiangda automation diagnose <automationCode|automationId>');
+    const target = getWorkspaceTarget(config, profileName, flags);
+    const automationId = resolveAutomationId(target.bound, automationKey, flags);
+    const records = await requestWithAuth(
+      config,
+      target.profileName,
+      apiPathWithQuery(
+        `/openxiangda-api/v1/apps/${encodeURIComponent(target.appType)}/automations/${encodeURIComponent(automationId)}/executions`,
+        {
+          status: flags.status || 'failed',
+          page: 1,
+          pageSize: flags['page-size'] || flags.limit || 1,
+        }
+      )
+    );
+    const first = records?.data?.[0];
+    if (!first?.id) {
+      if (flags.json) return writeJson({ found: false, message: '未找到失败执行记录' });
+      print('未找到失败执行记录');
+      return;
+    }
+    const detail = await requestWithAuth(
+      config,
+      target.profileName,
+      `/openxiangda-api/v1/apps/${encodeURIComponent(target.appType)}/automations/${encodeURIComponent(automationId)}/executions/${encodeURIComponent(first.id)}`
+    );
+    const output = flags.redact ? redactLogValue(detail) : detail;
+    if (flags.json) return writeJson({ found: true, detail: output, summary: buildAutomationDiagnosis(output) });
+    print(buildAutomationDiagnosis(output));
+    return;
+  }
+
   if (['publish', 'unpublish', 'enable', 'disable'].includes(subcommand)) {
     const [automationKey] = positional;
     if (!automationKey) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda",
-  "version": "1.0.82",
+  "version": "1.0.83",
   "description": "OpenXiangda CLI, workspace build tools, runtime SDK, and form components.",
   "private": false,
   "bin": {