@wwkit/opm 1.0.10 → 1.0.12

package/README.md

@@ -68,7 +68,7 @@ pnpm opm <command> [args] [options]
 | `ensure <runtime> [version]` | 确保运行时已安装（node/php/python） |
 | `ping <host|proxy|registry>` | 验证主机、代理或所有 registry 的可访问性 |
 | `config [section]` | 查看常用配置（proxy + 各 registry 段，段名动态生成） |
-| `opencode <action>` | opencode 运维命令（安装/升级/清理/env/open） |
+| `opencode <action>` | opencode 运维命令（安装/升级/清理/env）；裸 `opm opencode` 启动 TUI |
 | `harness <action>` | @wwkit/harness 插件管理（安装/升级/list/status/env/dir） |
 
 ## Managers
@@ -120,7 +120,7 @@ pnpm opm <command> [args] [options]
 | `opencode config` | 显示配置文件内容 |
 | `opencode dir` | 显示 data/db/log/config 路径 |
 | `opencode env` | 显示环境变量（OPENCODE_CONFIG_DIR / CONTENT） |
-| `opencode open [-d <dir>]` | 在指定目录启动 TUI（默认 cwd），自动注入环境变量 |
+| `opencode [-d <dir>]` | 启动 TUI（默认 cwd），自动注入环境变量；可透传 args 给 opencode |
 | `opencode clear` | 清理过期会话并 VACUUM 压缩数据库（缺省 `-d 1`，只保留今天） |
 | `opencode clear -d, --days <n>` | 保留最近 n 天（对齐本地零点，含今天） |
 | `opencode clear -h, --hours <n>` | 保留最近 n 小时（滚动窗口） |
@@ -542,8 +542,8 @@ opm opencode upgrade                   # 升级到最新
 opm opencode config                    # 显示配置文件内容
 opm opencode dir                       # 查看数据/日志/DB路径
 opm opencode env                       # 查看环境变量
-opm opencode open                      # 在当前目录启动 TUI
-opm opencode open -d /path/to/project  # 在指定目录启动 TUI
+opm opencode                           # 在当前目录启动 TUI
+opm opencode -d /path/to/project       # 在指定目录启动 TUI
 opm opencode clear                     # 只保留今天创建的会话
 opm opencode clear -d 7                # 保留最近 7 天会话
 opm opencode clear -h 24               # 保留最近 24 小时会话

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwkit/opm",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "author": "bluesliu <langcai163@163.com>",
   "description": "Unified CLI — package management (npm/pip/dnf/apt) + config view + opencode maintenance",
   "type": "module",
@@ -35,8 +35,7 @@
     "basic-ftp": "^6.2.1",
     "extract-zip": "^2.0.1",
     "systeminformation": "^5.23.0",
-    "@wwkit/harness": "1.0.19",
-    "@wwkit/shared": "1.0.14"
+    "@wwkit/shared": "1.0.16"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package/src/cli/index.js

@@ -77,12 +77,23 @@ class CLI {
       return
     }
 
-    if (groupName === 'version' || groupName === '-v' || groupName === '--version') {
+if (groupName === 'version' || groupName === '-v' || groupName === '--version') {
       const pkg = JSON.parse(readFileSync(new URL('../../package.json', import.meta.url), 'utf8'))
       console.log(pkg.version)
       return
     }
 
+    if (groupName === 'upgrade') {
+      const { NpmManager } = await import('../managers/npm.js')
+      const { getActiveProxy } = await import('../config.js')
+      const npm = new NpmManager()
+      const proxy = getActiveProxy()
+      await npm.upgrade('@wwkit/harness', { global: true, proxy })
+      const result = await npm.upgrade('@wwkit/opm', { global: true, proxy })
+      console.log(`opm upgraded to ${result.version || 'latest'}`)
+      return
+    }
+
     if (groupName === 'doc') {
       generateDocHtml()
       return
@@ -114,6 +125,7 @@ Usage: opm <command> [args] [options]
 Commands:
 ${groupLines}
   version                   Show opm version
+  upgrade                   Upgrade opm itself (npm install -g @wwkit/opm@latest)
   doc                       Build docs HTML and open in browser
 
 Options:

package/src/harnesses/opencode/index.js

@@ -4,7 +4,7 @@
  * opencode 是 AI coding agent，通过 npm 全局包 opencode-ai 安装（binary: opencode）。
  * 数据目录跨平台（db.js），会话清理复用 clear.js。
  * env 命令管理 OPENCODE_CONFIG_DIR / OPENCODE_CONFIG_CONTENT 环境变量。
- * open 命令在指定工作目录启动 opencode TUI（自动注入 env 变量）。
+ * 裸 `opm opencode`（或带透传 args）在指定工作目录启动 opencode TUI（自动注入 env 变量）。
  */
 
 import fs from 'node:fs'

package/src/tools/webwork/index.js

@@ -33,7 +33,7 @@ const COMPONENTS = [
 
 const ACTIONS = {
   version:   { desc: 'Show installed version of each component' },
-  versions:  { desc: 'Show latest available version of each component (remote)' },
+  versions:  { desc: 'Show latest available versions (default 10, -n <num>)' },
   installed: { desc: 'Show install status (true/false) of each component' },
   install:   { desc: 'Mirror check + ensure runtime + write registry env + blues-lib + ww init' },
   uninstall: { desc: 'Uninstall all components in reverse order' },
@@ -96,11 +96,13 @@ export class WebworkGroup {
 
   async _versions(parsed) {
     const proxy = this._resolveProxy(parsed)
+    const num = parseInt(parsed.flags.n || parsed.flags.num || '10', 10)
+
     const result = {}
 
-    result['python'] = await this._pythonLatest(proxy)
-    result['node'] = await this._nodeLatest(proxy)
-    result['blues-lib'] = await this._pipLatest('blues-lib', proxy)
+    result['python'] = await this._pythonVersions(proxy, num)
+    result['node'] = await this._nodeVersions(proxy, num)
+    result['blues-lib'] = await this._pipVersions('blues-lib', proxy, num)
 
     output(result)
   }
@@ -368,14 +370,14 @@ export class WebworkGroup {
     return '-'
   }
 
-  async _pythonLatest(proxy) {
+  async _pythonVersions(proxy, num) {
     const mgr = new PythonManager()
     try {
       const out = mgr._exec(mgr.cfg.listRemoteCmd, { allowNonZero: true, proxy })
       const versions = mgr._parseRemote(out)
-      return versions[versions.length - 1] || '-'
+      return this._topVersions(versions, num)
     } catch {
-      return '-'
+      return []
     }
   }
 
@@ -412,15 +414,15 @@ export class WebworkGroup {
     return '-'
   }
 
-  async _nodeLatest(proxy) {
+  async _nodeVersions(proxy, num) {
     const mgr = new NodeManager()
-    if (!isNvmInstalled()) return '-'
+    if (!isNvmInstalled()) return []
     try {
       const out = mgr._exec(mgr.cfg.listRemoteCmd, { allowNonZero: true, proxy })
-      const versions = mgr._parseRemote(out)
-      return versions[versions.length - 1]?.replace(/^v/, '') || '-'
+      const versions = mgr._parseRemote(out).map((v) => v.replace(/^v/, ''))
+      return this._topVersions(versions, num)
     } catch {
-      return '-'
+      return []
     }
   }
 
@@ -458,10 +460,26 @@ export class WebworkGroup {
     return result.version || '-'
   }
 
-  async _pipLatest(name, proxy) {
+  async _pipVersions(name, proxy, num) {
     const pip = new PipManager()
-    const result = await pip.searchPackage(name, null, { proxy })
-    return result.latest || '-'
+    try {
+      const { versions } = await pip.packageVersions(name, { proxy })
+      return this._topVersions(versions, num)
+    } catch {
+      return []
+    }
+  }
+
+  /**
+   * 取版本列表前 num 条，降序排列（高版本在上）
+   * @param {string[]} versions
+   * @param {number} num
+   * @returns {string[]}
+   */
+  _topVersions(versions, num) {
+    return [...versions]
+      .sort((a, b) => this._compareVersion(b, a))
+      .slice(0, num)
   }
 
   async _installPipPackage(name, proxy) {
@@ -502,7 +520,7 @@ Options:
 
 Examples:
   opm webwork version       Show installed versions of all components
-  opm webwork versions      Show latest available versions (remote)
+  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 uninstall     Uninstall all components in reverse order