@rooode/dsh-suite 0.1.1 → 0.1.3

package/bin/cli.js

@@ -13,7 +13,6 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const rootDir = path.resolve(__dirname, '..');
-const patchPath = path.join(rootDir, 'cordis.patch.yml');
 const pkgPath = path.join(rootDir, 'package.json');
 
 const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
@@ -34,6 +33,126 @@ function printBanner() {
 `);
 }
 
+function quoteArg(arg) {
+  if (typeof arg !== 'string') return String(arg);
+  if (/^[a-zA-Z0-9_\-\.\:\/\\]+$/.test(arg)) return arg;
+  return JSON.stringify(arg);
+}
+
+function execDsh(args) {
+  const fullCommand = ['npx', ...args.map(quoteArg)].join(' ');
+  return spawn(fullCommand, {
+    stdio: 'inherit',
+    shell: true,
+  });
+}
+
+function copyFolderSync(src, dest) {
+  fs.mkdirSync(dest, { recursive: true });
+  const entries = fs.readdirSync(src, { withFileTypes: true });
+  for (const entry of entries) {
+    if (entry.name === 'node_modules' || entry.name === '.git') continue;
+    const srcPath = path.join(src, entry.name);
+    const destPath = path.join(dest, entry.name);
+    if (entry.isDirectory()) {
+      copyFolderSync(srcPath, destPath);
+    } else {
+      fs.copyFileSync(srcPath, destPath);
+    }
+  }
+}
+
+/**
+ * Automatically reconcile ~/.dsh/profiles/web/package.json
+ * to ensure all 4 plugins are registered in dsh.profile.bundles without duplicates.
+ */
+function ensureProfileConfigured() {
+  const userHome = process.env.USERPROFILE || process.env.HOME || '';
+  if (!userHome) return;
+
+  const dshDir = path.join(userHome, '.dsh');
+  const webProfileDir = path.join(dshDir, 'profiles', 'web');
+  const profilePkgPath = path.join(webProfileDir, 'package.json');
+  const profileNodeModules = path.join(webProfileDir, 'node_modules');
+
+  fs.mkdirSync(webProfileDir, { recursive: true });
+  fs.mkdirSync(profileNodeModules, { recursive: true });
+
+  const requiredPlugins = [
+    '@rooode/dsh-plugin-automation',
+    '@rooode/dsh-plugin-git',
+    '@rooode/dsh-plugin-preview',
+    '@rooode/dsh-plugin-quickbar',
+  ];
+
+  let profilePkg = {
+    name: 'dsh-profile-web',
+    private: true,
+    dependencies: {},
+    dsh: {
+      profile: {
+        bundles: [
+          '@deepseek-ai/dsh-base',
+          '@deepseek-ai/dsh-web-app',
+        ],
+      },
+    },
+  };
+
+  if (fs.existsSync(profilePkgPath)) {
+    try {
+      profilePkg = JSON.parse(fs.readFileSync(profilePkgPath, 'utf-8'));
+    } catch (e) {}
+  }
+
+  profilePkg.dependencies = profilePkg.dependencies || {};
+  profilePkg.dsh = profilePkg.dsh || {};
+  profilePkg.dsh.profile = profilePkg.dsh.profile || {};
+
+  let bundles = profilePkg.dsh.profile.bundles || ['@deepseek-ai/dsh-base', '@deepseek-ai/dsh-web-app'];
+  
+  // Clean up any stale bundle references
+  bundles = bundles.filter(b => b !== '@rooode/dsh-suite');
+
+  for (const plugin of requiredPlugins) {
+    if (!profilePkg.dependencies[plugin]) {
+      profilePkg.dependencies[plugin] = pkg.dependencies?.[plugin] || '*';
+    }
+    if (!bundles.includes(plugin)) {
+      bundles.push(plugin);
+    }
+  }
+
+  // Ensure default bundles are always at the start
+  const baseBundles = ['@deepseek-ai/dsh-base', '@deepseek-ai/dsh-web-app'];
+  const customBundles = bundles.filter(b => !baseBundles.includes(b));
+  profilePkg.dsh.profile.bundles = [...baseBundles, ...customBundles];
+
+  fs.writeFileSync(profilePkgPath, JSON.stringify(profilePkg, null, 2), 'utf-8');
+
+  // Copy plugin files from suite dependencies into profile node_modules
+  for (const plugin of requiredPlugins) {
+    const pluginShortName = plugin.split('/')[1];
+    const targetPluginDir = path.join(profileNodeModules, '@rooode', pluginShortName);
+
+    const candidates = [
+      path.join(rootDir, 'node_modules', '@rooode', pluginShortName),
+      path.join(rootDir, '..', pluginShortName),
+      path.join(rootDir, '..', '@rooode', pluginShortName),
+      path.resolve(__dirname, '..', '..', pluginShortName),
+    ];
+
+    for (const cand of candidates) {
+      if (fs.existsSync(cand) && fs.existsSync(path.join(cand, 'package.json'))) {
+        try {
+          copyFolderSync(cand, targetPluginDir);
+        } catch (e) {}
+        break;
+      }
+    }
+  }
+}
+
 // Check for help or version flags
 if (rawArgs.includes('--help') || rawArgs.includes('-h')) {
   printBanner();
@@ -44,7 +163,7 @@ if (rawArgs.includes('--help') || rawArgs.includes('-h')) {
   \x1b[32mweb\x1b[0m                      启动 DSH Web 浏览器界面并加载全套插件 (默认模式)
   \x1b[32mcli\x1b[0m                      启动 DSH 交互式命令行终端会话 (含全套增强能力)
   \x1b[32mheadless\x1b[0m                 启动 DSH Headless 无头后台运行模式
-  \x1b[32minstall\x1b[0m                  一键将 @rooode/dsh-suite 固化安装到当前用户的 web profile
+  \x1b[32minstall\x1b[0m                  一键将全套插件固化安装到当前用户的 web profile
   \x1b[32mplugin\x1b[0m                   管理 DSH 插件 (透传至 dsh plugin 命令)
   \x1b[32mprofile\x1b[0m                  管理 DSH Profile 配置文件 (透传至 dsh profile 命令)
 
@@ -52,7 +171,7 @@ if (rawArgs.includes('--help') || rawArgs.includes('-h')) {
   --port, -p <port>         指定 Web 监听端口 (默认 3080，例如: --port 8080)
   --host, -H <host>         指定 Web 监听地址 (例如: --host 0.0.0.0 或 127.0.0.1)
   --workspace, -w <path>    指定初始打开的工作空间目录绝对或相对路径
-  --patch <file>            附加额外的 Cordis Patch 配置文件 (与 Suite Patch 叠加)
+  --patch <file>            附加额外的 Cordis Patch 配置文件
   --open                    启动后自动在默认浏览器中打开 Web 页面
 
 \x1b[1m示例 (Examples):\x1b[0m
@@ -93,51 +212,44 @@ if (rawArgs.length > 0 && !rawArgs[0].startsWith('-')) {
 
 // 1. Handle 'install' mode
 if (subcommand === 'install' || rawArgs.includes('--install')) {
-  console.log('\x1b[33m📦 Installing @rooode/dsh-suite into DSH web profile...\x1b[0m\n');
-  const installArgs = ['@deepseek-ai/dsh', 'plugin', '--profile', 'web', 'add', '@rooode/dsh-suite'];
-  const child = spawn('npx', installArgs, {
-    stdio: 'inherit',
-    shell: true,
-  });
-  child.on('exit', (code) => {
-    if (code === 0) {
-      console.log('\n\x1b[32m✅ Successfully installed @rooode/dsh-suite! You can now run:\x1b[0m');
-      console.log('   \x1b[1mnpx @deepseek-ai/dsh web\x1b[0m\n');
-    } else {
-      console.error(`\n\x1b[31m❌ Installation failed with exit code ${code}\x1b[0m`);
-    }
-    process.exit(code || 0);
-  });
+  console.log('\x1b[33m📦 Reconciling & installing suite plugins into DSH web profile...\x1b[0m\n');
+  try {
+    ensureProfileConfigured();
+    console.log('\x1b[32m✅ Successfully registered and synchronized all suite plugins to web profile!\x1b[0m');
+    console.log('   You can now run: \x1b[1mnpx @deepseek-ai/dsh web\x1b[0m\n');
+  } catch (err) {
+    console.error(`\x1b[31m❌ Installation failed: ${err.message}\x1b[0m`);
+    process.exit(1);
+  }
+  process.exit(0);
 } 
 // 2. Handle 'plugin' or 'profile' pass-through commands
 else if (subcommand === 'plugin' || subcommand === 'profile') {
   const passthroughArgs = ['@deepseek-ai/dsh', subcommand, ...remainingArgs];
-  const child = spawn('npx', passthroughArgs, {
-    stdio: 'inherit',
-    shell: true,
-  });
+  const child = execDsh(passthroughArgs);
   child.on('exit', (code) => {
     process.exit(code || 0);
   });
 }
-// 3. Handle 'web', 'cli', 'headless' execution with bundle patch injected
+// 3. Handle 'web', 'cli', 'headless' execution
 else {
+  // Ensure profile bundles are configured cleanly without duplicate inserts
+  try {
+    ensureProfileConfigured();
+  } catch (err) {
+    // Non-fatal if offline/restricted
+  }
+
   const modeName = subcommand.toUpperCase();
   console.log(`\x1b[32m✨ Starting DeepSeek Harness in \x1b[1m${modeName}\x1b[22m mode with All-in-One Suite...\x1b[0m\n`);
 
   const dshArgs = [
     '@deepseek-ai/dsh',
     subcommand,
-    '--patch',
-    `"${patchPath}"`,
     ...remainingArgs,
   ];
 
-  const child = spawn('npx', dshArgs, {
-    stdio: 'inherit',
-    shell: true,
-  });
-
+  const child = execDsh(dshArgs);
   child.on('exit', (code) => {
     process.exit(code || 0);
   });

package/cordis.patch.yml

@@ -1,53 +1,6 @@
 # ==============================================================================
 # DeepSeek Harness - All-in-One Plugin Suite Bundle Patch (@rooode/dsh-suite)
 # ==============================================================================
-
-- insert:
-    # 1. 对话快捷栏插件 (Workspace Quick Prompts Bar)
-    - id: ui-quickbar
-      name: '@rooode/dsh-plugin-quickbar'
-      config:
-        allowCustomIcons: true
-
-    # 2. 自动化任务与调度中心插件 (24/7 Node Server-Side Scheduler)
-    - id: ui-automation
-      name: '@rooode/dsh-plugin-automation'
-      config:
-        defaultPollingIntervalMs: 5000
-        maxStoredRecords: 100
-
-    # 3. 多功能文档与工作空间代码预览插件 (FileTabs & Tree Explorer)
-    - id: ui-preview
-      name: '@rooode/dsh-plugin-preview'
-      config:
-        autoPreviewExtensions:
-          - .md
-          - .markdown
-          - .txt
-          - .json
-          - .yaml
-          - .yml
-          - .js
-          - .ts
-          - .java
-          - .cpp
-          - .c
-          - .h
-          - .hpp
-          - .py
-          - .go
-          - .rs
-          - .sh
-          - .sql
-        maxFileSizeMb: 10
-        defaultViewMode: 'preview'
-        defaultPanelWidth: 560
-
-    # 4. WebStorm 风格 Git 提交与差异对比插件 (Side-by-Side Diff & Conventional Commits)
-    - id: ui-git
-      name: '@rooode/dsh-plugin-git'
-      config:
-        enableCommitDockButton: true
-        autoRefreshIntervalMs: 10000
-        defaultDiffViewMode: 'split'
-        commitAiStyle: 'conventional'
+# Sub-plugins (@rooode/dsh-plugin-*) export their own bundle patches.
+# This patch provides global profile-level overrides if needed.
+[]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rooode/dsh-suite",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "DeepSeek Harness 一键全功能增强套件 (自动化调度 + WebStorm Git 提交对比 + 代码文档多标签预览 + 对话快捷栏)",
   "type": "module",
   "main": "lib/index.js",