@rooode/dsh-suite 0.1.5 → 0.1.7

package/bin/cli.js

@@ -19,16 +19,66 @@ const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
 
 const rawArgs = process.argv.slice(2);
 
+function getPluginVersion(pluginName) {
+  const pluginShortName = pluginName.split('/')[1] || pluginName;
+  const candidates = [
+    () => {
+      const pkgUrl = import.meta.resolve(`${pluginName}/package.json`);
+      return JSON.parse(fs.readFileSync(fileURLToPath(pkgUrl), 'utf-8')).version;
+    },
+    () => {
+      const p = path.join(rootDir, 'node_modules', '@rooode', pluginShortName, 'package.json');
+      return JSON.parse(fs.readFileSync(p, 'utf-8')).version;
+    },
+    () => {
+      const p = path.resolve(rootDir, '..', pluginShortName, 'package.json');
+      return JSON.parse(fs.readFileSync(p, 'utf-8')).version;
+    },
+    () => {
+      const p = path.resolve(rootDir, '..', '@rooode', pluginShortName, 'package.json');
+      return JSON.parse(fs.readFileSync(p, 'utf-8')).version;
+    },
+    () => {
+      const userHome = process.env.USERPROFILE || process.env.HOME || '';
+      const p = path.join(userHome, '.dsh', 'profiles', 'web', 'node_modules', '@rooode', pluginShortName, 'package.json');
+      return JSON.parse(fs.readFileSync(p, 'utf-8')).version;
+    },
+  ];
+
+  for (const cand of candidates) {
+    try {
+      const v = cand();
+      if (v) return `v${v}`;
+    } catch (e) {}
+  }
+
+  const declared = pkg.dependencies?.[pluginName];
+  if (declared) return declared.replace(/^[\^~]/, 'v');
+  return '';
+}
+
+function formatPluginLine(icon, name, desc, colorCode) {
+  const ver = getPluginVersion(name);
+  const tag = `[${name}] (${ver})`;
+  const paddedTag = tag.padEnd(41, ' ');
+  return `  \x1b[${colorCode}${icon} ${paddedTag}\x1b[0m  ${desc}`;
+}
+
 function printBanner() {
+  const lineAuto = formatPluginLine('⚡', '@rooode/dsh-plugin-automation', '24/7 Node 服务端常驻自动化与调度中心', '33m');
+  const lineGit  = formatPluginLine('🗂️', '@rooode/dsh-plugin-git', 'WebStorm 风格 Git 提交与双栏 Diff 对比', '35m');
+  const linePrev = formatPluginLine('📝', '@rooode/dsh-plugin-preview', '多标签代码/文档预览与工作空间文件树', '34m');
+  const lineQk   = formatPluginLine('📌', '@rooode/dsh-plugin-quickbar', '输入框上方工作空间快捷指令栏', '32m');
+
   console.log(`
 \x1b[36m===============================================================================\x1b[0m
   \x1b[1m\x1b[32m🚀 DeepSeek Harness All-in-One Suite\x1b[0m \x1b[90m(v${pkg.version})\x1b[0m
   \x1b[90mPackage: @rooode/dsh-suite | Powered by Cordis & DSH\x1b[0m
 \x1b[36m===============================================================================\x1b[0m
-  \x1b[33m⚡ [@rooode/dsh-plugin-automation]\x1b[0m  24/7 Node 服务端常驻自动化与调度中心
-  \x1b[35m🗂️ [@rooode/dsh-plugin-git]\x1b[0m         WebStorm 风格 Git 提交与双栏 Diff 对比
-  \x1b[34m📝 [@rooode/dsh-plugin-preview]\x1b[0m     多标签代码/文档预览与工作空间文件树
-  \x1b[32m📌 [@rooode/dsh-plugin-quickbar]\x1b[0m    输入框上方工作空间快捷指令栏
+${lineAuto}
+${lineGit}
+${linePrev}
+${lineQk}
 \x1b[36m-------------------------------------------------------------------------------\x1b[0m
 `);
 }
@@ -39,9 +89,52 @@ function quoteArg(arg) {
   return JSON.stringify(arg);
 }
 
+function findDshEntry() {
+  // 1. Try import.meta.resolve
+  try {
+    const dshPkgUrl = import.meta.resolve('@deepseek-ai/dsh/package.json');
+    if (dshPkgUrl) {
+      const dshDir = path.dirname(fileURLToPath(dshPkgUrl));
+      const binJs = path.join(dshDir, 'lib', 'bin.js');
+      if (fs.existsSync(binJs)) {
+        return { type: 'node', path: binJs };
+      }
+    }
+  } catch (e) {}
+
+  // 2. Try candidate local, workspace, and global node_modules paths
+  const globalNpmDir = process.env.APPDATA ? path.join(process.env.APPDATA, 'npm', 'node_modules') : '';
+  const candidates = [
+    path.join(rootDir, 'node_modules', '@deepseek-ai', 'dsh', 'lib', 'bin.js'),
+    path.resolve(rootDir, '..', 'node_modules', '@deepseek-ai', 'dsh', 'lib', 'bin.js'),
+    path.resolve(rootDir, '..', 'deepseek-harness', 'apps', 'cli', 'lib', 'bin.js'),
+    globalNpmDir ? path.join(globalNpmDir, '@deepseek-ai', 'dsh', 'lib', 'bin.js') : '',
+    '/usr/local/lib/node_modules/@deepseek-ai/dsh/lib/bin.js',
+    '/usr/lib/node_modules/@deepseek-ai/dsh/lib/bin.js',
+  ].filter(Boolean);
+
+  for (const cand of candidates) {
+    if (fs.existsSync(cand)) {
+      return { type: 'node', path: cand };
+    }
+  }
+
+  // 3. Fallback to npx
+  return { type: 'npx' };
+}
+
 function execDsh(args) {
-  // 增加 -y 避免首次运行时 npx 弹出交互提示阻塞
-  const fullCommand = ['npx', '-y', ...args.map(quoteArg)].join(' ');
+  const cleanArgs = args[0] === '@deepseek-ai/dsh' ? args.slice(1) : args;
+  const dsh = findDshEntry();
+
+  if (dsh.type === 'node') {
+    return spawn(process.execPath, [dsh.path, ...cleanArgs], {
+      stdio: 'inherit',
+    });
+  }
+
+  // Fallback to npx with -y to prevent interactive hanging
+  const fullCommand = ['npx', '-y', '@deepseek-ai/dsh', ...cleanArgs.map(quoteArg)].join(' ');
   return spawn(fullCommand, {
     stdio: 'inherit',
     shell: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rooode/dsh-suite",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "DeepSeek Harness 一键全功能增强套件 (自动化调度 + WebStorm Git 提交对比 + 代码文档多标签预览 + 对话快捷栏)",
   "type": "module",
   "main": "lib/index.js",
@@ -41,10 +41,11 @@
   "author": "rooode",
   "license": "MIT",
   "dependencies": {
+    "@deepseek-ai/dsh": "^0.1.1-rc.2",
     "@rooode/dsh-plugin-automation": "^0.2.2",
     "@rooode/dsh-plugin-git": "^0.1.2",
-    "@rooode/dsh-plugin-preview": "^0.1.9",
-    "@rooode/dsh-plugin-quickbar": "^0.1.3"
+    "@rooode/dsh-plugin-preview": "^0.1.10",
+    "@rooode/dsh-plugin-quickbar": "^0.1.4"
   },
   "dsh": {
     "bundle": {