@wwkit/opm 1.0.5 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwkit/opm",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "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.8"
+    "@wwkit/shared": "1.0.9"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package/scripts/postinstall.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-import { copyBuiltinConfig, getUserConfigFile } from '../src/config.js'
+import { mergeBuiltinConfig, getUserConfigFile } from '../src/config.js'
 
-if (copyBuiltinConfig()) {
-  console.log(`opm: wrote default config to ${getUserConfigFile()}`)
-}
+if (mergeBuiltinConfig()) {
+  console.log(`opm: config updated at ${getUserConfigFile()}`)
+}

package/src/binaries/base.js

@@ -13,7 +13,6 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
-import extractZip from 'extract-zip'
 
 import { parseFlags } from '../cli/helpers/args.js'
 import { output } from '../formatter.js'
@@ -23,6 +22,12 @@ import { getOs, OS_TYPES } from './platform.js'
 import { find as findExe } from './exefinder.js'
 import { verify as verifyDeps } from './depchecker.js'
 
+let _extractZip = null
+async function loadExtractZip() {
+  if (!_extractZip) _extractZip = (await import('extract-zip')).default
+  return _extractZip
+}
+
 const ACTIONS = {
   version:    { desc: 'Show current (active) version' },
   installed:  { desc: 'Check if a version is installed' },
@@ -354,6 +359,7 @@ async _dir() {
     }
     await downloadToFile(url, zipPath, { proxy })
     try {
+      const extractZip = await loadExtractZip()
       await extractZip(zipPath, { dir: extractRoot })
     } finally {
       if (fs.existsSync(zipPath)) {

package/src/cli/groups/package.js

@@ -63,6 +63,7 @@ const ACTIONS = {
   uninstall:  { desc: 'Uninstall a package' },
   upgrade:    { desc: 'Upgrade a package' },
   cache:      { desc: 'Clean cache' },
+  dir:        { desc: 'Show install and package directories' },
   help:       { desc: 'Show help for this manager' },
 }
 
@@ -236,6 +237,12 @@ export class PackageGroup {
         break
       }
 
+      case 'dir': {
+        const result = manager.getDir()
+        output({ name: this.name, ...result })
+        break
+      }
+
       default:
         console.error(`Unknown action: ${action}`)
         process.exit(1)
@@ -262,6 +269,7 @@ Actions:
   uninstall <name>           Uninstall a package
   upgrade <name>             Upgrade a package to latest
   cache clean                Clean cache
+  dir                        Show install and package directories
   help                       Show this help
 
 Options:

package/src/config.js

@@ -47,6 +47,14 @@ export function copyBuiltinConfig() {
   return _loader.copyBuiltinConfig()
 }
 
+/**
+ * 合并内置配置到用户配置文件（追加缺失 key，不覆盖已有值）
+ * @returns {boolean} 是否写入了文件
+ */
+export function mergeBuiltinConfig() {
+  return _loader.mergeBuiltinConfig()
+}
+
 /**
  * 按点分路径取配置子节点
  * @param {object} config - getConfig 的返回结果

package/src/harnesses/base.js

@@ -27,7 +27,6 @@ const ACTIONS = {
   clear:      { desc: 'Clear sessions / data' },
   dir:        { desc: 'Show data / db / log / config paths' },
   env:        { desc: 'Show harness environment variables' },
-  open:       { desc: 'Open TUI in a work directory (with env vars injected)' },
   help:       { desc: 'Show this help' },
 }
 
@@ -57,11 +56,15 @@ export class HarnessGroup {
   async run(argv) {
     const [action, ...rest] = argv
 
-    if (!action || action === '-h' || action === '--help' || action === 'help') {
+    if (action === '-h' || action === '--help' || action === 'help') {
       this.printHelp()
       return
     }
 
+    if (!action || !ACTIONS[action]) {
+      return this._open(argv)
+    }
+
     switch (action) {
       case 'version':
         return this._version()
@@ -81,8 +84,6 @@ export class HarnessGroup {
         return this._dir()
       case 'env':
         return this._env()
-      case 'open':
-        return this._open(rest)
       default:
         console.error(`Unknown action: ${action}`)
         this.printHelp()
@@ -190,14 +191,30 @@ export class HarnessGroup {
       console.error(`open is not supported for ${this.cfg.name}`)
       process.exit(1)
     }
-    const parsed = parseFlags(rest)
-    const workDir = parsed.flags.d || parsed.flags.dir || process.cwd()
+    let workDir = process.cwd()
+    const passThrough = []
+    for (let i = 0; i < rest.length; i++) {
+      const arg = rest[i]
+      if (arg === '-d' || arg === '--dir') {
+        const next = rest[i + 1]
+        if (next !== undefined && !next.startsWith('-')) {
+          workDir = next
+          i++
+        } else {
+          passThrough.push(arg)
+        }
+      } else if (arg.startsWith('-d=') || arg.startsWith('--dir=')) {
+        workDir = arg.slice(arg.indexOf('=') + 1)
+      } else {
+        passThrough.push(arg)
+      }
+    }
     const resolved = path.resolve(workDir)
     if (!fs.existsSync(resolved)) {
       console.error(`Directory not found: ${resolved}`)
       process.exit(1)
     }
-    this.cfg.open(resolved)
+    this.cfg.open(resolved, passThrough)
   }
 
   printHelp() {
@@ -221,7 +238,7 @@ ${actionLines}
 ${clearSection}
 Options:
   -p, --proxy <url>  Proxy for install/upgrade (overrides config proxy.active)
-  -d, --dir <dir>     Working directory for open (default: cwd)
+  -d, --dir <dir>     Working directory for direct launch (default: cwd)
   -h, --help          Show this help
 
 Examples:
@@ -232,8 +249,9 @@ Examples:
   opm ${this.cfg.name} clear
   opm ${this.cfg.name} dir
   opm ${this.cfg.name} env
-  opm ${this.cfg.name} open                  Open in current directory
-  opm ${this.cfg.name} open -d /path/to/project
+  opm ${this.cfg.name}                           Launch TUI in current directory
+  opm ${this.cfg.name} -d /path/to/project
+  opm ${this.cfg.name} -c config --agent work    Pass through args to opencode
 `)
   }
 }

package/src/harnesses/opencode/index.js

@@ -55,8 +55,9 @@ function getEnvVars() {
  * 在指定工作目录启动 opencode TUI
  * 自动注入有值的环境变量（系统 env > opm config）
  * @param {string} workDir - 工作目录
+ * @param {string[]} [passThroughArgs=[]] - Extra args passed to opencode
  */
-function openTui(workDir) {
+function openTui(workDir, passThroughArgs = []) {
   const env = { ...process.env }
   const cfgEnv = getEnvVars()
   for (const key of ENV_VARS) {
@@ -65,17 +66,20 @@ function openTui(workDir) {
     }
   }
 
-  const cmd = shell.isWindows ? 'opencode.exe' : 'opencode'
-  const child = spawn(cmd, [], {
+  const cmd = 'opencode'
+  const child = spawn(cmd, passThroughArgs, {
     cwd: workDir,
     stdio: 'inherit',
     env,
-    shell: shell.shellForExec(false),
+    shell: shell.isWindows,
   })
   child.on('error', (err) => {
     console.error(`Failed to start opencode: ${err.message}`)
     process.exit(1)
   })
+  child.on('close', (code) => {
+    process.exit(code ?? 0)
+  })
 }
 
 export const opencodeHarness = {

package/src/managers/apt.js

@@ -374,4 +374,24 @@ export class AptManager extends PackageManager {
     this._execInherit(['get', 'clean'])
     return { action: 'cache cleaned' }
   }
+
+  /**
+   * 查询 apt 安装路径和包目录
+   * @returns {{ name: string, install: string, listsDir: string, sourcesList: string, sourcesDir: string }}
+   */
+  getDir() {
+    const which = process.platform === 'win32' ? 'where' : 'which'
+    let install = ''
+    try {
+      install = execSync(`${which} apt`, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim().split('\n')[0]
+    } catch {}
+
+    return {
+      name: 'apt',
+      install,
+      listsDir: '/var/lib/apt/lists',
+      sourcesList: SOURCES_LIST,
+      sourcesDir: SOURCES_DIR,
+    }
+  }
 }

package/src/managers/base.js

@@ -164,4 +164,12 @@ export class PackageManager {
   async cleanCache() {
     throw new Error(`${this.name}: cleanCache not implemented`)
   }
+
+  /**
+   * 查询管理器安装路径和包目录
+   * @returns {{ name: string, install: string, [key: string]: string }}
+   */
+  getDir() {
+    return { name: this.name, install: '' }
+  }
 }

package/src/managers/brew.js

@@ -371,4 +371,24 @@ export class BrewManager extends PackageManager {
     this._execInherit(['cleanup', '-s', '--prune=all'])
     return { action: 'cache cleaned' }
   }
+
+  /**
+   * 查询 brew 安装路径和包目录
+   * @returns {{ name: string, install: string, prefix: string, cellar: string }}
+   */
+  getDir() {
+    const install = getBrewBin()
+
+    let prefix = ''
+    try {
+      prefix = execSync(`${install} --prefix`, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim()
+    } catch {}
+
+    let cellar = ''
+    try {
+      cellar = execSync(`${install} --cellar`, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim()
+    } catch {}
+
+    return { name: 'brew', install, prefix, cellar }
+  }
 }

package/src/managers/bun.js

@@ -8,6 +8,7 @@
 
 import { execSync, spawnSync } from 'node:child_process'
 import fs from 'node:fs'
+import os from 'node:os'
 import path from 'node:path'
 import { PackageManager } from './base.js'
 import { getActiveRegistry, setActiveRegistry } from '../config.js'
@@ -339,4 +340,25 @@ export class BunManager extends PackageManager {
     this._execInherit(['pm', 'cache', 'rm'])
     return { action: 'cache cleaned' }
   }
+
+  /**
+   * 查询 bun 安装路径和包目录
+   * @returns {{ name: string, install: string, globalDir: string, cacheDir: string }}
+   */
+  getDir() {
+    const which = process.platform === 'win32' ? 'where' : 'which'
+    let install = ''
+    try {
+      install = execSync(`${which} bun`, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim().split('\n')[0]
+    } catch {}
+
+    const bunHome = path.join(os.homedir(), '.bun')
+
+    return {
+      name: 'bun',
+      install,
+      globalDir: path.join(bunHome, 'install', 'global'),
+      cacheDir: path.join(bunHome, 'install', 'cache'),
+    }
+  }
 }

package/src/managers/composer.js

@@ -277,4 +277,25 @@ export class ComposerManager extends PackageManager {
     this._execInherit(['clear-cache'])
     return { action: 'cache cleaned' }
   }
+
+  /**
+   * 查询 composer 安装路径和包目录
+   * @returns {{ name: string, install: string, globalHome: string, vendorDir: string }}
+   */
+  getDir() {
+    const which = process.platform === 'win32' ? 'where' : 'which'
+    let install = ''
+    try {
+      install = execSync(`${which} composer`, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim().split('\n')[0]
+    } catch {}
+
+    let globalHome = ''
+    try {
+      globalHome = this._exec(['config', '--global', 'home'], { allowNonZero: true }).trim()
+    } catch {}
+
+    const vendorDir = fs.existsSync(path.join(process.cwd(), 'vendor')) ? path.join(process.cwd(), 'vendor') : ''
+
+    return { name: 'composer', install, globalHome, vendorDir }
+  }
 }

package/src/managers/dnf.js

@@ -367,4 +367,23 @@ export class DnfManager extends PackageManager {
     this._execInherit(['clean', 'all'])
     return { action: 'cache cleaned' }
   }
+
+  /**
+   * 查询 dnf 安装路径和包目录
+   * @returns {{ name: string, install: string, cacheDir: string, repoDir: string }}
+   */
+  getDir() {
+    const which = process.platform === 'win32' ? 'where' : 'which'
+    let install = ''
+    try {
+      install = execSync(`${which} dnf`, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim().split('\n')[0]
+    } catch {}
+
+    return {
+      name: 'dnf',
+      install,
+      cacheDir: '/var/cache/dnf',
+      repoDir: REPO_DIR,
+    }
+  }
 }

package/src/managers/npm.js

@@ -498,4 +498,38 @@ export class NpmManager extends PackageManager {
     this._execInherit(['cache', 'clean', '--force'])
     return { action: 'cache cleaned' }
   }
+
+  /**
+   * 查询 npm 安装路径和包目录
+   * @returns {{ name: string, install: string, globalDir: string, localDir: string, cacheDir: string, prefix: string }}
+   */
+  getDir() {
+    const which = process.platform === 'win32' ? 'where' : 'which'
+    let install = ''
+    try {
+      install = execSync(`${which} npm`, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim().split('\n')[0]
+    } catch {}
+
+    let globalDir = ''
+    try {
+      globalDir = this._exec(['root', '-g'], { allowNonZero: true }).trim()
+    } catch {}
+
+    let localDir = ''
+    try {
+      localDir = this._exec(['root'], { allowNonZero: true }).trim()
+    } catch {}
+
+    let cacheDir = ''
+    try {
+      cacheDir = this._exec(['config', 'get', 'cache'], { allowNonZero: true }).trim()
+    } catch {}
+
+    let prefix = ''
+    try {
+      prefix = this._exec(['config', 'get', 'prefix'], { allowNonZero: true }).trim()
+    } catch {}
+
+    return { name: 'npm', install, globalDir, localDir, cacheDir, prefix }
+  }
 }

package/src/managers/php.js

@@ -113,10 +113,16 @@ export class PhpManager extends RuntimeManager {
    * @returns {string}
    */
   getInstallDir() {
+    // 优先 phpenv 管理的版本
     try {
       const out = this._exec(['which'], { allowNonZero: true }).trim()
-      if (!out) return ''
-      return path.dirname(path.dirname(out))
+      if (out) return path.dirname(path.dirname(out))
+    } catch {}
+    // 回退到系统级 php
+    try {
+      const which = process.platform === 'win32' ? 'where' : 'which'
+      const out = execSync(`${which} php`, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim().split('\n')[0]
+      if (out) return path.dirname(path.dirname(out))
     } catch {}
     return ''
   }

package/src/managers/pip.js

@@ -552,4 +552,28 @@ export class PipManager extends PackageManager {
     this._execInherit(['cache', 'purge'])
     return { action: 'cache cleaned' }
   }
+
+  /**
+   * 查询 pip 安装路径和包目录
+   * @returns {{ name: string, install: string, sitePackages: string, userSite: string }}
+   */
+  getDir() {
+    const which = process.platform === 'win32' ? 'where' : 'which'
+    let install = ''
+    try {
+      install = execSync(`${which} pip`, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim().split('\n')[0]
+    } catch {}
+
+    let sitePackages = ''
+    try {
+      sitePackages = execSync('python -c "import site; print(site.getsitepackages()[0])"', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim()
+    } catch {}
+
+    let userSite = ''
+    try {
+      userSite = execSync('python -c "import site; print(site.getusersitepackages())"', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim()
+    } catch {}
+
+    return { name: 'pip', install, sitePackages, userSite }
+  }
 }

package/src/managers/proc.js

@@ -8,12 +8,17 @@
  * 回退 netstat -tlnp（Linux）/ netstat -ano（Windows）。
  */
 
-import si from 'systeminformation'
 import { spawn } from 'node:child_process'
 import { Shell } from '@wwkit/shared'
 
 const shell = new Shell()
 
+let _si = null
+async function loadSi() {
+  if (!_si) _si = (await import('systeminformation')).default
+  return _si
+}
+
 /**
  * MB 字节数转换
  * @param {number} bytes
@@ -28,6 +33,7 @@ function toMB(bytes) {
  * @returns {Promise<Map<number, {pid: number, name: string}>>}
  */
 export async function getPortMap() {
+  const si = await loadSi()
   const map = new Map()
 
   try {
@@ -92,6 +98,7 @@ export async function getPortMap() {
  * @returns {Promise<object>}
  */
 export async function getSystemInfo() {
+  const si = await loadSi()
   const [osInfo, cpuInfo, memInfo, fsInfo, timeInfo] = await Promise.all([
     si.osInfo(),
     si.cpu(),
@@ -141,6 +148,7 @@ export async function getSystemInfo() {
  * @returns {Promise<object>}
  */
 export async function listProcesses(count, sortBy) {
+  const si = await loadSi()
   const [procs, portMap] = await Promise.all([
     si.processes(),
     getPortMap(),
@@ -184,6 +192,7 @@ export async function listProcesses(count, sortBy) {
  * @returns {Promise<object>}
  */
 export async function searchProcesses({ name, port, exact }) {
+  const si = await loadSi()
   const [procs, portMap] = await Promise.all([
     si.processes(),
     getPortMap(),
@@ -243,6 +252,7 @@ export async function searchProcesses({ name, port, exact }) {
  * @returns {Promise<object>}
  */
 export async function listPorts(portFilter) {
+  const si = await loadSi()
   const portMap = await getPortMap()
   const procs = await si.processes()
   const procMap = new Map(procs.list.map((p) => [p.pid, p]))
@@ -312,6 +322,7 @@ export async function killByPort(port, signal) {
  * @returns {Promise<object>}
  */
 export async function killByName(name, signal) {
+  const si = await loadSi()
   const procs = await si.processes()
   const lower = name.toLowerCase()
   const matched = procs.list.filter((p) =>
@@ -338,6 +349,7 @@ export async function killByName(name, signal) {
  * @returns {Promise<object>}
  */
 export async function getProcessTree(rootPid) {
+  const si = await loadSi()
   const procs = await si.processes()
   const procMap = new Map(procs.list.map((p) => [p.pid, p]))
   const childrenMap = new Map()
@@ -382,6 +394,7 @@ export async function getProcessTree(rootPid) {
  * @returns {Promise<object>}
  */
 export async function getProcessDetail(pid) {
+  const si = await loadSi()
   const [procs, portMap] = await Promise.all([
     si.processes(),
     getPortMap(),

package/src/managers/python.js

@@ -103,10 +103,20 @@ export class PythonManager extends RuntimeManager {
    * @returns {string}
    */
   getInstallDir() {
+    // 优先 uv 管理的版本
     try {
       const out = this._exec(['python', 'find'], { allowNonZero: true }).trim()
-      if (!out) return ''
-      return path.dirname(path.dirname(out))
+      if (out) return path.dirname(path.dirname(out))
+    } catch {}
+    // 回退到系统级 python3 / python
+    try {
+      const which = process.platform === 'win32' ? 'where' : 'which'
+      for (const cmd of ['python3', 'python']) {
+        try {
+          const out = execSync(`${which} ${cmd}`, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim().split('\n')[0]
+          if (out) return path.dirname(path.dirname(out))
+        } catch {}
+      }
     } catch {}
     return ''
   }

package/src/managers/winget.js

@@ -265,4 +265,17 @@ export class WingetManager extends PackageManager {
   async cleanCache() {
     return { action: 'winget has no cache clean command' }
   }
+
+  /**
+   * 查询 winget 安装路径
+   * @returns {{ name: string, install: string }}
+   */
+  getDir() {
+    let install = ''
+    try {
+      install = execSync('where winget', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'], shell: true }).trim().split('\r?\n')[0]
+    } catch {}
+
+    return { name: 'winget', install }
+  }
 }

package/src/tools/ftp/client.js

@@ -5,11 +5,17 @@
  * 自动重试 + 超时 + 被动模式由配置驱动。
  */
 
-import ftp from 'basic-ftp'
 import { Readable } from 'node:stream'
 import { getConfig } from '../../config.js'
 
-const { Client } = ftp
+let _Client = null
+async function loadClient() {
+  if (!_Client) {
+    const ftp = (await import('basic-ftp')).default
+    _Client = ftp.Client
+  }
+  return _Client
+}
 
 /**
  * 从 opm config 读取 FTP 配置
@@ -36,6 +42,7 @@ export function getFtpConfig() {
  */
 export async function connect() {
   const cfg = getFtpConfig()
+  const Client = await loadClient()
   const client = new Client(cfg.timeout * 1000)
   await client.access({
     host: cfg.host,