@icyfenix-dmla/cli 2026.5.24-1015 → 2026.5.24-2045

package/package.json

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

package/src/commands/data.js

@@ -8,8 +8,7 @@ const { prompt } = pkg
 import fs from 'fs'
 import path from 'path'
 import os from 'os'
-import { spawn } from 'child_process'
-import { execSync } from 'child_process'
+import { spawn, execSync } from '../verbose.js'
 import AdmZip from 'adm-zip'
 
 // 配置文件路径
@@ -310,10 +309,11 @@ async function showMainMenu(dataPath) {
   const choices = [
     { name: '1', message: '挂载路径设置        ' + chalk.gray(`[当前: ${dataPath}]`) },
     { name: '2', message: '下载数据集' },
-    { name: '3', message: '查看数据集列表' },
-    { name: '4', message: '清空数据内容' },
-    { name: '5', message: '删除数据卷' },
-    { name: '6', message: '退出' }
+    { name: '3', message: '删除数据集' },
+    { name: '4', message: '查看数据集列表' },
+    { name: '5', message: '清空数据内容' },
+    { name: '6', message: '删除数据卷' },
+    { name: '7', message: '退出' }
   ]
 
   const { action } = await prompt({
@@ -461,6 +461,117 @@ async function removeData() {
   console.log(chalk.green('数据卷已删除'))
 }
 
+/**
+ * 删除数据集子菜单
+ */
+async function deleteDatasets() {
+  const dataPath = getDataVolumePath()
+
+  console.log()
+  console.log(chalk.bold('删除数据集'))
+  console.log()
+
+  // 收集已下载（含不完整）的数据集
+  const existingDatasets = DATASETS.filter(d => isDatasetExists(dataPath, d.id))
+
+  if (existingDatasets.length === 0) {
+    console.log(chalk.yellow('没有已下载的数据集'))
+    return
+  }
+
+  // 构建选项列表
+  const choices = existingDatasets.map((dataset) => {
+    const downloaded = isDatasetDownloaded(dataPath, dataset.id)
+    const incomplete = isDatasetIncomplete(dataPath, dataset.id)
+
+    let message = `${dataset.name} (${dataset.size})`
+    if (downloaded) {
+      message += ' [可用]'
+    } else if (incomplete) {
+      message += ' [不完整]'
+    } else {
+      message += ' [存在]'
+    }
+
+    return {
+      name: dataset.id,
+      message
+    }
+  })
+
+  console.log(chalk.gray('操作: 上下键移动，空格勾选/取消，回车确认，ESC 返回'))
+  console.log()
+
+  try {
+    const { selected } = await prompt({
+      type: 'multiselect',
+      name: 'selected',
+      message: '选择要删除的数据集',
+      choices,
+      hint: '空格选择，回车确认删除',
+      styles: {
+        primary: chalk.cyan.bold
+      }
+    })
+
+    if (!selected || selected.length === 0) {
+      console.log(chalk.yellow('未选择任何数据集'))
+      return
+    }
+
+    // 确认删除
+    const selectedNames = selected.map(id => {
+      const ds = existingDatasets.find(d => d.id === id)
+      return ds.name
+    })
+
+    console.log()
+    console.log(chalk.red(`将删除以下数据集: ${selectedNames.join(', ')}`))
+
+    const { confirm } = await prompt({
+      type: 'confirm',
+      name: 'confirm',
+      message: '确认删除?',
+      initial: false
+    })
+
+    if (!confirm) {
+      console.log(chalk.yellow('操作已取消'))
+      return
+    }
+
+    // 执行删除
+    for (const datasetId of selected) {
+      const dataset = DATASETS.find(d => d.id === datasetId)
+      const targetDir = path.join(dataPath, dataset.targetDir)
+
+      if (fs.existsSync(targetDir)) {
+        fs.rmSync(targetDir, { recursive: true, force: true })
+        console.log(chalk.green(`已删除: ${dataset.name}`))
+      }
+
+      // 更新配置
+      const config = readConfig()
+      if (config.installedDatasets) {
+        config.installedDatasets = config.installedDatasets.filter(id => id !== datasetId)
+      }
+      if (config.incompleteDatasets) {
+        config.incompleteDatasets = config.incompleteDatasets.filter(id => id !== datasetId)
+      }
+      writeConfig(config)
+    }
+
+    console.log()
+    console.log(chalk.green('删除完成'))
+  } catch (error) {
+    if (isUserCancel(error)) {
+      console.log(chalk.gray('返回上一级'))
+      return
+    }
+    throw error
+  }
+}
+
 /**
  * 查看数据集列表
  */
@@ -1002,9 +1113,20 @@ export async function runDataTUI() {
           }
           break
         case 3:
-          listDatasets()
+          try {
+            await deleteDatasets()
+          } catch (error) {
+            if (isUserCancel(error)) {
+              console.log(chalk.gray('返回主菜单'))
+            } else {
+              throw error
+            }
+          }
           break
         case 4:
+          listDatasets()
+          break
+        case 5:
           try {
             await clearData()
           } catch (error) {
@@ -1015,7 +1137,7 @@ export async function runDataTUI() {
             }
           }
           break
-        case 5:
+        case 6:
           try {
             await removeData()
           } catch (error) {
@@ -1026,7 +1148,7 @@ export async function runDataTUI() {
             }
           }
           break
-        case 6:
+        case 7:
           console.log()
           console.log(chalk.gray('已退出数据管理'))
           console.log()
@@ -1077,6 +1199,9 @@ export async function runDataCommand(subCommand, options) {
     case 'download':
       await downloadDatasets()
       break
+    case 'delete':
+      await deleteDatasets()
+      break
     default:
       // 无子命令时进入 TUI
       await runDataTUI()

package/src/commands/manage.js

@@ -3,7 +3,7 @@
  */
 import chalk from 'chalk'
 import Docker from 'dockerode'
-import { spawn, execSync } from 'child_process'
+import { spawn, execSync } from '../verbose.js'
 import http from 'http'
 import path from 'path'
 import { fileURLToPath } from 'url'

package/src/commands/server.js

@@ -3,7 +3,7 @@
  */
 import chalk from 'chalk'
 import Docker from 'dockerode'
-import { spawn } from 'child_process'
+import { spawn, execSync } from '../verbose.js'
 import http from 'http'
 import path from 'path'
 import { fileURLToPath, pathToFileURL } from 'url'

package/src/commands/update.js

@@ -3,7 +3,7 @@
  * 通过 npm 更新程序
  */
 import chalk from 'chalk'
-import { execSync } from 'child_process'
+import { execSync } from '../verbose.js'
 
 /**
  * 运行 update 命令

package/src/index.js

@@ -12,6 +12,7 @@ import { runDoctor } from './commands/manage.js'
 import { runDataTUI, runDataCommand } from './commands/data.js'
 import { runImagesTUI } from './commands/images.js'
 import { runUpdate } from './commands/update.js'
+import { setVerbose } from './verbose.js'
 
 // 从 package.json 读取版本号
 const __filename = fileURLToPath(import.meta.url)
@@ -85,6 +86,13 @@ program
   .version(VERSION, '-v, --version', '显示版本号')
   .helpOption('-h, --help', '显示帮助信息')
   .addHelpCommand('help [command]', '显示命令帮助信息')
+  .option('--verbose', '显示所有执行的外部命令，便于调试')
+
+// 解析全局选项（需要在子命令 action 之前解析，以便设置 verbose 开关）
+program.parseOptions(process.argv)
+if (program.opts().verbose) {
+  setVerbose(true)
+}
 
 // ─────────────────────────────────────────────────────────────
 // start 命令

package/src/verbose.js

@@ -0,0 +1,51 @@
+/**
+ * 命令执行封装
+ * --verbose 模式下打印所有执行的外部命令，方便调试
+ */
+import { execSync as nodeExecSync, spawn as nodeSpawn } from 'child_process'
+
+// 全局 verbose 开关
+let verboseEnabled = false
+
+/**
+ * 启用/禁用 verbose 模式
+ */
+export function setVerbose(enabled) {
+  verboseEnabled = !!enabled
+}
+
+/**
+ * 查询 verbose 模式状态
+ */
+export function isVerbose() {
+  return verboseEnabled
+}
+
+/**
+ * 打印 verbose 日志（仅在 verbose 模式下输出）
+ */
+function verboseLog(cmd, args) {
+  if (!verboseEnabled) return
+  const fullCmd = args && args.length > 0
+    ? `${cmd} ${args.map(a => `'${a}'`).join(' ')}`
+    : cmd
+  console.log(`[verbose] $ ${fullCmd}`)
+}
+
+/**
+ * 封装 execSync，verbose 模式下打印命令
+ * 参数与原生 execSync 完全一致
+ */
+export function execSync(command, options) {
+  verboseLog(command)
+  return nodeExecSync(command, options)
+}
+
+/**
+ * 封装 spawn，verbose 模式下打印命令
+ * 参数与原生 spawn 完全一致
+ */
+export function spawn(command, args, options) {
+  verboseLog(command, args)
+  return nodeSpawn(command, args, options)
+}

package/version.json

@@ -1,4 +1,4 @@
 {
-  "buildTime": "2026-05-24T02:17:04.071Z",
-  "cliVersion": "2026.5.24-1015"
+  "buildTime": "2026-05-24T12:46:48.154Z",
+  "cliVersion": "2026.5.24-2045"
 }