@icyfenix-dmla/cli 2026.5.2-2022 → 2026.5.2-2114

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icyfenix-dmla/cli",
-  "version": "2026.5.2-2022",
+  "version": "2026.5.2-2114",
   "description": "DMLA 沙箱服务命令行工具",
   "type": "module",
   "main": "src/index.js",

package/src/commands/data.js

@@ -49,6 +49,16 @@ const DATASETS = [
   }
 ]
 
+/**
+ * 检查是否是用户取消操作（ESC 或 Ctrl+C）
+ * enquirer 可能抛出空字符串错误或包含 'cancel' 的消息
+ */
+function isUserCancel(error) {
+  return !error.message ||
+         error.message === '' ||
+         error.message.includes('cancel')
+}
+
 /**
  * 显示 Banner
  */
@@ -401,19 +411,16 @@ async function downloadDatasets() {
   // 构建选项列表
   const choices = DATASETS.map((dataset, index) => {
     const downloaded = isDatasetDownloaded(dataPath, dataset.id)
-    const isMnist = dataset.id === 'mnist'
 
     let message = `${dataset.name} (${dataset.size})`
     if (downloaded) {
       message += ' [已下载]'
-    } else if (isMnist) {
-      message += ' [训练时自动下载]'
     }
 
     return {
       name: index.toString(),
       message,
-      disabled: downloaded || isMnist
+      disabled: downloaded
     }
   })
 
@@ -428,7 +435,7 @@ async function downloadDatasets() {
       message: '选择要下载的数据集',
       choices,
       hint: '空格选择，回车确认下载',
-      warn: '已下载或自动下载类型'
+      warn: '已下载'
     })
 
     if (!selected || selected.length === 0) {
@@ -444,12 +451,6 @@ async function downloadDatasets() {
       console.log()
       console.log(chalk.cyan(`────────────────────────────────────`))
 
-    // MNIST 特殊处理
-    if (dataset.id === 'mnist') {
-      console.log(chalk.yellow('MNIST 数据集将在训练时通过 torchvision 自动下载'))
-      continue
-    }
-
     // 检查是否已下载
     if (isDatasetDownloaded(dataPath, dataset.id)) {
       console.log(chalk.yellow(`${dataset.name} 已下载，跳过`))
@@ -464,7 +465,7 @@ async function downloadDatasets() {
   console.log(chalk.green('所有选中的数据集已处理完成'))
   } catch (error) {
     // 用户按 ESC 或 Ctrl+C 取消
-    if (error.message && error.message.includes('cancel')) {
+    if (isUserCancel(error)) {
       console.log(chalk.gray('返回上一级'))
       return
     }
@@ -624,49 +625,101 @@ export async function runDataTUI() {
     console.log(chalk.yellow(`数据目录不存在: ${dataPath}`))
     console.log()
 
-    const { create } = await prompt({
-      type: 'confirm',
-      name: 'create',
-      message: '是否创建数据目录?',
-      initial: true
-    })
+    try {
+      const { create } = await prompt({
+        type: 'confirm',
+        name: 'create',
+        message: '是否创建数据目录?',
+        initial: true
+      })
 
-    if (create) {
-      ensureDataDirStructure(dataPath)
-      console.log(chalk.green(`数据目录已创建: ${dataPath}`))
+      if (create) {
+        ensureDataDirStructure(dataPath)
+        console.log(chalk.green(`数据目录已创建: ${dataPath}`))
+      }
+    } catch (error) {
+      if (isUserCancel(error)) {
+        console.log(chalk.gray('已退出数据管理'))
+        console.log()
+        return
+      }
+      throw error
     }
   }
 
   // 主循环
   while (true) {
     console.log()
-    const action = await showMainMenu(dataPath)
-
-    switch (action) {
-      case 1:
-        await mountPath()
-        break
-      case 2:
-        await downloadDatasets()
-        break
-      case 3:
-        listDatasets()
-        break
-      case 4:
-        await clearData()
-        break
-      case 5:
-        await removeData()
-        break
-      case 6:
+    try {
+      const action = await showMainMenu(dataPath)
+
+      switch (action) {
+        case 1:
+          try {
+            await mountPath()
+          } catch (error) {
+            if (isUserCancel(error)) {
+              console.log(chalk.gray('返回主菜单'))
+            } else {
+              throw error
+            }
+          }
+          break
+        case 2:
+          try {
+            await downloadDatasets()
+          } catch (error) {
+            if (isUserCancel(error)) {
+              console.log(chalk.gray('返回主菜单'))
+            } else {
+              throw error
+            }
+          }
+          break
+        case 3:
+          listDatasets()
+          break
+        case 4:
+          try {
+            await clearData()
+          } catch (error) {
+            if (isUserCancel(error)) {
+              console.log(chalk.gray('返回主菜单'))
+            } else {
+              throw error
+            }
+          }
+          break
+        case 5:
+          try {
+            await removeData()
+          } catch (error) {
+            if (isUserCancel(error)) {
+              console.log(chalk.gray('返回主菜单'))
+            } else {
+              throw error
+            }
+          }
+          break
+        case 6:
+          console.log()
+          console.log(chalk.gray('已退出数据管理'))
+          console.log()
+          return
+      }
+
+      // 刷新路径（可能在操作中修改了）
+      dataPath = getDataVolumePath()
+    } catch (error) {
+      // 主菜单按 ESC 取消 -> 退出程序
+      if (isUserCancel(error)) {
         console.log()
         console.log(chalk.gray('已退出数据管理'))
         console.log()
         return
+      }
+      throw error
     }
-
-    // 刷新路径（可能在操作中修改了）
-    dataPath = getDataVolumePath()
   }
 }