deepminer-cli 0.1.25 → 0.1.26

package/README.md

@@ -11,7 +11,7 @@ DeepMiner 系统的命令行工具，用于管理认证、配置和 AI 会话。
 - **配置管理**: API 端点配置
 - **安全存储**: Token 以受限权限存储在本地
 - **文件上传**: 上传文件到 OSS，带文件大小验证
-- **AI 会话**: 启动 AI 助手会话，支持自定义消息和 claw_param 参数
+- **AI 会话**: 启动/继续/停止 AI 助手会话，支持自定义消息、会话追问和 claw_param 参数
 - **JSON 输出**: 所有命令支持 `--json` 结构化输出，适合 AI agent 和脚本调用
 - **错误提示**: 错误响应包含 `hint` 字段，提供可操作的修复建议
 - **Dry Run**: `--dry-run` 预览 HTTP 请求而不实际执行
@@ -50,9 +50,15 @@ dm-cli auth switch <space_id>
 # 4. 查看状态
 dm-cli auth status
 
-# 5. 启动 AI 会话
+# 5. 启动 AI 会话（返回 agent_run_id、thread_id）
 dm-cli agent start-thread --message "你好"
 
+# 5a. 在已有会话中继续追问
+dm-cli agent start-thread --message "继续聊" --thread-id <thread_id>
+
+# 5b. 停止正在运行的 Agent
+dm-cli agent stop --agent-run-id <agent_run_id>
+
 # 6. 上传文件
 dm-cli file upload --file document.pdf
 
@@ -112,7 +118,9 @@ dm-cli file upload --file <路径> --id <ID>              # 上传文件（指
 ```bash
 dm-cli agent start-thread                                              # 使用默认消息 "你好"
 dm-cli agent start-thread --message <消息>                             # 自定义消息
-dm-cli agent start-thread --message <消息> --claw-param <JSON>         # 完整参数
+dm-cli agent start-thread --message <消息> --thread-id <会话ID>        # 在已有会话中继续追问
+dm-cli agent start-thread --message <消息> --claw-param <JSON>         # 附带渠道参数
+dm-cli agent stop --agent-run-id <运行ID>                              # 停止正在运行的 Agent
 ```
 
 #### claw_param 参数说明

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepminer-cli",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "DeepMiner CLI - Command-line tool for DM system with cross-platform support, JWT authentication, and workspace management",
   "keywords": [
     "deepminer",

package/scripts/_dm-cli

@@ -1,43 +1,199 @@
 #compdef dm-cli
 
 _dm_cli() {
-  local -a commands
-  local -i idx
-
-  # 找到当前位置
-  for ((idx = 2; idx < $#words; idx++)); do
-    if [[ "${words[idx]}" != -* ]]; then
-      break
-    fi
-  done
-
-  # 如果只有 dm-cli，显示顶级命令
-  if [[ $idx -eq $#words ]]; then
-    commands=(
-      'config:管理配置'
-      'auth:用户认证'
-      'agent:AI 助手相关命令'
-      'file:文件管理'
-      'schema:输出 CLI Schema 定义'
-      'version:显示版本号'
-    )
-    _describe 'command' commands
-    return
-  fi
-
-  # 根据第一个参数显示子命令
-  case "${words[$idx]}" in
-    config)
-      _describe 'config subcommand' '(init:初始化配置 show:显示配置)'
-      ;;
-    auth)
-      _describe 'auth subcommand' '(login:登录 logout:登出 status:显示状态 switch:切换空间)'
-      ;;
-    agent)
-      _describe 'agent subcommand' '(start-thread:发起AI会话)'
-      ;;
-    file)
-      _describe 'file subcommand' '(upload:上传文件)'
+  local context state state_descr line
+  typeset -A opt_args
+
+  _arguments -C \
+    '--json[以 JSON 格式输出]' \
+    '--dry-run[预览请求而不执行]' \
+    '(- *)--help[显示帮助]' \
+    '(-): :->command' \
+    '(-)*:: :->args'
+
+  case "$state" in
+    command)
+      local -a commands=(
+        'config:管理配置'
+        'auth:用户认证'
+        'agent:AI 助手相关命令'
+        'file:文件管理'
+        'schema:输出 CLI Schema 定义'
+        'version:显示版本号'
+      )
+      _describe -t commands 'command' commands
+      ;;
+    args)
+      case "${line[1]}" in
+        config) _dm_cli_config ;;
+        auth)   _dm_cli_auth ;;
+        agent)  _dm_cli_agent ;;
+        file)   _dm_cli_file ;;
+        schema) _dm_cli_schema ;;
+      esac
+      ;;
+  esac
+}
+
+_dm_cli_config() {
+  local context state state_descr line
+  typeset -A opt_args
+
+  _arguments -C \
+    '(-): :->subcommand' \
+    '(-)*:: :->args'
+
+  case "$state" in
+    subcommand)
+      local -a subcommands=(
+        'init:初始化配置'
+        'show:显示当前配置'
+      )
+      _describe -t subcommands 'subcommand' subcommands
+      ;;
+    args)
+      case "${line[1]}" in
+        init)
+          _arguments \
+            '--endpoint=[API 端点 URL]:url' \
+            '--json[以 JSON 格式输出]' \
+            '--dry-run[预览请求]' \
+            '--help[显示帮助]'
+          ;;
+        show)
+          _arguments \
+            '--json[以 JSON 格式输出]' \
+            '--dry-run[预览请求]' \
+            '--help[显示帮助]'
+          ;;
+      esac
+      ;;
+  esac
+}
+
+_dm_cli_auth() {
+  local context state state_descr line
+  typeset -A opt_args
+
+  _arguments -C \
+    '(-): :->subcommand' \
+    '(-)*:: :->args'
+
+  case "$state" in
+    subcommand)
+      local -a subcommands=(
+        'login:登录 DM 系统'
+        'logout:退出登录'
+        'status:显示登录状态'
+        'switch:切换空间'
+      )
+      _describe -t subcommands 'subcommand' subcommands
+      ;;
+    args)
+      case "${line[1]}" in
+        login)
+          _arguments \
+            '--username=[用户名]:username' \
+            '--password=[密码]:password' \
+            '--json[以 JSON 格式输出]' \
+            '--dry-run[预览请求]' \
+            '--help[显示帮助]'
+          ;;
+        logout|status)
+          _arguments \
+            '--json[以 JSON 格式输出]' \
+            '--dry-run[预览请求]' \
+            '--help[显示帮助]'
+          ;;
+        switch)
+          _arguments \
+            '1:space_id' \
+            '--json[以 JSON 格式输出]' \
+            '--dry-run[预览请求]' \
+            '--help[显示帮助]'
+          ;;
+      esac
       ;;
   esac
 }
+
+_dm_cli_agent() {
+  local context state state_descr line
+  typeset -A opt_args
+
+  _arguments -C \
+    '(-): :->subcommand' \
+    '(-)*:: :->args'
+
+  case "$state" in
+    subcommand)
+      local -a subcommands=(
+        'start-thread:发起 AI 会话'
+        'stop:停止 Agent 运行'
+      )
+      _describe -t subcommands 'subcommand' subcommands
+      ;;
+    args)
+      case "${line[1]}" in
+        start-thread)
+          _arguments \
+            '--message=[消息内容]:message' \
+            '--thread-id=[会话 ID]:thread_id' \
+            '--claw-param=[JSON 参数]:json' \
+            '--json[以 JSON 格式输出]' \
+            '--dry-run[预览请求]' \
+            '--help[显示帮助]'
+          ;;
+        stop)
+          _arguments \
+            '--agent-run-id=[Agent 运行 ID]:run_id' \
+            '--json[以 JSON 格式输出]' \
+            '--dry-run[预览请求]' \
+            '--help[显示帮助]'
+          ;;
+      esac
+      ;;
+  esac
+}
+
+_dm_cli_file() {
+  local context state state_descr line
+  typeset -A opt_args
+
+  _arguments -C \
+    '(-): :->subcommand' \
+    '(-)*:: :->args'
+
+  case "$state" in
+    subcommand)
+      local -a subcommands=(
+        'upload:上传文件'
+      )
+      _describe -t subcommands 'subcommand' subcommands
+      ;;
+    args)
+      case "${line[1]}" in
+        upload)
+          _arguments \
+            '--file=[文件路径]:file:_files' \
+            '--name=[远程文件名]:name' \
+            '--feature=[功能类型]:feature' \
+            '--id=[文件 ID]:id' \
+            '--json[以 JSON 格式输出]' \
+            '--dry-run[预览请求]' \
+            '--help[显示帮助]'
+          ;;
+      esac
+      ;;
+  esac
+}
+
+_dm_cli_schema() {
+  _arguments \
+    '--pretty[格式化输出 JSON]' \
+    '--json[以 JSON 格式输出]' \
+    '--dry-run[预览请求]' \
+    '--help[显示帮助]'
+}
+
+_dm_cli "$@"

package/scripts/run.js

@@ -4,6 +4,9 @@ const { spawn, execSync } = require('child_process');
 const path = require('path');
 const os = require('os');
 const fs = require('fs');
+const https = require('https');
+
+const pkg = require('../package.json');
 
 const platform = os.platform();
 const arch = os.arch();
@@ -32,47 +35,170 @@ const isWindows = platform === 'win32';
 const binaryName = `dm-cli-${stdPlatform}-${stdArch}${isWindows ? '.exe' : ''}`;
 const binaryPath = path.join(__dirname, '..', 'bin', binaryName);
 
-// Ensure symlink exists on first run (for global installs)
-try {
-  const npmPrefix = execSync('npm config get prefix', { encoding: 'utf-8', stdio: 'pipe' }).trim();
-  const npmBinDir = path.join(npmPrefix, 'bin');
-  const npmBinPath = path.join(npmBinDir, 'dm-cli');
-  const thisFile = __filename;
-
-  if (!fs.existsSync(npmBinPath) && platform !== 'win32') {
-    try {
-      execSync(`ln -sf "${thisFile}" "${npmBinPath}"`, { stdio: 'ignore' });
-    } catch (e) {
-      // Silent fail
+// --- Auto-update logic ---
+
+const UPDATE_CHECK_INTERVAL = 60 * 60 * 1000; // 1 hour
+const CACHE_DIR = path.join(os.homedir(), '.dm-cli');
+const CACHE_FILE = path.join(CACHE_DIR, '.update-check');
+
+function readCache() {
+  try {
+    const data = JSON.parse(fs.readFileSync(CACHE_FILE, 'utf-8'));
+    return data;
+  } catch {
+    return null;
+  }
+}
+
+function writeCache(latest) {
+  try {
+    if (!fs.existsSync(CACHE_DIR)) {
+      fs.mkdirSync(CACHE_DIR, { recursive: true });
     }
+    fs.writeFileSync(CACHE_FILE, JSON.stringify({
+      checkedAt: Date.now(),
+      latest
+    }));
+  } catch {
+    // silent
   }
-} catch (e) {
-  // Silent fail
 }
 
-// Spawn the binary and forward all arguments
-const child = spawn(binaryPath, process.argv.slice(2), {
-  stdio: 'inherit',
-  windowsHide: true
-});
-
-child.on('error', (err) => {
-  if (err.code === 'ENOENT') {
-    console.error(`❌ Binary not found: ${binaryPath}`);
-  } else {
-    console.error(`❌ Error: ${err.message}`);
+function fetchLatestVersion() {
+  return new Promise((resolve, reject) => {
+    const req = https.get('https://registry.npmjs.org/deepminer-cli/latest', { timeout: 5000 }, res => {
+      let data = '';
+      res.on('data', chunk => data += chunk);
+      res.on('end', () => {
+        try {
+          resolve(JSON.parse(data).version);
+        } catch {
+          reject(new Error('parse error'));
+        }
+      });
+    });
+    req.on('error', reject);
+    req.on('timeout', () => { req.destroy(); reject(new Error('timeout')); });
+  });
+}
+
+function compareVersions(a, b) {
+  const pa = a.split('.').map(Number);
+  const pb = b.split('.').map(Number);
+  for (let i = 0; i < 3; i++) {
+    if ((pa[i] || 0) < (pb[i] || 0)) return -1;
+    if ((pa[i] || 0) > (pb[i] || 0)) return 1;
   }
-  process.exit(1);
-});
+  return 0;
+}
 
-process.on('SIGINT', () => {
-  child.kill('SIGINT');
-});
+function doUpdate() {
+  console.error(`⬆️  正在自动更新 dm-cli ...`);
+  try {
+    execSync('npm install -g deepminer-cli', { stdio: 'inherit', timeout: 60000 });
+    console.error(`✅ dm-cli 已更新到最新版本`);
+    return true;
+  } catch {
+    console.error(`⚠️  自动更新失败，继续使用当前版本`);
+    return false;
+  }
+}
 
-process.on('SIGTERM', () => {
-  child.kill('SIGTERM');
-});
+async function checkAndUpdate() {
+  const currentVersion = pkg.version;
+
+  // Check cache first
+  const cache = readCache();
+  if (cache && (Date.now() - cache.checkedAt) < UPDATE_CHECK_INTERVAL) {
+    // Within cache window, use cached result
+    if (cache.latest && compareVersions(currentVersion, cache.latest) < 0) {
+      return doUpdate();
+    }
+    return false;
+  }
+
+  // Fetch latest version from npm
+  try {
+    const latest = await fetchLatestVersion();
+    writeCache(latest);
+    if (compareVersions(currentVersion, latest) < 0) {
+      return doUpdate();
+    }
+  } catch {
+    // Network error, skip update check
+  }
+  return false;
+}
+
+// --- Main execution ---
+
+async function main() {
+  // Skip update check for version/help commands or if DM_CLI_NO_UPDATE is set
+  const args = process.argv.slice(2);
+  const skipUpdate = process.env.DM_CLI_NO_UPDATE === '1'
+    || args.includes('version')
+    || args.includes('--help')
+    || args.includes('-h');
+
+  if (!skipUpdate) {
+    const updated = await checkAndUpdate();
+    if (updated) {
+      // After update, re-exec with the new binary
+      const child = spawn(process.argv[0], process.argv.slice(1), {
+        stdio: 'inherit',
+        env: { ...process.env, DM_CLI_NO_UPDATE: '1' },
+        windowsHide: true
+      });
+      child.on('exit', code => process.exit(code || 0));
+      child.on('error', () => process.exit(1));
+      return;
+    }
+  }
+
+  // Ensure symlink exists on first run (for global installs)
+  try {
+    const npmPrefix = execSync('npm config get prefix', { encoding: 'utf-8', stdio: 'pipe' }).trim();
+    const npmBinDir = path.join(npmPrefix, 'bin');
+    const npmBinPath = path.join(npmBinDir, 'dm-cli');
+    const thisFile = __filename;
+
+    if (!fs.existsSync(npmBinPath) && platform !== 'win32') {
+      try {
+        execSync(`ln -sf "${thisFile}" "${npmBinPath}"`, { stdio: 'ignore' });
+      } catch (e) {
+        // Silent fail
+      }
+    }
+  } catch (e) {
+    // Silent fail
+  }
+
+  // Spawn the binary and forward all arguments
+  const child = spawn(binaryPath, args, {
+    stdio: 'inherit',
+    windowsHide: true
+  });
+
+  child.on('error', (err) => {
+    if (err.code === 'ENOENT') {
+      console.error(`❌ Binary not found: ${binaryPath}`);
+    } else {
+      console.error(`❌ Error: ${err.message}`);
+    }
+    process.exit(1);
+  });
+
+  process.on('SIGINT', () => {
+    child.kill('SIGINT');
+  });
+
+  process.on('SIGTERM', () => {
+    child.kill('SIGTERM');
+  });
+
+  child.on('exit', (code) => {
+    process.exit(code);
+  });
+}
 
-child.on('exit', (code) => {
-  process.exit(code);
-});
+main();