@rooode/dsh-suite 0.1.5 → 0.1.6

package/bin/cli.js

@@ -39,9 +39,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.6",
   "description": "DeepSeek Harness 一键全功能增强套件 (自动化调度 + WebStorm Git 提交对比 + 代码文档多标签预览 + 对话快捷栏)",
   "type": "module",
   "main": "lib/index.js",
@@ -41,6 +41,7 @@
   "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",