@wwkit/opm 1.0.6 → 1.0.8

package/package.json

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

package/src/managers/npm.js

@@ -454,13 +454,14 @@ export class NpmManager extends PackageManager {
   }
 
   /**
-   * 构造 --allow-scripts 参数（仅 npm >= 11 支持）
-   * @param {string} name - 包名
+   * 构造 --dangerously-allow-all-scripts 参数（仅 npm >= 11 支持）
+   * npm < 11 默认放行所有脚本，无需此 flag；npm >= 11 默认阻止，需显式放行
+   * @param {string} name - 包名（保留签名兼容，未使用）
    * @returns {string[]}
    * @private
    */
   _allowScriptsArgs(name) {
-    return this._npmMajor() >= 11 ? [`--allow-scripts=${name}`] : []
+    return this._npmMajor() >= 11 ? ['--dangerously-allow-all-scripts'] : []
   }
 
   async install(name, version, opts = {}) {

package/src/tools/webwork/index.js

@@ -10,16 +10,20 @@
  *   6. harness（npm 全局安装 @wwkit/harness，已安装则跳过）
  *   7. sshproxy（npm 全局安装 @wwkit/sshproxy，已安装则跳过）
  *
+ * npm 包安装使用 --dangerously-allow-all-scripts（npm >= 11）放行 postinstall 脚本。
+ *
  * install 流程：镜像可达检查 → 安装组件 → 初始化 → 验证
- * init 流程：ww config init → ww webdriver init → ww opencode init → ww sqlite init
- * verify 流程：ww sqlite debug → ww run debug → ww web status → ww webdriver debug
+ * init 流程：ww config init → 写运行时路径(cft/harness) → ww sqlite init → ww web init → summary
+ * verify 流程：ww doctor → ww sqlite debug → ww run debug → ww web status → ww webdriver debug
  *
  * 命令: version / versions / installed / install / init / verify / uninstall / upgrade / help
  */
 
+import fs from 'node:fs'
+import path from 'node:path'
 import { execSync } from 'node:child_process'
 
-import { Shell } from '@wwkit/shared'
+import { Shell, getXdgConfigDir } from '@wwkit/shared'
 import { parseFlags } from '../../cli/helpers/args.js'
 import { output } from '../../formatter.js'
 import { getActiveProxy, getConfig, getActiveRegistry } from '../../config.js'
@@ -190,9 +194,7 @@ export class WebworkGroup {
 
     output({ action: verb, results, summary: { ok, skipped, failed, total } })
 
-    if (failed > 0) {
-      process.exit(1)
-    }
+    return { results, ok, skipped, failed }
   }
 
   async _install(parsed) {
@@ -280,9 +282,8 @@ export class WebworkGroup {
   async _init(parsed) {
     const steps = [
       { name: 'config', cmd: 'ww config init', required: true },
-      { name: 'webdriver', cmd: 'ww webdriver init', required: true, hint: 'Downloads Chrome for Testing (~200MB)' },
-      { name: 'opencode', cmd: 'ww opencode init', required: true },
       { name: 'sqlite', cmd: 'ww sqlite init', required: true },
+      { name: 'web', cmd: 'ww web init', required: true, hint: 'Start web service :7901' },
     ]
 
     for (const step of steps) {
@@ -290,6 +291,9 @@ export class WebworkGroup {
       try {
         execSync(step.cmd, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] })
         console.log(`  [OK] ${step.name}`)
+        if (step.name === 'config') {
+          this._writeRuntimePaths()
+        }
       } catch (err) {
         if (step.required) {
           throw new Error(`${step.name} init failed: ${err.message}`)
@@ -297,6 +301,120 @@ export class WebworkGroup {
         console.error(`  [WARN] ${step.name}: ${err.message}`)
       }
     }
+
+    await this._summary()
+  }
+
+  /**
+   * 将 cft/harness 的实际安装路径写入 webwork.json5（替代 post.py 的配置集成）
+   * 在 ww config init 之后执行，确保 webwork.json5 已存在
+   */
+  _writeRuntimePaths() {
+    const configDir = getXdgConfigDir('webwork')
+    let configPath = null
+    for (const fname of ['webwork.json5', 'webwork.json']) {
+      const p = path.join(configDir, fname)
+      if (fs.existsSync(p)) { configPath = p; break }
+    }
+    if (!configPath) {
+      console.log('  [SKIP] webwork.json5 not found, skip runtime paths')
+      return
+    }
+
+    let cfg
+    try {
+      cfg = JSON.parse(fs.readFileSync(configPath, 'utf8'))
+    } catch {
+      console.log('  [SKIP] webwork.json5 parse failed, skip runtime paths')
+      return
+    }
+
+    let changed = false
+
+    const cft = new CftGroup()
+    const cftActive = cft._readActive()
+    if (cftActive) {
+      const cftPath = cft._versionRoot(cftActive)
+      if (fs.existsSync(path.join(cftPath, 'installed.json'))) {
+        cfg.webdriver = cfg.webdriver || {}
+        cfg.webdriver.chromium = cfg.webdriver.chromium || {}
+        cfg.webdriver.chromium.cft = cfg.webdriver.chromium.cft || {}
+        cfg.webdriver.chromium.cft.location = cftPath
+        console.log(`  [OK] webdriver.chromium.cft.location = ${cftPath}`)
+        changed = true
+      }
+    }
+
+    try {
+      const npmRoot = execSync('npm root -g', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim()
+      const harnessDir = path.join(npmRoot, '@wwkit', 'harness')
+      if (fs.existsSync(harnessDir)) {
+        cfg.plugin = cfg.plugin || {}
+        cfg.plugin.opencode = cfg.plugin.opencode || {}
+        cfg.plugin.opencode.config_dir = harnessDir
+        console.log(`  [OK] plugin.opencode.config_dir = ${harnessDir}`)
+        changed = true
+      }
+    } catch {}
+
+    if (changed) {
+      fs.writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf8')
+      console.log('  [OK] webwork.json5 updated with runtime paths')
+    }
+  }
+
+  /**
+   * 打印安装状态汇总（对齐 ww init 的 _step_summary）
+   */
+  async _summary() {
+    console.log('  [SUMMARY]')
+    console.log(`    OS:           ${process.platform} ${process.arch}`)
+    console.log(`    Node:         ${process.version}`)
+    try {
+      const npmVer = execSync('npm --version', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim()
+      console.log(`    npm:          ${npmVer}`)
+    } catch {}
+    console.log('  [Components]')
+    for (const { key, label } of COMPONENTS) {
+      try {
+        const installed = await this._isComponentInstalled(key)
+        const version = await this._getComponentVersion(key)
+        console.log(`    ${label.padEnd(14)} ${version || '-'} ${installed ? '✓' : '✗'}`)
+      } catch {
+        console.log(`    ${label.padEnd(14)} - ?`)
+      }
+    }
+    console.log('  [Config]')
+    try {
+      const npmRegistry = getActiveRegistry('npm')
+      console.log(`    npm mirror:   ${npmRegistry || '(未配置)'}`)
+    } catch {}
+  }
+
+  async _isComponentInstalled(key) {
+    switch (key) {
+      case 'python': return this._pythonInstalled()
+      case 'blues-lib': return await this._pipInstalled('blues-lib')
+      case 'cft': return this._cftInstalled()
+      case 'node': return this._nodeInstalled()
+      case 'opencode': return await this._npmInstalled(NPM_PACKAGES.opencode)
+      case 'harness': return await this._npmInstalled(NPM_PACKAGES.harness)
+      case 'sshproxy': return await this._npmInstalled(NPM_PACKAGES.sshproxy)
+      default: return false
+    }
+  }
+
+  async _getComponentVersion(key) {
+    switch (key) {
+      case 'python': return await this._pythonVersion()
+      case 'blues-lib': return await this._pipVersion('blues-lib')
+      case 'cft': return this._cftVersion()
+      case 'node': return this._nodeVersion()
+      case 'opencode': return await this._npmVersion(NPM_PACKAGES.opencode)
+      case 'harness': return await this._npmVersion(NPM_PACKAGES.harness)
+      case 'sshproxy': return await this._npmVersion(NPM_PACKAGES.sshproxy)
+      default: return '-'
+    }
   }
 
   /**
@@ -304,6 +422,15 @@ export class WebworkGroup {
    * @param {object} parsed
    */
   async _verify(parsed) {
+    console.log('  [VERIFY] doctor (ww doctor)...')
+    try {
+      execSync('ww doctor', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] })
+      console.log('  [OK] doctor')
+    } catch (err) {
+      const out = err.stdout ? err.stdout.toString().trim() : ''
+      console.error(`  [WARN] doctor:\n${out || err.message}`)
+    }
+
     const checks = [
       { name: 'sqlite', cmd: 'ww sqlite debug', pattern: /访问成功|ok|success/i },
       { name: 'run', cmd: 'ww run debug', pattern: /run debug/i },
@@ -672,12 +799,12 @@ export class WebworkGroup {
     if (existing.installed) {
       return { action: 'skipped', reason: `${name} ${existing.version} already installed`, version: existing.version }
     }
-    return npm.install(name, null, { global: true, proxy, allowScripts: name.startsWith('@wwkit/') })
+    return npm.install(name, null, { global: true, proxy, allowScripts: true })
   }
 
   async _upgradeNpmPackage(name, proxy) {
     const npm = new NpmManager()
-    return npm.upgrade(name, { global: true, proxy, allowScripts: name.startsWith('@wwkit/') })
+    return npm.upgrade(name, { global: true, proxy, allowScripts: true })
   }
 
   async _uninstallNpmPackage(name) {