@wwkit/opm 1.0.18 → 1.0.20

package/src/managers/brew.js

@@ -335,10 +335,29 @@ export class BrewManager extends PackageManager {
   }
 
   async cleanCache() {
-    this._execInherit(['cleanup', '-s', '--prune=all'])
+    this._execInherit(['cleanup', '-s'])
     return { action: 'cache cleaned' }
   }
 
+  /**
+   * 列出已安装的 Homebrew 包（系统级，无项目作用域）
+   * @returns {Promise<{ name: string, version: string }[]>}
+   */
+  async listInstalled(opts = {}) {
+    if (opts.global === false) return []
+    const out = this._exec(['list', '--versions'], { allowNonZero: true })
+    const items = []
+    // 行格式: name  v1 v2 ...（多版本取最新）
+    for (const line of out.split('\n')) {
+      const m = line.trim().match(/^(\S+)\s+(.+)$/)
+      if (m) {
+        const versions = m[2].trim().split(/\s+/)
+        items.push({ name: m[1], version: versions[versions.length - 1] })
+      }
+    }
+    return items
+  }
+
   /**
    * 查询 brew 安装路径和包目录
    * @returns {{ name: string, install: string, prefix: string, cellar: string }}

package/src/managers/bun.js

@@ -272,6 +272,29 @@ export class BunManager extends PackageManager {
     return { action: 'cache cleaned' }
   }
 
+  /**
+   * 列出已安装包（bun pm ls 文本树解析；-g 列全局）
+   * @param {{ global?: boolean }} [opts]
+   * @returns {Promise<{ name: string, version: string }[]>}
+   */
+  async listInstalled(opts = {}) {
+    const args = opts.global ? ['pm', 'ls', '-g', '--all'] : ['pm', 'ls', '--all']
+    const out = this._exec(args, { allowNonZero: true })
+    const items = []
+    for (const line of out.split('\n')) {
+      const cleaned = line.replace(/^[\s├└─│]+/, '').trim()
+      if (!cleaned) continue
+      // scoped 包：@babel/core@7.0.0 → 最后一个 @ 为版本分隔
+      const idx = cleaned.lastIndexOf('@')
+      if (idx > 0) {
+        const name = cleaned.slice(0, idx)
+        const version = cleaned.slice(idx + 1)
+        if (name && version) items.push({ name, version: version.replace(/^v/, '') })
+      }
+    }
+    return items
+  }
+
   /**
    * 查询 bun 安装路径和包目录
    * @returns {{ name: string, install: string, globalDir: string, cacheDir: string }}

package/src/managers/composer.js

@@ -344,6 +344,17 @@ export class ComposerManager extends PackageManager {
     return { action: 'cache cleaned' }
   }
 
+  /**
+   * 列出已安装包（缺省读当前项目 vendor/composer/installed.json，global 读全局 installed.json）
+   * @param {{ global?: boolean }} [opts]
+   * @returns {Promise<{ name: string, version: string }[]>}
+   */
+  async listInstalled(opts = {}) {
+    const packages = opts.global ? this._readGlobalInstalledJson() : this._readInstalledJson()
+    if (!packages) return []
+    return packages.map((p) => ({ name: p.name, version: p.version || 'unknown' }))
+  }
+
   /**
    * 查询 composer 安装路径和包目录
    * @returns {{ name: string, install: string, globalHome: string, vendorDir: string }}

package/src/managers/dnf.js

@@ -342,6 +342,22 @@ export class DnfManager extends PackageManager {
     return { action: 'cache cleaned' }
   }
 
+  /**
+   * 列出系统已安装包（系统级管理器，无项目作用域）
+   * @returns {Promise<{ name: string, version: string }[]>}
+   */
+  async listInstalled(opts = {}) {
+    if (opts.global === false) return []
+    const out = this._exec(['list', 'installed', '--quiet'], { allowNonZero: true })
+    const items = []
+    // 行格式: name.arch  version  repo
+    for (const line of out.split('\n')) {
+      const m = line.trim().match(/^(\S+?)\.\S+\s+(\S+)\s+\S+/)
+      if (m) items.push({ name: m[1], version: m[2] })
+    }
+    return items
+  }
+
   /**
    * 查询 dnf 安装路径和包目录
    * @returns {{ name: string, install: string, cacheDir: string, repoDir: string }}

package/src/managers/node.js

@@ -55,7 +55,7 @@ export function installNvm(proxy) {
     env.http_proxy = proxy
     env.https_proxy = proxy
   }
-  execSync(`git clone "${mirror}" "${nvmDir}"`, { stdio: 'inherit', shell: shell.resolveBash(), env })
+  execSync(`git clone "${mirror}" "${nvmDir}"`, { stdio: shell.stdioForExec(true), shell: shell.resolveBash(), env })
   const lines = [
     `export NVM_DIR="${nvmDir}"`,
     `[ -s "\\$NVM_DIR/nvm.sh" ] && \\. "\\$NVM_DIR/nvm.sh"`,

package/src/managers/npm.js

@@ -505,6 +505,18 @@ export class NpmManager extends PackageManager {
     return { action: 'cache cleaned' }
   }
 
+  /**
+   * 列出已安装包
+   * @param {{ global?: boolean }} [opts] - global=true 列全局，缺省列当前项目
+   * @returns {Promise<{ name: string, version: string }[]>}
+   */
+  async listInstalled(opts = {}) {
+    const args = opts.global ? ['ls', '-g', '--depth=0'] : ['ls', '--depth=0']
+    const data = this._execJson(args)
+    const deps = (data && data.dependencies) || {}
+    return Object.entries(deps).map(([name, d]) => ({ name, version: (d.version || '').replace(/^v/, '') }))
+  }
+
   /**
    * 查询 npm 安装路径和包目录
    * @returns {{ name: string, install: string, globalDir: string, localDir: string, cacheDir: string, prefix: string }}

package/src/managers/php.js

@@ -51,9 +51,9 @@ export function isPhpenvInstalled() {
 export function installPhpenv() {
   const mirror = getActiveRegistry('phpenv')
   const root = getPhpenvRoot()
-  execSync(`git clone "${mirror}" "${root}"`, { stdio: 'inherit', shell: shell.resolveBash() })
+  execSync(`git clone "${mirror}" "${root}"`, { stdio: shell.stdioForExec(true), shell: shell.resolveBash() })
   execSync(`git clone "${PHP_BUILD_GIT}" "${path.join(root, 'plugins', 'php-build')}"`, {
-    stdio: 'inherit',
+    stdio: shell.stdioForExec(true),
     shell: shell.resolveBash(),
   })
   const lines = [

package/src/managers/pip.js

@@ -557,6 +557,22 @@ export class PipManager extends PackageManager {
     return { action: 'cache cleaned' }
   }
 
+  /**
+   * 列出已安装包
+   * @param {{ global?: boolean }} [opts] - global=true 用系统级 Python 环境，缺省当前环境
+   * @returns {Promise<{ name: string, version: string }[]>}
+   */
+  async listInstalled(opts = {}) {
+    const out = this._execPip(['list', '--format=json', '--disable-pip-version-check'], { allowNonZero: true, global: opts.global })
+    try {
+      const data = JSON.parse(out)
+      if (!Array.isArray(data)) return []
+      return data.map((i) => ({ name: i.name, version: i.version || '' }))
+    } catch {
+      return []
+    }
+  }
+
   /**
    * 查询 pip 安装路径和包目录
    * @returns {{ name: string, install: string, sitePackages: string, userSite: string }}

package/src/managers/runtime.js

@@ -127,7 +127,7 @@ export class RuntimeManager extends PackageManager {
       throw new Error(this.cfg.toolMissingMsg)
     }
     const result = spawnSync(this._cmd(args), {
-      stdio: 'inherit',
+      stdio: shell.stdioForExec(this.cfg.needsBash),
       shell: shell.shellForExec(this.cfg.needsBash),
       env: this._buildEnv(opts.proxy),
     })

package/src/managers/winget.js

@@ -242,6 +242,18 @@ export class WingetManager extends PackageManager {
     return { action: 'winget has no cache clean command' }
   }
 
+  /**
+   * 列出系统已安装包（winget list 表格解析）
+   * @returns {Promise<{ name: string, version: string }[]>}
+   */
+  async listInstalled(opts = {}) {
+    const out = this._exec(['list'], { allowNonZero: true })
+    const rows = this._parseTable(out)
+    return rows
+      .filter((r) => r.Name)
+      .map((r) => ({ name: r.Name, version: r.Version || '' }))
+  }
+
   /**
    * 查询 winget 安装路径
    * @returns {{ name: string, install: string }}

package/src/tools/clipboard.js

@@ -0,0 +1,68 @@
+/**
+ * 系统剪切板读写工具
+ *
+ * 跨平台读取/写入系统级剪切板：
+ *   - darwin: pbpaste / pbcopy
+ *   - linux:  优先 wl-paste / wl-copy（Wayland），回退 xclip / xsel
+ *   - win32:  PowerShell Get-Clipboard / Set-Clipboard
+ * 读取失败（命令不存在/非零退出）返回空字符串，调用方用 trim 判断空。
+ */
+
+import { spawnSync } from 'node:child_process'
+
+/**
+ * 执行外部命令并捕获输出
+ * @param {string} cmd
+ * @param {string[]} args
+ * @param {{input?: string}} [opts]
+ * @returns {{ok: boolean, stdout: string, stderr: string}}
+ */
+function run(cmd, args, opts = {}) {
+  const res = spawnSync(cmd, args, { encoding: 'utf8', ...opts })
+  if (res.error) {
+    return { ok: false, stdout: '', stderr: res.error.message }
+  }
+  return { ok: res.status === 0, stdout: res.stdout || '', stderr: res.stderr || '' }
+}
+
+/**
+ * 读取系统剪切板内容（失败返回空字符串）
+ * @returns {string}
+ */
+export function readClipboard() {
+  const p = process.platform
+  if (p === 'darwin') {
+    return run('pbpaste', []).stdout
+  }
+  if (p === 'win32') {
+    const r = run('powershell', [
+      '-NoProfile', '-Command',
+      '[Console]::Out.Write((Get-Clipboard -Raw -ErrorAction SilentlyContinue))',
+    ])
+    return r.ok ? r.stdout : ''
+  }
+  // linux
+  const r = run('bash', [
+    '-c',
+    'wl-paste --no-newline 2>/dev/null || xclip -selection clipboard -o 2>/dev/null || xsel --clipboard --output 2>/dev/null',
+  ])
+  return r.ok ? r.stdout : ''
+}
+
+/**
+ * 写入系统剪切板
+ * @param {string} text
+ */
+export function writeClipboard(text) {
+  const input = String(text ?? '')
+  const p = process.platform
+  if (p === 'darwin') {
+    run('pbcopy', [], { input })
+    return
+  }
+  if (p === 'win32') {
+    run('powershell', ['-NoProfile', '-Command', 'Set-Clipboard -Value $input'], { input })
+    return
+  }
+  run('bash', ['-c', 'wl-copy 2>/dev/null || xclip -selection clipboard 2>/dev/null || xsel --clipboard --input 2>/dev/null'], { input })
+}

package/src/tools/ftp/index.js

@@ -196,7 +196,7 @@ export class FtpGroup {
       console.error('Usage: opm ftp upload <file> [-n name] [-s subdir]')
       process.exit(1)
     }
-    const name = parsed.flags.name || parsed.flags.n || ''
+    const name = parsed.flags.name || ''
     const subdir = parsed.flags.subdir || parsed.flags.s || ''
     const cfg = getFtpConfig()
 
@@ -242,14 +242,14 @@ export class FtpGroup {
   async _rsync(parsed) {
     const local = parsed.positional[0]
     if (!local) {
-      console.error('Usage: opm ftp rsync <local> [-s subdir] [-x pattern] [--dry-run] [--prune]')
+      console.error('Usage: opm ftp rsync <local> [-s subdir] [-x pattern] [--dry-run] [--delete]')
       process.exit(1)
     }
     const subdir = parsed.flags.subdir || parsed.flags.s || ''
     const excludes = parsed.flags.exclude || parsed.flags.x || []
     const excludeList = Array.isArray(excludes) ? excludes : [excludes]
     const dryRun = parsed.flags['dry-run'] === 'true'
-    const prune = parsed.flags.prune === 'true'
+    const deleteRemote = parsed.flags.delete === 'true'
 
     const cfg = getFtpConfig()
     const localDir = path.resolve(local)
@@ -282,7 +282,7 @@ export class FtpGroup {
     }
 
     const deletePlan = []
-    if (prune) {
+    if (deleteRemote) {
       for (const [rel] of remoteFiles) {
         if (!toUpload.includes(rel)) {
           deletePlan.push(rel)
@@ -335,9 +335,9 @@ export class FtpGroup {
       skippedSame: skippedSame.length,
       skippedExcluded,
       failed,
-      pruned: deleted.length,
-      prunedFiles: deleted,
-      pruneFailed: deleteFailed,
+      deleted: deleted.length,
+      deletedFiles: deleted,
+      deleteFailed,
     })
   }
 
@@ -370,7 +370,7 @@ Actions:
   uninstall                            Uninstall basic-ftp
   upgrade                              Upgrade basic-ftp to latest (uses opm npm registry + proxy)
   connect                              Test FTP connection
-  upload <file> [-n name] [-s subdir]  Upload file (local path or HTTP URL)
+  upload <file> [--name name] [-s subdir]  Upload file (local path or HTTP URL)
   rsync <local> [options]              Recursive upload directory (FTP-side dedup)
   download <remote> <local>            Download file from FTP
   root                                 Show configured remote root directory
@@ -380,7 +380,7 @@ rsync options:
   -s, --subdir <dir>                   Remote subdirectory (under remote_root)
   -x, --exclude <pattern>              Exclude glob pattern (repeatable)
   --dry-run                            Preview without uploading
-  --prune                              Delete remote files not in local
+  --delete                             Delete remote files not in local
 
 Options:
   -p, --proxy <url>                   Proxy for install/upgrade (overrides config proxy.active)
@@ -393,12 +393,12 @@ Examples:
   opm ftp upgrade
   opm ftp connect
   opm ftp upload ./img.png
-  opm ftp upload ./img.png -n cover -s banner
+  opm ftp upload ./img.png --name cover -s banner
   opm ftp upload https://example.com/a.jpg -n cover.jpg
   opm ftp rsync ./webwork/
   opm ftp rsync ./webwork/ -s deploy -x "vendor/*" -x "*.log"
   opm ftp rsync ./webwork/ --dry-run
-  opm ftp rsync ./webwork/ --prune
+  opm ftp rsync ./webwork/ --delete
   opm ftp download 20260913/cover.jpg ./cover.jpg
   opm ftp root
 `)

package/src/tools/git/index.js

@@ -40,6 +40,20 @@ export class GitGroup {
     this.desc = 'Git config management (init/config/user/log/export)'
   }
 
+  /**
+   * 当前 action 下的上下文布尔标志
+   * 同名标志在不同 action 中语义不同（-f：init=force / export=from；--unset：config 带值 / export mark 布尔），
+   * 由 action 决定解析方式，避免布尔标志吞掉后续参数。
+   * @param {string} action
+   * @returns {string[]}
+   * @private
+   */
+  _booleanFlags(action) {
+    if (action === 'init') return ['f', 'force']
+    if (action === 'export') return ['remove', 'unset']
+    return []
+  }
+
   async run(argv) {
     const [action, ...rest] = argv
 
@@ -48,7 +62,7 @@ export class GitGroup {
       return
     }
 
-    const parsed = parseFlags(rest)
+    const parsed = parseFlags(rest, { booleans: this._booleanFlags(action) })
 
     switch (action) {
       case 'version':
@@ -146,7 +160,7 @@ export class GitGroup {
 
   async _user(parsed) {
     const scope = this._getScope(parsed)
-    const name = parsed.flags.n || parsed.flags.name || ''
+    const name = parsed.flags.name || ''
     const email = parsed.flags.e || parsed.flags.email || ''
 
     if (name || email) {
@@ -209,7 +223,7 @@ export class GitGroup {
     const workDir = parsed.flags.d || parsed.flags.dir || process.cwd()
     const ref = parsed.positional[1]
 
-    if (parsed.flags.unset === 'true') {
+    if (parsed.flags.remove === 'true' || parsed.flags.unset === 'true') {
       const ok = unsetMark(workDir)
       output({ mark: 'removed', ok })
       return
@@ -230,7 +244,7 @@ export class GitGroup {
       console.error('\nTips:')
       console.error('  opm git log -d <dir> -n 10     # view commit history without cd')
       console.error('  opm git export mark <commit>   # change diff base to another commit')
-      console.error('  opm git export mark --unset     # remove current mark')
+        console.error('  opm git export mark --remove     # remove current mark')
       console.error('  opm git export                  # export diff (mark -> HEAD)')
       this._printRecentLog(workDir)
       return
@@ -250,7 +264,7 @@ export class GitGroup {
       process.exit(1)
     }
 
-    const fromRaw = parsed.flags.f || parsed.flags.from || ''
+    const fromRaw = parsed.flags.from || ''
     let fromRef
     if (fromRaw) {
       const n = parseInt(fromRaw, 10)
@@ -271,7 +285,7 @@ export class GitGroup {
     if (!outFile) {
       const opts = { encoding: 'utf8', timeout: 5000, cwd: resolvedDir, stdio: ['pipe', 'pipe', 'pipe'] }
       const gitRoot = execSync('git rev-parse --show-toplevel', opts).trim()
-      const name = parsed.flags.n || parsed.flags.name || ''
+      const name = parsed.flags.name || ''
       const fileName = name ? `${name}.diff` : (() => {
         const fromShort = execSync(`git rev-parse --short ${fromRef}`, opts).trim()
         const toShort = execSync('git rev-parse --short HEAD', opts).trim()
@@ -331,7 +345,7 @@ Export subcommands:
   export mark [-d dir]            Show current diff base mark
   export mark 0|HEAD [-d dir]     Set diff base mark to current HEAD
   export mark <commit> [-d dir]   Set diff base mark to a commit
-  export mark --unset [-d dir]    Remove the diff base mark
+  export mark --remove [-d dir]   Remove the diff base mark
   export [-d dir]               Export diff (mark -> HEAD)
   export -f <n> [-d dir]        Export diff (HEAD~n -> HEAD, override mark)
   export -f <ref> [-d dir]      Export diff (<ref> -> HEAD, override mark)
@@ -344,11 +358,15 @@ Options:
   -n, --count <n>                Number of commits to show (log, default: 10)
   -e, --email <email>            User email (user)
   -o, --output <file>            Output file path (export)
-  -f, --from <n>|<ref>           Override from ref (export)
+  --from <n>|<ref>               Override from ref (export)
   -f, --force                    Force overwrite existing config (init)
-  --unset <key>                  Unset a config key (config)
+  --unset <key>                  Unset a config key (config only)
+  --remove                       Remove the diff base mark (export mark)
   -h, --help                     Show this help
 
+Note: -n 在 log 中为 --count 数量，user/export 中用 --name 名称（无短形式）；
+      -f 在 init 中为 --force 布尔，export 中用 --from 带值（无短形式）。
+
 Examples:
   opm git version                Show installed git version
   opm git install                Install git via system package manager
@@ -365,12 +383,11 @@ Examples:
   opm git export mark 0           Set diff base to current HEAD (cwd)
   opm git export mark HEAD        Set diff base to current HEAD (cwd)
   opm git export mark 3af967b   Set diff base at commit (cwd)
-  opm git export mark --unset   Remove diff base mark (cwd)
-  opm git export mark abc -d /repo  Set diff base at commit in /repo
+  opm git export mark --remove   Remove diff base mark (cwd)  opm git export mark abc -d /repo  Set diff base at commit in /repo
   opm git export                Export diff in current repo (mark -> HEAD)
-  opm git export -f 2           Override: HEAD~2 -> HEAD (current repo)
+  opm git export --from 2           Override: HEAD~2 -> HEAD (current repo)
   opm git export -d /path/to/repo  Export diff in specified repo
-  opm git export -n feature     Save as feature.diff
+  opm git export --name feature     Save as feature.diff
   opm git import file.diff      Import diff file (current repo)
   opm git import file.diff -d /repo  Import diff file into specified repo
 `)