@wwkit/opm 1.0.20 → 1.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwkit/opm",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "author": "bluesliu <langcai163@163.com>",
   "description": "Unified CLI — package management (npm/pip/dnf/apt) + config view + opencode maintenance",
   "type": "module",
@@ -35,7 +35,7 @@
     "basic-ftp": "^6.2.1",
     "extract-zip": "^2.0.1",
     "systeminformation": "^5.23.0",
-    "@wwkit/shared": "1.0.25"
+    "@wwkit/shared": "1.0.27"
   },
   "devDependencies": {
     "jest": "^29.7.0"

package/src/tools/webwork/index.js

@@ -55,7 +55,7 @@ export class WebworkGroup {
       return
     }
 
-    const parsed = parseFlags(rest)
+    const parsed = parseFlags(rest, { booleans: ['f', 'force'] })
 
     switch (action) {
       case 'version':
@@ -162,6 +162,7 @@ export class WebworkGroup {
 
   async _install(parsed) {
     const proxy = this._resolveProxy(parsed)
+    const force = !!(parsed.flags.force || parsed.flags.f)
 
     console.log('\n========== 步骤 1/5: 镜像可达检查 ==========')
     const env = await this._checkEnv()
@@ -188,9 +189,11 @@ export class WebworkGroup {
     this._writeRegistryEnv(proxy)
 
     console.log('\n========== 步骤 4/5: 安装 blues-lib ==========')
-    const blue = await this._installPipPackage('blues-lib', proxy)
+    const blue = await this._installPipPackage('blues-lib', proxy, force)
     if (blue.action === 'skipped') {
       console.log(`  → blues-lib ${blue.version} 已安装，跳过`)
+    } else if (blue.action === 'upgraded') {
+      console.log(`  ✓ blues-lib 已升级到最新（提供 ww 命令）`)
     } else {
       console.log(`  ✓ blues-lib 安装完成（提供 ww 命令）`)
     }
@@ -458,9 +461,17 @@ export class WebworkGroup {
     }
     const mgr = new NodeManager()
     mgr._execInherit(mgr.cfg.installCmd(defaultVersion), { proxy })
-    mgr._execInherit(mgr.cfg.useCmd(defaultVersion), { proxy })
-    mgr._execInherit(mgr.cfg.defaultCmd(defaultVersion), { proxy })
-    return { action: 'installed', version: defaultVersion }
+    // nvm-windows 不支持主版本别名（如 `nvm use 24`），需要完整版本号。
+    // install 后查询 nvm current 获取实际激活的完整版本（如 24.21.0）。
+    let useVersion = defaultVersion
+    try {
+      const currentOut = mgr._exec(mgr.cfg.currentCmd, { allowNonZero: true, proxy })
+      const parsed = mgr.cfg.parseCurrent(currentOut)
+      if (parsed) useVersion = parsed.replace(/^v/, '')
+    } catch {}
+    mgr._execInherit(mgr.cfg.useCmd(useVersion), { proxy })
+    mgr._execInherit(mgr.cfg.defaultCmd(useVersion), { proxy })
+    return { action: 'installed', version: useVersion }
   }
 
   async _pipInstalled(name) {
@@ -497,10 +508,13 @@ export class WebworkGroup {
       .slice(0, num)
   }
 
-  async _installPipPackage(name, proxy) {
+  async _installPipPackage(name, proxy, force = false) {
     const pip = new PipManager()
     const existing = await pip.isInstalled(name, { global: true })
     if (existing.installed) {
+      if (force) {
+        return pip.upgrade(name, { global: true, proxy })
+      }
       return { action: 'skipped', reason: `${name} ${existing.version} already installed`, version: existing.version }
     }
     return pip.install(name, null, { global: true, proxy })
@@ -531,6 +545,7 @@ ${actionLines}
 
 Options:
   -p, --proxy <url>  Proxy for install/upgrade/versions (overrides config proxy.active)
+  -f, --force        Force upgrade blues-lib even if already installed (install only)
   -h, --help         Show this help
 
 Examples:
@@ -538,6 +553,7 @@ Examples:
   opm webwork versions      Show latest available versions (default 10, -n <num>)
   opm webwork installed     Show install status of all components
   opm webwork install       Mirror check + ensure runtime + registry env + blues-lib + ww init
+  opm webwork install -f    Same as install, but force upgrade blues-lib to latest
   opm webwork uninstall     Uninstall all components in reverse order
   opm webwork upgrade       Mirror check + write registry env + ww upgrade
 `)