pier-setup 0.2.0 → 0.2.2

package/README.md

@@ -46,24 +46,34 @@ pier ships as **two halves**, installed separately:
 No clone needed — run the npm package directly:
 
 ```sh
-npx pier-setup            # user mode: pi install npm:pi-pier + herdr plugin install + auto-generated bootstrap config
-npm i -g pier-setup       # or install globally, then just run pier-setup
+npx pier-setup@latest            # user mode: pi install npm:pi-pier + herdr plugin install
+npx pier-setup@latest version    # local vs npm latest (installer / pi-pier / herdr plugin)
+npx pier-setup@latest update     # refresh both halves in place (does not uninstall first)
+npx pier-setup@latest uninstall  # --purge also drops boot-config.json
+
+npm i -g pier-setup              # or install globally, then: pier-setup / version / update
 ```
 
+Pin `@latest` so npx does not reuse a cached installer. In a clone, `npm install`
+links `node_modules/.bin/pier-setup`, so in-repo `npx pier-setup` runs `./install.mjs`.
+
 Dev mode still requires cloning the repo:
 
 ```sh
 git clone https://github.com/July24/pier && cd pier
 node install.mjs install --dev   # local-path pi install + herdr plugin link; code changes are live
+node install.mjs version --dev
+node install.mjs update --dev    # rewrite boot-config only; pull the repo yourself
 ```
 
 The script verifies the environment (node / pi / herdr versions), probes pi's node
 and cli.js absolute paths, generates boot-config.json (user mode stores it in the
 herdr plugin config dir, so reinstalls don't lose it), and registers both halves.
 
-Other commands: `pier-setup update` (uninstall + reinstall, re-probes paths),
-`pier-setup uninstall --purge`. Override the distribution specs with
-`--pi-spec=` / `--herdr-spec=` (npm publishing or forks).
+`update` re-runs `pi update npm:pi-pier` (falls back to `pi install`) and
+`herdr plugin install … --yes`, then rewrites boot-config. Override sources with
+`--pi-spec=` / `--herdr-spec=` (npm publishing or forks). `pier-setup --help`
+lists every command.
 
 ### Manual install (equivalent steps)
 

package/install.mjs

@@ -1,24 +1,28 @@
 #!/usr/bin/env node
 /**
- * pier 一键安装/卸载/更新（跨平台：macOS / Linux / Windows）。
+ * pier 一键安装/卸载/更新/查版本（跨平台：macOS / Linux / Windows）。
  *
  * 用法：
  *   node install.mjs install  [--dev] [--hmr-dev] [--force]   # 安装（默认命令，可省略 install）
+ *   node install.mjs update   [--dev] [--hmr-dev]             # 原地刷新两半区到最新发行（不先卸载）
+ *   node install.mjs version  [--json]                        # 本地 vs npm latest
  *   node install.mjs uninstall [--dev] [--purge]              # 卸载；--purge 连 boot-config.json 一起删
- *   node install.mjs update   [--dev] [--hmr-dev] [--force]   # 更新 = 卸载注册 + 重新安装（重探测路径）
+ *   node install.mjs --prepare                                # npm prepare：hooksPath + 仓库根 bin 链接
+ *   node install.mjs --help
  *
  * 模式：
- *   用户模式（默认）：pi install git:github.com/July24/pier（仓库根 package.json 的 pi 字段）
+ *   用户模式（默认）：pi install npm:pi-pier
  *                   + herdr plugin install July24/pier/packages/pier-workbench --yes
- *                   boot-config.json 写 herdr plugin config-dir（reinstall 不丢）。
+ *                   boot-config.json 写 herdr plugin config-dir；extPath 指向 pi 已安装的
+ *                   pi-pier（~/.pi/agent/npm/...），不是 pier-setup 包内的仓库路径。
  *   --dev 开发模式：pi install <repo>/packages/pier-ext + herdr plugin link <repo>/packages/pier-workbench
  *                   （link 目录是活的，改码即生效；update 只重写 boot-config）。
- *
  * 发行规格可用 --pi-spec= / --herdr-spec= 覆盖（npm 发布或 fork 场景）。
  * 失败语义：每步给出手动等价命令；步骤失败不阻断报告（exitCode=1）。
  */
 import { execFileSync } from 'node:child_process';
-import { existsSync, mkdirSync, readFileSync, realpathSync, rmSync, writeFileSync } from 'node:fs';
+import { chmodSync, existsSync, mkdirSync, readFileSync, realpathSync, rmSync, symlinkSync, writeFileSync } from 'node:fs';
+import { homedir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -28,10 +32,38 @@ const WB_DIR = join(ROOT, 'packages', 'pier-workbench');
 const DEV_BOOT_CONFIG = join(WB_DIR, 'scripts', 'boot-config.json');
 const EXT_PATH = join(EXT_DIR, 'src', 'index.ts');
 const IS_WIN = process.platform === 'win32';
+const COMMANDS = ['install', 'uninstall', 'update', 'version', 'help'];
+
+/** Workspace root is named pier-setup but npm does not bin-link it, so
+ * `npx pier-setup@version` from the clone runs `sh -c pier-setup` against a
+ * missing node_modules/.bin/pier-setup. Published tarball has no packages/. */
+function prepareRepo() {
+  if (existsSync(join(ROOT, '.githooks'))) {
+    try { execFileSync('git', ['config', 'core.hooksPath', '.githooks'], { stdio: 'ignore' }); } catch { /* not a git checkout */ }
+  }
+  if (!existsSync(EXT_PATH)) return;
+  const binDir = join(ROOT, 'node_modules', '.bin');
+  mkdirSync(binDir, { recursive: true });
+  const posix = join(binDir, 'pier-setup');
+  const cmd = join(binDir, 'pier-setup.cmd');
+  rmSync(posix, { force: true });
+  rmSync(cmd, { force: true });
+  if (IS_WIN) {
+    writeFileSync(cmd, '@echo off\r\nnode "%~dp0\\..\\..\\install.mjs" %*\r\n');
+    writeFileSync(posix, '#!/bin/sh\nexec node "$(dirname "$0")/../../install.mjs" "$@"\n');
+    try { chmodSync(posix, 0o755); } catch { /* git-bash optional */ }
+  } else {
+    symlinkSync('../../install.mjs', posix);
+  }
+}
 
 const argv = process.argv.slice(2);
-const command = ['install', 'uninstall', 'update'].includes(argv[0]) ? argv.shift() : 'install';
-const flags = new Set(argv.filter((a) => a.startsWith('--') && !a.includes('=')));
+if (argv[0] === '--prepare') {
+  prepareRepo();
+  process.exit(0);
+}
+const command = COMMANDS.includes(argv[0]) ? argv.shift() : null;
+const flags = new Set(argv.filter((a) => (a.startsWith('--') && !a.includes('=')) || a === '-h' || a === '-v'));
 const optValue = (name) => argv.find((a) => a.startsWith(`--${name}=`))?.split('=').slice(1).join('=') ?? null;
 const dev = flags.has('--dev');
 const PI_SPEC = optValue('pi-spec') ?? 'npm:pi-pier';   // 用户模式默认 npm 发行版；--pi-spec=git:github.com/July24/pier 可跟随仓库 main
@@ -74,6 +106,34 @@ function geVersion(v, min) {
   return true;
 }
 
+function cmpSemver(a, b) {
+  const pa = parseVersion(a);
+  const pb = parseVersion(b);
+  if (!pa || !pb) return 0;
+  for (let i = 0; i < 3; i++) {
+    if (pa[i] !== pb[i]) return pa[i] < pb[i] ? -1 : 1;
+  }
+  return 0;
+}
+
+function readPkgVersion(dir) {
+  try {
+    return JSON.parse(readFileSync(join(dir, 'package.json'), 'utf8')).version ?? null;
+  } catch {
+    return null;
+  }
+}
+
+function npmLatest(name) {
+  try {
+    return execFileSync('npm', ['view', name, 'version'], {
+      encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], timeout: 15000,
+    }).trim();
+  } catch {
+    return null;
+  }
+}
+
 /** herdr 插件配置目录（用户模式 boot-config 落点；插件已注册才存在路径语义）。 */
 function herdrConfigDir() {
   try { return run('herdr', ['plugin', 'config-dir', 'pier.workbench']); } catch { return null; }
@@ -121,14 +181,70 @@ function probePiRuntime() {
   return null;
 }
 
+function piAgentDir() {
+  return process.env.PI_CODING_AGENT_DIR || join(homedir(), '.pi', 'agent');
+}
+
+function npmNameFromSpec(spec) {
+  if (!spec.startsWith('npm:')) return null;
+  const rest = spec.slice(4);
+  if (rest.startsWith('@')) {
+    const slash = rest.indexOf('/');
+    if (slash < 0) return rest;
+    return `${rest.slice(0, slash)}/${rest.slice(slash + 1).split('@')[0]}`;
+  }
+  return rest.split('@')[0];
+}
+
+function extPathFromPiList() {
+  let out;
+  try { out = run('pi', ['list']); } catch { return null; }
+  const lines = out.split(/\r?\n/);
+  for (let i = 0; i < lines.length; i++) {
+    const spec = lines[i].trim();
+    const loc = lines[i + 1]?.trim();
+    if (!loc) continue;
+    if (!/pi-pier|pier-ext|july24\/pier/i.test(spec)) continue;
+    for (const c of [join(loc, 'src', 'index.ts'), join(loc, 'packages', 'pier-ext', 'src', 'index.ts')]) {
+      if (existsSync(c)) return c;
+    }
+  }
+  return null;
+}
+
+/** User-mode extPath: pi's installed package, never the pier-setup npx cache. */
+function resolveUserExtPath() {
+  const candidates = [];
+  const npmName = npmNameFromSpec(PI_SPEC);
+  if (npmName) candidates.push(join(piAgentDir(), 'npm', 'node_modules', npmName, 'src', 'index.ts'));
+  if (PI_SPEC.startsWith('git:')) {
+    const hostPath = PI_SPEC.slice(4).replace(/^git@/, '').replace(/:/g, '/');
+    candidates.push(
+      join(piAgentDir(), 'git', hostPath, 'packages', 'pier-ext', 'src', 'index.ts'),
+      join(piAgentDir(), 'git', hostPath, 'src', 'index.ts'),
+    );
+  }
+  candidates.push(
+    join(piAgentDir(), 'npm', 'node_modules', 'pi-pier', 'src', 'index.ts'),
+    join(piAgentDir(), 'git', 'github.com', 'July24', 'pier', 'packages', 'pier-ext', 'src', 'index.ts'),
+  );
+  for (const p of candidates) {
+    if (p && existsSync(p)) return p;
+  }
+  return extPathFromPiList();
+}
+
 function writeBootConfig(hmrDev, force) {
   const probed = probePiRuntime();
   if (!probed) die('cannot locate pi cli.js (tried: pi shim realpath, npm root -g). Fill boot-config.json manually.');
-  if (!existsSync(EXT_PATH)) die(`pier-ext entry missing: ${EXT_PATH} (repo layout broken?)`);
-  // 用户模式 extPath 必须指向 herdr 管理的 checkout 内的扩展（安装 herdr 半区后才知道）；
-  // git 安装布局与本地同构：packages/pier-ext/src/index.ts。
-  const extPath = dev ? EXT_PATH
-    : join(herdrManagedRootGuess(), 'packages', 'pier-ext', 'src', 'index.ts');
+  let extPath;
+  if (dev) {
+    if (!existsSync(EXT_PATH)) die(`pier-ext entry missing: ${EXT_PATH} (repo layout broken?)`);
+    extPath = EXT_PATH;
+  } else {
+    extPath = resolveUserExtPath();
+    if (!extPath) die(`cannot locate installed pier-ext (npm:pi-pier / git clone). Did \`pi install ${piSource()}\` succeed?`);
+  }
 
   const config = {
     mainTabLabel: 'main',
@@ -160,15 +276,109 @@ function writeBootConfig(hmrDev, force) {
   log(`  extPath = ${config.extPath}`);
 }
 
-/** herdr 管理的插件 checkout 根（GitHub 安装布局：…/plugins/<owner>-<repo>/…）。 */
-function herdrManagedRootGuess() {
-  const dir = herdrConfigDir();
-  if (!dir) return '';
-  // config-dir 形如 <plugins-root>/<plugin-id>/config → checkout 在 <plugins-root>/<plugin-id>/
-  return resolve(dir, '..');
+function pkgDirFromExtPath(extPath) {
+  let d = dirname(extPath);
+  for (let i = 0; i < 5; i++) {
+    if (existsSync(join(d, 'package.json'))) return d;
+    const parent = dirname(d);
+    if (parent === d) break;
+    d = parent;
+  }
+  return null;
+}
+
+function herdrPluginInfo() {
+  let out;
+  try { out = run('herdr', ['plugin', 'list']); } catch { return { installed: false, spec: null, sha: null }; }
+  const line = out.split(/\r?\n/).find((l) => l.includes('pier.workbench'));
+  if (!line) return { installed: false, spec: null, sha: null };
+  const bracket = line.match(/\[([^\]]+)\]/);
+  const spec = bracket ? bracket[1] : line.trim();
+  const at = spec.lastIndexOf('@');
+  const fullSha = at >= 0 && !spec.startsWith('local:') ? spec.slice(at + 1) : null;
+  return { installed: true, spec, sha: fullSha ? fullSha.slice(0, 7) : null };
+}
+
+function collectStatus() {
+  const installer = readPkgVersion(ROOT);
+  const extPath = dev ? (existsSync(EXT_PATH) ? EXT_PATH : null) : resolveUserExtPath();
+  const extDir = extPath ? pkgDirFromExtPath(extPath) : null;
+  return {
+    product: (extDir ? readPkgVersion(extDir) : null) || installer,
+    mode: dev ? 'dev' : 'user',
+    installer: { name: 'pier-setup', version: installer },
+    piExt: { spec: piSource(), version: extDir ? readPkgVersion(extDir) : null, path: extDir },
+    herdr: herdrPluginInfo(),
+    latest: { 'pier-setup': npmLatest('pier-setup'), 'pi-pier': npmLatest('pi-pier') },
+  };
+}
+
+/* ── 命令 ────────────────────────────────────────────────────────── */
+function usage() {
+  log(`pier-setup — install / update / inspect pier (pi-pier + pier.workbench)
+
+Usage:
+  pier-setup [install] [--dev] [--hmr-dev] [--force]
+  pier-setup update    [--dev] [--hmr-dev]
+  pier-setup version   [--json]
+  pier-setup uninstall [--dev] [--purge]
+
+  npx pier-setup@latest          # recommended user install
+  npx pier-setup@latest update   # refresh both halves to newest release
+  npx pier-setup@latest version  # local vs npm latest
+
+  --pi-spec= / --herdr-spec= override distribution sources
+  --dev  local link (clone); update only rewrites boot-config`);
+}
+
+function version() {
+  const s = collectStatus();
+  if (flags.has('--json')) {
+    log(JSON.stringify(s, null, 2));
+    return;
+  }
+  log(`pier ${s.product ?? 'not installed'}${s.mode === 'dev' ? '  (dev, local link)' : ''}`);
+  log('');
+  log(`  installer   pier-setup      ${s.installer.version ?? 'unknown'}    (this CLI)`);
+  log(`  pi ext      ${s.piExt.spec}    ${s.piExt.version ?? 'not installed'}    ${s.piExt.path ?? ''}`);
+  const herdrVer = s.herdr.installed ? (s.herdr.sha ?? s.herdr.spec) : 'not installed';
+  log(`  herdr       pier.workbench  ${herdrVer}    ${s.herdr.spec ?? ''}`);
+  log('');
+  const ls = s.latest['pier-setup'] ?? 'unavailable (offline?)';
+  const lp = s.latest['pi-pier'] ?? 'unavailable (offline?)';
+  log(`  npm latest  pier-setup ${ls}    pi-pier ${lp}`);
+  if (s.installer.version && s.piExt.version && s.installer.version !== s.piExt.version) {
+    log(`\n⚠ mismatch: installer ${s.installer.version} ≠ pi-pier ${s.piExt.version}`);
+  }
+  const target = s.latest['pi-pier'];
+  if (s.piExt.version && target && cmpSemver(s.piExt.version, target) < 0) {
+    log(`\nupdate available → ${target}    npx pier-setup@latest update`);
+  }
+}
+
+function update() {
+  checkEnv();
+  const me = readPkgVersion(ROOT);
+  const latestSetup = npmLatest('pier-setup');
+  if (latestSetup && me && cmpSemver(me, latestSetup) < 0) {
+    log(`⚠ installer ${me} < latest ${latestSetup} — re-run: npx pier-setup@latest update`);
+  }
+  const hmrDev = flags.has('--hmr-dev');
+  if (dev) {
+    log('dev mode: local link is live; pull the repo yourself. Refreshing boot-config only.');
+    writeBootConfig(hmrDev, true);
+  } else {
+    if (tryRun('pi', ['update', piSource()])) log(`✓ pi extension updated (${piSource()})`);
+    else if (tryRun('pi', ['install', piSource()])) log(`✓ pi extension installed (${piSource()})`);
+    else { console.error('✗ pi update/install failed'); log(`  manual: pi update ${piSource()}`); process.exitCode = 1; }
+    if (tryRun('herdr', ['plugin', 'install', HERDR_SPEC, '--yes'])) log(`✓ herdr plugin updated (${HERDR_SPEC})`);
+    else { console.error('✗ herdr plugin update failed'); log(`  manual: herdr plugin install ${HERDR_SPEC} --yes`); process.exitCode = 1; }
+    writeBootConfig(hmrDev, true);
+  }
+  log('');
+  version();
 }
 
-/* ── 三命令 ──────────────────────────────────────────────────────── */
 function install() {
   const hmrDev = flags.has('--hmr-dev');
   const force = flags.has('--force');
@@ -215,6 +425,8 @@ function uninstall() {
   log(`\npier uninstalled.${purge ? '' : ' (boot-config.json kept; use --purge to remove)'}`);
 }
 
-if (command === 'uninstall') uninstall();
-else if (command === 'update') { log('== uninstall =='); uninstall(); log('\n== install =='); install(); }
+if (command === 'help' || flags.has('--help') || flags.has('-h')) usage();
+else if (command === 'version' || flags.has('--version') || flags.has('-v')) version();
+else if (command === 'uninstall') uninstall();
+else if (command === 'update') update();
 else install();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pier-setup",
-  "version": "0.2.0",
-  "description": "One-shot installer for pier: registers the pi-pier extension with pi and the pier.workbench plugin with herdr (install / uninstall / update)",
+  "version": "0.2.2",
+  "description": "One-shot installer for pier: install / update / version / uninstall for pi-pier + pier.workbench",
   "license": "MIT",
   "type": "module",
   "bin": {
@@ -33,7 +33,7 @@
   "scripts": {
     "test": "node --test \"packages/*/test/*.test.ts\"",
     "test:mutation": "stryker run",
-    "prepare": "git config core.hooksPath .githooks"
+    "prepare": "node ./install.mjs --prepare"
   },
   "devDependencies": {
     "@deepseek-ai/cordis-plugin-group": "^1.0.1",