dsh-plugin-pack 1.0.16 → 1.0.17

package/client.js

@@ -190,6 +190,8 @@ window.__ModuleLoader__.load({ id: 'dsh-plugin-pack', factory: (require) => {
     'conflict.titleNew': '确认导入',
     'conflict.subtitleAll': '个插件待安装',
     'conflict.create': '新建',
+    'conflict.older': '包内更旧 · 覆盖会降级',
+    'conflict.installedFrom': '已装来源',
     'conflict.subtitle': '个插件与已安装的重名，请选择如何处理：',
     'conflict.overwrite': '覆盖',
     'conflict.skip': '跳过',
@@ -389,6 +391,8 @@ window.__ModuleLoader__.load({ id: 'dsh-plugin-pack', factory: (require) => {
     'conflict.titleNew': 'Confirm import',
     'conflict.subtitleAll': 'plugins to install',
     'conflict.create': 'New',
+    'conflict.older': 'Older in bundle · overwrite downgrades',
+    'conflict.installedFrom': 'installed via',
     'conflict.subtitle': 'plugins already exist. Choose what to do:',
     'conflict.overwrite': 'Overwrite',
     'conflict.skip': 'Skip',
@@ -1365,6 +1369,27 @@ window.__ModuleLoader__.load({ id: 'dsh-plugin-pack', factory: (require) => {
    * @param {() => void} props.onCancel
    * @param {(msg: string) => string} props.t
    */
+  /** 比较两个版本号：a>b → 正数。只认三段数字，够判断"包里是否更旧"。 */
+  function compareVersions(a, b) {
+    const parse = (text) =>
+      String(text ?? '')
+        .trim()
+        .replace(/^v/i, '')
+        .split('-')[0]
+        .split('.')
+        .map((part) => {
+          const n = Number.parseInt(part.replace(/[^0-9].*$/, ''), 10);
+          return Number.isFinite(n) ? n : 0;
+        });
+    const left = parse(a);
+    const right = parse(b);
+    for (let i = 0; i < 3; i += 1) {
+      const diff = (left[i] ?? 0) - (right[i] ?? 0);
+      if (diff !== 0) return diff;
+    }
+    return 0;
+  }
+
   /**
    * 「添加整合包」弹窗。
    *
@@ -1706,6 +1731,31 @@ window.__ModuleLoader__.load({ id: 'dsh-plugin-pack', factory: (require) => {
                   item.exists && item.sameVersion
                     ? h('span', { className: 'pp-ver' }, t('conflict.sameVersion'))
                     : null,
+                  // 包内版本更旧：覆盖等于降级，必须显眼
+                  item.exists && item.older
+                    ? h(
+                        'span',
+                        {
+                          className: 'pp-ver',
+                          style: {
+                            color: 'var(--dsw-alias-state-warning-primary,#b45309)',
+                            borderColor: 'color-mix(in srgb,var(--dsw-alias-state-warning-primary,#d97706) 45%,transparent)',
+                          },
+                        },
+                        t('conflict.older'),
+                      )
+                    : null,
+                  // 已装来源不是 local-plugins 时说明一下（覆盖会改掉原来的安装方式）
+                  item.installSource && item.installSource !== 'local-plugins'
+                    ? h(
+                        'span',
+                        { className: 'pp-ver' },
+                        `${t('conflict.installedFrom')} ${
+                          { npm: 'npm', link: 'link:', remote: 'git/url', unknown: '?' }[item.installSource] ??
+                          item.installSource
+                        }`,
+                      )
+                    : null,
                 ),
                 item.dest ? h('div', { className: 'pp-meta pp-mono', style: { fontSize: 11 } }, item.dest) : null,
               ),
@@ -2216,6 +2266,8 @@ window.__ModuleLoader__.load({ id: 'dsh-plugin-pack', factory: (require) => {
                 dest: hit?.dir ?? null,
                 bytes: plugin.bytes ?? null,
                 sameVersion: (hit?.version ?? null) === (plugin.version ?? null),
+                // 包内版本比已装的更旧 → 覆盖等于降级，要显式标出来
+                older: Boolean(hit?.version && plugin.version && compareVersions(hit.version, plugin.version) > 0),
                 exists: Boolean(hit),
               };
             });
@@ -2252,6 +2304,8 @@ window.__ModuleLoader__.load({ id: 'dsh-plugin-pack', factory: (require) => {
               installedVersion: hit?.installedVersion ?? null,
               dest: hit?.dest ?? null,
               sameVersion: Boolean(hit?.sameVersion),
+              older: Boolean(hit?.older),
+              installSource: hit?.installSource ?? null,
               exists: Boolean(hit),
             };
           });
@@ -2371,6 +2425,8 @@ window.__ModuleLoader__.load({ id: 'dsh-plugin-pack', factory: (require) => {
             installedVersion: hit?.installedVersion ?? null,
             dest: hit?.dest ?? null,
             sameVersion: Boolean(hit?.sameVersion),
+            older: Boolean(hit?.older),
+            installSource: hit?.installSource ?? null,
             exists: Boolean(hit),
           };
         });

package/lib/import.js

@@ -16,7 +16,7 @@ import { readTgz } from './tar.js';
 import { dshHome as resolveDshHome, profileDir as resolveProfileDir, profileName as resolveProfileName, packSegment, stamp, humanBytes } from './home.js';
 import { readJson, readText, writeJson, writeText, ensureDir, isDir, isFile, realOrSelf, copyTree, removeTree } from './util.js';
 import { existingIds, rowId, appendInsertBlock, splitTopLevel, yamlScalar } from './patch-text.js';
-import { isAbsoluteSpec, clearScanCache } from './scan.js';
+import { isAbsoluteSpec, clearScanCache, resolvePackageDir } from './scan.js';
 import { repairProfile } from './repair.js';
 
 export const PACK_FORMAT = 'dsh-plugin-pack@2';
@@ -286,7 +286,34 @@ export function importBundle(options = {}) {
   for (const plugin of chosen) {
     const dest = path.join(localPluginsDir, plugin.segment);
     const nodeLink = path.join(profile, 'node_modules', ...String(plugin.name).split('/'));
-    const exists = isDir(dest);
+    /* 判断"是否已装"不能只看 local-plugins 目录 ——
+     * 插件可能是 npm / github / 绝对路径 link 装的，文件在 node_modules 里。
+     * 只看本地目录会把它当成"新建"，于是重复装入、还把原来的
+     * dependencies 声明覆盖成 link:，用户原来的版本控制就丢了。
+     * 所以用真实的模块解析结果来判定。 */
+    const resolvedDir = resolvePackageDir(plugin.name, profile, dependencies);
+    const localExists = isDir(dest);
+    const exists = localExists || Boolean(resolvedDir);
+    const installedDir = localExists ? dest : resolvedDir;
+    const installedSpec = dependencies[plugin.name] ?? null;
+    const installedMeta = installedDir ? readJson(path.join(installedDir, 'package.json'), null) : null;
+    const installedVersion = installedMeta?.version ?? null;
+    const installSource = localExists
+      ? 'local-plugins'
+      : !installedSpec
+        ? 'unknown'
+        : /^link:/i.test(installedSpec)
+          ? 'link'
+          : /^(github:|git\+|https?:)/i.test(installedSpec)
+            ? 'remote'
+            : 'npm';
+    // 包里的版本比已装的更旧时提醒一句，覆盖等于降级
+    const older = exists && installedVersion && plugin.version ? compareVersions(installedVersion, plugin.version) > 0 : false;
+    if (older) {
+      warnings.push(
+        `${plugin.name}: 整合包里是旧版本（已装 ${installedVersion}，包内 ${plugin.version}），覆盖会把它降级`,
+      );
+    }
     const linkState = describeLink(nodeLink, dest);
     // 路径插件：只在 cordis.patch.yml 里用绝对路径 insert、没进 bundles 的（如 pwsh7-preference）。
     // 导入后 name 重写成新位置的绝对文件路径，不进 bundles / dependencies / 链接。
@@ -303,6 +330,11 @@ export function importBundle(options = {}) {
       bytes: plugin.bytes,
       dest,
       exists,
+      installedDir,
+      installedVersion,
+      installedSpec,
+      installSource,
+      older,
       action: exists ? decisionFor(plugin.name) : 'create',
       nodeLink,
       linkState,
@@ -325,18 +357,20 @@ export function importBundle(options = {}) {
    * dryRun 也返回它 —— 这正是界面判断"要不要弹窗"的依据。 */
   const conflicts = plan
     .filter((item) => item.exists)
-    .map((item) => {
-      const installed = readJson(path.join(item.dest, 'package.json'), null);
-      return {
-        name: item.name,
-        version: item.version,
-        installedVersion: installed?.version ?? null,
-        dest: item.dest,
-        bytes: item.bytes,
-        // 同一个版本还是不同版本，界面可以据此给更明确的提示
-        sameVersion: installed?.version === item.version,
-      };
-    });
+    .map((item) => ({
+      name: item.name,
+      version: item.version,
+      installedVersion: item.installedVersion,
+      // 已装位置不一定是 local-plugins：npm/link/github 装的要走不同的提示
+      dest: item.installedDir,
+      bytes: item.bytes,
+      // 同一个版本还是不同版本，界面可以据此给更明确的提示
+      sameVersion: item.installedVersion === item.version,
+      // 包内版本更旧 → 覆盖等于降级，界面要显式警告
+      older: Boolean(item.older),
+      installSource: item.installSource,
+      installedSpec: item.installedSpec,
+    }));
 
   if (dryRun) {
     return {
@@ -396,7 +430,12 @@ export function importBundle(options = {}) {
       continue;
     }
     onProgress(`解包 ${item.name}`, basePercent);
-    if (item.exists) {
+    /* 只有 dest 真的存在（=本地插件目录）才需要"搬走备份"。
+     * 已装但装在 node_modules 的（npm/link/github），local-plugins 下没有这个目录，
+     * 直接往空目录里写就行 —— 早先按 item.exists 判断会去 copy 一个不存在的路径，
+     * 报 ENOENT: no such file or directory, stat '...\local-plugins\xxx'。 */
+    const localDestExists = isDir(item.dest);
+    if (localDestExists) {
       const backupDir = path.join(backupRoot, 'local-plugins', item.segment);
       copyTree(item.dest, backupDir);
       record.replacedDirs.push({ dest: item.dest, backup: backupDir });
@@ -420,7 +459,7 @@ export function importBundle(options = {}) {
       }
     }
 
-    if (!item.exists) record.addedDirs.push(item.dest);
+    if (!localDestExists) record.addedDirs.push(item.dest);
     applied.push({ name: item.name, action: item.action, files: written, dest: item.dest });
   }
 
@@ -669,6 +708,39 @@ function ensurePackageLink(profile, name, dest, { backupRoot, record }) {
   }
 }
 
+/**
+ * 比较两个 semver 版本号，返回 a>b → 正数，a<b → 负数，相等 → 0。
+ *
+ * 只做够用的三段数字比较：够判断"整合包里的版本是不是更旧"。
+ * 预发布后缀（-beta.1）按字符串兜底比较。
+ *
+ * @param {string} a
+ * @param {string} b
+ * @returns {number}
+ */
+export function compareVersions(a, b) {
+  const parse = (text) => {
+    const [core, pre = ''] = String(text ?? '').trim().replace(/^v/i, '').split('-');
+    const nums = core.split('.').map((part) => {
+      const n = Number.parseInt(part.replace(/[^0-9].*$/, ''), 10);
+      return Number.isFinite(n) ? n : 0;
+    });
+    while (nums.length < 3) nums.push(0);
+    return { nums, pre };
+  };
+
+  const left = parse(a);
+  const right = parse(b);
+  for (let i = 0; i < 3; i += 1) {
+    if (left.nums[i] !== right.nums[i]) return left.nums[i] - right.nums[i];
+  }
+  // 主版本相同：有预发布后缀的视为更小
+  if (left.pre === right.pre) return 0;
+  if (!left.pre) return 1;
+  if (!right.pre) return -1;
+  return left.pre < right.pre ? -1 : 1;
+}
+
 /** 备份目录撞名（同一秒内多次导入）时追加序号，不覆盖旧备份。 */
 function uniqueBackupDir(base) {
   if (!isDir(base) && !isFile(base)) return base;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-pack",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "DeepSeek Harness 插件整合包：一键把当前 profile 的第三方插件连依赖和配置导出成 zip（内部每个插件是标准 npm tgz），换机/换 profile 拖进去就能还原。",
   "type": "module",
   "main": "lib/index.js",