skillgauntlet 1.3.3 → 1.3.5

package/bin/skillgauntlet.js

@@ -20,7 +20,7 @@ import { renderResult } from '../lib/chart.js';
 import { makeProgress } from '../lib/progress.js';
 import { setLang, detectLang, errorText, t } from '../lib/i18n.js';
 import { resolveBin, backend, backendFor, usesOwnDeepseek, setNativeModels, HOSTS, checkModel, draftQueries, draftQuality, runTrial, requireHost, pingHost, setHostBin, binInstalled } from '../lib/trial.js';
-import { HOST_CLI, searchHost, installCommand, installHost, LOGIN, loginCommand } from '../lib/findhost.js';
+import { HOST_CLI, searchHost, installCommand, installHost, userInstallDir, LOGIN, loginCommand } from '../lib/findhost.js';
 import { launchSpec } from '../lib/spawn.js';
 import { ensureTool } from '../lib/github.js';
 import { spawnSync as runLogin } from 'node:child_process';
@@ -71,6 +71,8 @@ async function fixMissingHost(hostId, err) {
     return true;
   }
   if (pick.install) {
+    const userDir = userInstallDir();
+    if (userDir) say(`\n${t('hostInstallUserDir', { dir: userDir })}`);
     say(`\n${t('hostInstalling', { host: label })}`);
     try { installHost(hostId); } catch (e) {
       say(t('hostInstallFailed', { why: e.message }));

package/lib/findhost.js

@@ -73,11 +73,34 @@ export function searchHost(host, dirs = searchDirs()) {
 // Codewhale's package has an install script, and npm only runs install scripts it has been told to allow. The
 // allowance is given for this one command (--allow-scripts) rather than written into the user's npm config.
 const INSTALL_FLAGS = { codewhale: ' --allow-scripts=codewhale' };
-export const installCommand = (host) => (HOST_CLI[host]?.pkg ? `npm install -g ${HOST_CLI[host].pkg}${INSTALL_FLAGS[host] || ''}` : null);
+// A system npm (Debian, Ubuntu, Fedora ...) keeps its global packages under /usr, which an ordinary user cannot write,
+// so `npm install -g` ends in EACCES. Where that is so the install goes to the user's own ~/.local (its bin folder is
+// already searched for host CLIs) and needs no sudo and no password. Asked once and remembered.
+let prefixWritable = null;
+export function npmPrefixWritable() {
+  if (prefixWritable !== null) return prefixWritable;
+  if (process.platform === 'win32') return (prefixWritable = true);
+  try {
+    const prefix = execSync('npm prefix -g', { encoding: 'utf8', timeout: 15000, windowsHide: true, stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+    const modules = path.join(prefix, 'lib', 'node_modules');
+    fs.accessSync(fs.existsSync(modules) ? modules : prefix, fs.constants.W_OK);
+    prefixWritable = true;
+  } catch { prefixWritable = false; }
+  return prefixWritable;
+}
+export const userPrefix = () => path.join(os.homedir(), '.local');
+// The folder the host will be installed into when the system one is not writable, else null.
+export const userInstallDir = ({ writable = npmPrefixWritable() } = {}) => (writable ? null : userPrefix());
+
+export function installCommand(host, { writable = npmPrefixWritable() } = {}) {
+  if (!HOST_CLI[host]?.pkg) return null;
+  const base = `npm install -g ${HOST_CLI[host].pkg}${INSTALL_FLAGS[host] || ''}`;
+  return writable ? base : `${base} --prefix "${userPrefix()}"`;
+}
 
 // Runs the npm install with its output on the user's terminal. Throws with a short reason on failure.
-export function installHost(host, run = (cmd) => execSync(cmd, { stdio: 'inherit' })) {
-  const cmd = installCommand(host);
+export function installHost(host, run = (cmd) => execSync(cmd, { stdio: 'inherit' }), opts = {}) {
+  const cmd = installCommand(host, opts);
   if (!cmd) throw new Error('no installer for this host');
   try { run(cmd); } catch (err) { throw new Error(String(err.message || err).split(/\r?\n/)[0]); }
 }

package/lib/github.js

@@ -11,10 +11,48 @@ const quiet = (cmd, args) => execFileSync(cmd, args, { encoding: 'utf8', stdio:
 const live = (cmd, args) => spawnSync(cmd, args, { stdio: 'inherit', shell: process.platform === 'win32', windowsHide: false });
 
 export const TOOLS = {
-  git: { why: 'git', win: 'Git.Git', brew: 'git', url: 'https://git-scm.com/downloads' },
-  gh: { why: 'gh', win: 'GitHub.cli', brew: 'gh', url: 'https://cli.github.com' },
+  git: { url: 'https://git-scm.com/downloads', pkg: { winget: 'Git.Git', choco: 'git', scoop: 'git', brew: 'git', apt: 'git', dnf: 'git', pacman: 'git', zypper: 'git', apk: 'git' } },
+  gh: { url: 'https://cli.github.com', pkg: { winget: 'GitHub.cli', choco: 'gh', scoop: 'gh', brew: 'gh', apt: 'gh', dnf: 'gh', pacman: 'github-cli', zypper: 'gh', apk: 'github-cli' } },
 };
 
+// The package managers to look for on each system, in the order they are preferred.
+export const MANAGERS = { win32: ['winget', 'choco', 'scoop'], darwin: ['brew'], linux: ['apt-get', 'dnf', 'pacman', 'zypper', 'apk', 'brew'] };
+
+// The steps that install `pkg` with a manager. The system-wide ones need root, so they are run through sudo unless the
+// user already is root; a `sudo` prompt for the password then appears on the user's own terminal.
+function stepsFor(manager, pkg, id, asRoot) {
+  const root = (args) => (asRoot ? args : ['sudo', ...args]);
+  switch (manager) {
+    case 'winget': return [['winget', 'install', '--id', id, '-e', '--accept-source-agreements', '--accept-package-agreements']];
+    case 'choco': return [['choco', 'install', pkg, '-y']];
+    case 'scoop': return [['scoop', 'install', pkg]];
+    case 'brew': return [['brew', 'install', pkg]];
+    case 'apt-get': return [root(['apt-get', 'update']), root(['apt-get', 'install', '-y', pkg])];
+    case 'dnf': return [root(['dnf', 'install', '-y', pkg])];
+    case 'pacman': return [root(['pacman', '-S', '--noconfirm', pkg])];
+    case 'zypper': return [root(['zypper', '--non-interactive', 'install', pkg])];
+    case 'apk': return [root(['apk', 'add', pkg])];
+    default: return null;
+  }
+}
+
+// What this system can run to install a tool, or null when it cannot be done here. `ctx.have(cmd)` says whether a command
+// exists; `ctx.uid` is the user id (0 is root). The first package manager found wins.
+export function installPlan(tool, platform = process.platform, ctx = {}) {
+  const spec = TOOLS[tool];
+  if (!spec) return null;
+  const have = ctx.have || (() => false);
+  const asRoot = ctx.uid === 0;
+  const manager = (MANAGERS[platform] || []).find((m) => have(m));
+  if (!manager) return null;
+  const key = manager === 'apt-get' ? 'apt' : manager;
+  const pkg = spec.pkg[key];
+  if (!pkg) return null;
+  const sudoNeeded = !['winget', 'choco', 'scoop', 'brew'].includes(manager) && !asRoot;
+  if (sudoNeeded && !have('sudo')) return null; // neither root nor sudo: nothing that can be done from here
+  return { manager, steps: stepsFor(manager, pkg, pkg, asRoot), sudo: sudoNeeded };
+}
+
 // Where a fresh install lands when the running process was started before it existed (its PATH is out of date).
 export function knownDirs(platform = process.platform) {
   if (platform === 'win32') return ['C:\\Program Files\\Git\\cmd', 'C:\\Program Files\\GitHub CLI', `${process.env.LOCALAPPDATA || ''}\\Programs\\Git\\cmd`];
@@ -31,40 +69,34 @@ export function addKnownDirsToPath(platform = process.platform, exists = fs.exis
   return add;
 }
 
-// The command that installs a tool on this system, or null when it cannot be done without a password or a guess.
-export function installPlan(tool, platform = process.platform) {
-  const spec = TOOLS[tool];
-  if (!spec) return null;
-  if (platform === 'win32') return { cmd: 'winget', args: ['install', '--id', spec.win, '-e', '--accept-source-agreements', '--accept-package-agreements'] };
-  if (platform === 'darwin') return { cmd: 'brew', args: ['install', spec.brew] };
-  return null;
-}
-
 export const has = (tool, exec = quiet) => { try { exec(tool, ['--version']); return true; } catch { return false; } };
 
-const line = (plan) => `${plan.cmd} ${plan.args.join(' ')}`;
+const line = (plan) => plan.steps.map((st) => st.join(' ')).join(' && ');
 
 // One tool: present, or offered for install with enter. True when it is usable afterwards.
-export async function ensureTool(tool, { exec = quiet, run = live, pick, out, platform = process.platform, exists = fs.existsSync } = {}) {
+export async function ensureTool(tool, { exec = quiet, run = live, pick, out, platform = process.platform, exists = fs.existsSync, ctx = {} } = {}) {
   if (has(tool, exec)) return true;
   addKnownDirsToPath(platform, exists);
   if (has(tool, exec)) return true;
-  const plan = installPlan(tool, platform);
+  const plan = installPlan(tool, platform, { have: (c) => has(c, exec), uid: typeof process.getuid === 'function' ? process.getuid() : undefined, ...ctx });
   out(`\n${t('toolMissing', { tool })}`);
   if (!plan) {
     out(t('toolNoAuto', { tool, url: TOOLS[tool].url }));
     return false;
   }
+  if (plan.sudo) out(t('toolSudo'));
   const choice = await pick(t('toolQ', { tool }), [
     { label: t('toolInstallNow', { tool }), hint: t('toolRuns', { cmd: line(plan) }), value: 'now' },
     { label: t('toolInstallSelf'), value: 'self' },
   ], 1);
   if (choice !== 'now') return false;
   out(`\n${t('toolInstalling', { tool })}\n`);
-  const r = run(plan.cmd, plan.args);
-  if (r?.error || (r && r.status !== 0 && r.status != null)) {
-    out(t('toolInstallFailed', { tool, url: TOOLS[tool].url }));
-    return false;
+  for (const [cmd, ...args] of plan.steps) {
+    const r = run(cmd, args);
+    if (r?.error || (r && r.status !== 0 && r.status != null)) {
+      out(t('toolInstallFailed', { tool, url: TOOLS[tool].url }));
+      return false;
+    }
   }
   addKnownDirsToPath(platform, exists);
   if (has(tool, exec)) {

package/lib/i18n.js

@@ -166,6 +166,8 @@ const MESSAGES = {
     prClosed: '这个 PR 已被关闭：{url}',
     prNeedsReview: '没有自动合并，已转给维护者审核（常见原因：GitHub 账号注册不满 30 天，或今天已提交超过 5 条）。你不需要再做什么：{url}',
     prTimeout: '等了 {m} 分钟还没合并，PR 还在：{url}，之后随时在浏览器里看。',
+    toolSudo: '这一步要用管理员权限安装：下面可能会让你输入这台电脑的登录密码（输入时不会显示字符，输完按回车）。',
+    hostInstallUserDir: '这台电脑的 npm 全局目录你没有写权限（装到系统目录要 sudo），所以会装到你自己的目录：{dir}，不需要 sudo 和密码。',
     modelUnknown: '{host} 的模型清单里没有“{model}”。它现在支持：{list}。请重新选一个，或选“默认模型”。',
     updateAvail: '有新版本 {latest}（你现在用的是 {current}）。',
     updateQ: '要更新吗？',
@@ -597,6 +599,8 @@ const MESSAGES = {
     prClosed: 'This pull request was closed: {url}',
     prNeedsReview: 'It was not merged automatically and has gone to a maintainer for review (common reasons: the GitHub account is under 30 days old, or more than 5 submissions today). You need do nothing more: {url}',
     prTimeout: 'Waited {m} minutes and it is not merged yet. The pull request is still there: {url}; look any time in the browser.',
+    toolSudo: 'This install needs administrator rights: you may be asked for this computer\'s password below (nothing is shown as you type; press enter when done).',
+    hostInstallUserDir: 'You cannot write to this computer\'s global npm folder (installing there needs sudo), so it is installed into your own folder instead: {dir}. No sudo or password is needed.',
     modelUnknown: '{host} does not list a model called "{model}". It currently supports: {list}. Pick another, or choose the default model.',
     updateAvail: 'A newer version {latest} is available (you are on {current}).',
     updateQ: 'Update?',
@@ -1076,6 +1080,8 @@ Layer 0 always runs first: it is free, and it disqualifies most problems before
     prClosed: 'このプルリクエストはクローズされました：{url}',
     prNeedsReview: '自動マージされず、メンテナーのレビューに回りました（主な理由：GitHub アカウントが作成 30 日未満、または本日 5 件を超える提出）。これ以上の操作は不要です：{url}',
     prTimeout: '{m} 分待ちましたがまだマージされていません。プルリクエストは残っています：{url}。いつでもブラウザで確認できます。',
+    toolSudo: 'このインストールには管理者権限が必要です。このコンピューターのパスワードの入力を求められることがあります（入力中は何も表示されません。入力後に Enter）。',
+    hostInstallUserDir: 'このコンピューターのグローバル npm フォルダには書き込めません（sudo が必要）。代わりにあなた自身のフォルダ {dir} にインストールします。sudo もパスワードも不要です。',
     modelUnknown: '{host} のモデル一覧に「{model}」はありません。現在対応：{list}。別のものを選ぶか、既定のモデルを選んでください。',
     updateAvail: '新しいバージョン {latest} があります（現在は {current}）。',
     updateQ: '更新しますか？',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skillgauntlet",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "Check an agent skill before you install it: context cost, permission surface, code risk, instruction hijacking, description quality, trigger rate and gain.",
   "type": "module",
   "bin": {