@lyra-ai/toolkit 0.2.5 → 0.2.7

package/src/skillhub.mjs

@@ -3339,21 +3339,11 @@ export function unzipSync(data, opts) {
 
 
 // ==================================================================
-// === Tools: self-implemented replacements (semverGt + readline) ===
+// === Tools: self-implemented replacements (readline prompts) ===
 // ==================================================================
 
 import readline from 'node:readline';
 
-function semverGt(a, b) {
-  const pa = String(a).replace(/^v/, '').split('.').map(Number);
-  const pb = String(b).replace(/^v/, '').split('.').map(Number);
-  for (let i = 0; i < 3; i++) {
-    if ((pa[i] ?? 0) > (pb[i] ?? 0)) return true;
-    if ((pa[i] ?? 0) < (pb[i] ?? 0)) return false;
-  }
-  return false;
-}
-
 async function promptSelect(message, choices) {
   const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
   process.stderr.write(`${message}\n`);
@@ -3395,7 +3385,6 @@ async function promptMultiselect(message, choices) {
 // === Version Info ===
 // ==================================================================
 
-const PKG_NAME = "@astron-team/skillhub";
 const PKG_VERSION = "0.1.8";
 
 // ==================================================================
@@ -3417,7 +3406,6 @@ class CliError extends Error {
 
 const DEFAULT_REGISTRY = '';
 const CLI_VERSION = PKG_VERSION;
-const CLI_PACKAGE_NAME = PKG_NAME;
 const EXIT = {
   generic: 1,
   auth: 2,
@@ -3614,79 +3602,6 @@ async function readBoundedResponseBody(response, maxBytes = MAX_PACKAGE_BYTES) {
   return result.buffer;
 }
 
-// ==================================================================
-// === Source: platform/updater ===
-// ==================================================================
-
-import { spawn } from 'node:child_process';
-
-async function runUpdateCommand(command) {
-  try {
-    const [program, ...args] = command;
-    if (!program) {
-      return { success: false, output: 'empty update command' };
-    }
-
-    const spawnOptions = {
-      stdio: ['ignore', 'pipe', 'pipe'],
-      ...(process.platform === 'win32' && { shell: true })
-    };
-
-    return await new Promise((resolve) => {
-      const proc = spawn(program, args, spawnOptions);
-      const chunks = [];
-
-      proc.stdout?.on('data', (chunk) => chunks.push(Buffer.from(chunk)));
-      proc.stderr?.on('data', (chunk) => chunks.push(Buffer.from(chunk)));
-      proc.on('error', (error) => resolve({ success: false, output: error.message }));
-      proc.on('close', (code) => resolve({
-        success: code === 0,
-        output: Buffer.concat(chunks).toString('utf-8')
-      }));
-    });
-  } catch (error) {
-    return {
-      success: false,
-      output: error instanceof Error ? error.message : String(error)
-    };
-  }
-}
-
-// ==================================================================
-// === Source: platform/package-manager ===
-// ==================================================================
-
-function detectInstallMode(argv = process.argv, env = process.env) {
-  const execPath = argv[1] ?? '';
-
-  if (execPath.includes('_npx/') || execPath.includes('_npx\\')) {
-    return 'npx';
-  }
-
-  const npmExecPath = env.npm_execpath ?? '';
-  if (npmExecPath.includes('npx')) {
-    return 'npx';
-  }
-
-  const bunInstall = env.BUN_INSTALL ?? '';
-  if (bunInstall && execPath.startsWith(bunInstall)) {
-    return 'bun-global';
-  }
-  if (execPath.includes('/.bun/') || execPath.includes('\\.bun\\')) {
-    return 'bun-global';
-  }
-
-  const npmGlobalPrefix = env.npm_config_prefix ?? '';
-  if (npmGlobalPrefix && execPath.startsWith(npmGlobalPrefix)) {
-    return 'npm-global';
-  }
-  if (execPath.includes('/lib/node_modules/') || execPath.includes('/node_modules/.bin/')) {
-    return 'npm-global';
-  }
-
-  return 'unknown';
-}
-
 // ==================================================================
 // === Source: platform/archive ===
 // ==================================================================
@@ -4192,97 +4107,6 @@ class SkillHubClient {
   }
 }
 
-// ==================================================================
-// === Source: clients/npm-registry-client ===
-// ==================================================================
-
-const DEFAULT_NPM_REGISTRY = 'https://registry.npmjs.org';
-
-function readEnv(env, name) {
-  const exactValue = env[name]?.trim();
-  if (exactValue) {
-    return exactValue;
-  }
-
-  const lowerName = name.toLowerCase();
-  for (const [key, value] of Object.entries(env)) {
-    const normalizedValue = value?.trim();
-    if (key.toLowerCase() === lowerName && normalizedValue) {
-      return normalizedValue;
-    }
-  }
-  return undefined;
-}
-
-function resolveNpmRegistry(env) {
-  return readEnv(env, 'SKILLHUB_NPM_REGISTRY')
-    ?? readEnv(env, 'npm_config_registry')
-    ?? readEnv(env, 'NPM_CONFIG_REGISTRY')
-    ?? DEFAULT_NPM_REGISTRY;
-}
-
-function buildLatestUrl(registry, packageName) {
-  try {
-    const base = registry.endsWith('/') ? registry : `${registry}/`;
-    return new URL(`${encodeURIComponent(packageName)}/latest`, base).toString();
-  } catch {
-    throw new CliError('invalid npm registry URL', EXIT.usage, {
-      registry,
-      next: 'check npm registry configuration and retry'
-    });
-  }
-}
-
-class NpmRegistryClient {
-  constructor(fetchImpl = fetch, timeoutMs = 10000, env = process.env) {
-    this.fetchImpl = fetchImpl;
-    this.timeoutMs = timeoutMs;
-    this.env = env;
-  }
-
-  async latestVersion(packageName = CLI_PACKAGE_NAME) {
-    const registry = resolveNpmRegistry(this.env);
-    const url = buildLatestUrl(registry, packageName);
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), this.timeoutMs);
-    try {
-      let response;
-      try {
-        response = await this.fetchImpl(url, {
-          signal: controller.signal
-        });
-      } catch (error) {
-        const isTimeout = error instanceof Error && error.name === 'AbortError';
-        throw new CliError('npm registry unreachable', EXIT.network, {
-          registry,
-          cause: error instanceof Error ? error.message : String(error),
-          next: isTimeout
-            ? 'check npm registry connectivity or proxy settings and retry'
-            : 'check npm registry/proxy configuration and retry'
-        });
-      }
-      if (!response.ok) {
-        throw new CliError(`npm registry returned ${response.status}`, EXIT.network, { registry });
-      }
-      let body;
-      try {
-        body = await response.json();
-      } catch (error) {
-        throw new CliError('npm registry response invalid', EXIT.network, {
-          registry,
-          cause: error instanceof Error ? error.message : String(error)
-        });
-      }
-      if (typeof body !== 'object' || body === null || !('version' in body) || typeof body.version !== 'string') {
-        throw new CliError('npm registry response missing version', EXIT.network, { registry });
-      }
-      return body.version;
-    } finally {
-      clearTimeout(timer);
-    }
-  }
-}
-
 // ==================================================================
 // === Source: services/registry-service ===
 // ==================================================================
@@ -4340,7 +4164,7 @@ async function deleteToolkitToken() {
 function requireRegistry(registry) {
   if (!registry) {
     throw new CliError(
-      '未配置 registry。运行: toolkit install claudecode --registry <url>',
+      '未配置 registry。运行: toolkit install --registry <url>',
       EXIT.config
     );
   }
@@ -4529,84 +4353,6 @@ async function removeLocalSkill(options) {
   return { removed };
 }
 
-// ==================================================================
-// === Source: services/update-service ===
-// ==================================================================
-
-class UpdateService {
-  constructor(deps) {
-    this.deps = deps;
-  }
-
-  async update(options) {
-    const current = this.deps.currentVersion;
-    const latest = await this.deps.latestVersion();
-
-    if (!semverGt(latest, current)) {
-      return {
-        updated: false,
-        available: false,
-        currentVersion: current,
-        latestVersion: latest
-      };
-    }
-
-    if (options.checkOnly) {
-      return {
-        updated: false,
-        available: true,
-        currentVersion: current,
-        latestVersion: latest
-      };
-    }
-
-    const mode = this.deps.detectInstallMode();
-
-    switch (mode) {
-      case 'npx':
-        return {
-          updated: false,
-          available: true,
-          currentVersion: current,
-          latestVersion: latest,
-          next: `Run: npx ${CLI_PACKAGE_NAME}@latest <command> or install globally: npm install -g ${CLI_PACKAGE_NAME}`
-        };
-
-      case 'npm-global': {
-        const result = await this.deps.run(['npm', 'install', '-g', `${CLI_PACKAGE_NAME}@latest`]);
-        return {
-          updated: result.success,
-          available: true,
-          currentVersion: current,
-          latestVersion: latest,
-          error: result.success ? undefined : result.output
-        };
-      }
-
-      case 'bun-global': {
-        const result = await this.deps.run(['bun', 'add', '-g', `${CLI_PACKAGE_NAME}@latest`]);
-        return {
-          updated: result.success,
-          available: true,
-          currentVersion: current,
-          latestVersion: latest,
-          error: result.success ? undefined : result.output
-        };
-      }
-
-      case 'unknown':
-      default:
-        return {
-          updated: false,
-          available: true,
-          currentVersion: current,
-          latestVersion: latest,
-          next: `Update manually: npm install -g ${CLI_PACKAGE_NAME}@latest or bun add -g ${CLI_PACKAGE_NAME}@latest`
-        };
-    }
-  }
-}
-
 // ==================================================================
 // === Source: services/doctor-service ===
 // ==================================================================
@@ -5044,11 +4790,6 @@ const commands = {
     summary: 'Publish a local skill package',
     usage: 'skillhub publish <path> [--namespace <slug>] [--visibility <public|namespace-only|private>] [--registry <url>] [--json]',
     examples: ['skillhub publish ./my-skill', 'skillhub publish ./my-skill --namespace myspace']
-  },
-  update: {
-    summary: 'Check or update CLI itself',
-    usage: 'skillhub update [--check] [--json]',
-    examples: ['skillhub update --check', 'skillhub update']
   }
 };
 
@@ -5483,58 +5224,6 @@ function toServerVisibility(visibility) {
   return visibility.toUpperCase().replace(/-/g, '_');
 }
 
-// ==================================================================
-// === Source: commands/update ===
-// ==================================================================
-
-async function updateCommand(options) {
-  const json = Boolean(options.json);
-  const checkOnly = Boolean(options.check);
-
-  const service = new UpdateService({
-    currentVersion: CLI_VERSION,
-    latestVersion: () => new NpmRegistryClient().latestVersion(),
-    detectInstallMode: () => detectInstallMode(),
-    run: runUpdateCommand
-  });
-
-  const result = await service.update({ checkOnly });
-
-  if (!result.available) {
-    return printResult(
-      json
-        ? { ok: true, upToDate: true, version: result.currentVersion }
-        : `Already up to date (${result.currentVersion})`,
-      json
-    );
-  }
-
-  if (result.updated) {
-    return printResult(
-      json
-        ? { ok: true, updated: true, from: result.currentVersion, to: result.latestVersion }
-        : `Updated skillhub ${result.currentVersion} -> ${result.latestVersion}`,
-      json
-    );
-  }
-
-  if (result.error) {
-    throw new CliError(result.error, EXIT.generic, { from: result.currentVersion, to: result.latestVersion });
-  }
-
-  const lines = [`Update available: ${result.currentVersion} -> ${result.latestVersion}`];
-  if (result.next) {
-    lines.push(result.next);
-  }
-
-  return printResult(
-    json
-      ? { ok: true, available: true, from: result.currentVersion, to: result.latestVersion, next: result.next }
-      : lines.join('\n'),
-    json
-  );
-}
-
 // ==================================================================
 // === Source: index (CLI entry point) ===
 // ==================================================================
@@ -5685,10 +5374,6 @@ cli.command('help [command]', 'Show help')
 cli.command('version', 'Show CLI version')
   .option('--json', 'Output JSON');
 
-cli.command('update', 'Update CLI to latest version')
-  .option('--check', 'Check for updates without installing')
-  .option('--json', 'Output JSON');
-
 cli.command('login', 'Save registry and token')
   .option('--registry <url>', 'Registry URL')
   .option('--token <token>', 'API token')
@@ -5756,8 +5441,6 @@ async function dispatchCommand(commandName, args, options) {
       return helpCommand([...args, ...(options.json ? ['--json'] : [])]);
     case 'version':
       return versionCommand(options.json ? ['--json'] : []);
-    case 'update':
-      return updateCommand(options);
     case 'login':
       return loginCommand(options);
     case 'logout':

package/src/status.mjs

@@ -1,66 +1,133 @@
 #!/usr/bin/env node
 /**
  * status.mjs — `toolkit status`
+ *
+ * 报告 backlog 模型下的安装状态:
+ *   - registry / uid(来自 config.json)
+ *   - installed_at / last_sweep(来自 backlog.json)
+ *   - 每 project 剩余 backlog 文件数(mtime ≤ installed_at 且
+ *     compareKey(file, cursor) < 0 = 待排干)
+ *
+ * `collectStatus()` 返回字符串,`status()` 为 CLI 入口,调用 console.log。
  */
 import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
-import { load as loadConfig, UPLOADED_PATH } from './shared/config.mjs';
+import { fileURLToPath } from 'node:url';
+import { load as loadConfig } from './shared/config.mjs';
+import {
+  loadBacklog,
+  compareKey,
+  topCursor,
+} from './shared/backlog.mjs';
 
 const HOME = os.homedir();
-const PLUGIN_DIR = path.join(HOME, '.claude', 'plugins', 'toolkit');
+const PLUGIN_DIR = path.join(HOME, '.claude', 'skills', 'toolkit');
 
-export function status() {
-  const pluginExists = fs.existsSync(path.join(PLUGIN_DIR, '.claude-plugin', 'plugin.json'));
+/**
+ * 收集状态文本。
+ * @returns {string}
+ */
+export function collectStatus() {
   const config = loadConfig();
   const configExists = !!config.registry || !!config.uid;
 
-  console.log('Toolkit Status');
-  console.log('════════════════════════════════════════');
+  const pluginExists = fs.existsSync(
+    path.join(PLUGIN_DIR, '.claude-plugin', 'plugin.json'),
+  );
+
+  const lines = [];
+  lines.push('Toolkit Status');
+  lines.push('════════════════════════════════════════');
 
   if (!pluginExists && !configExists) {
-    console.log('  ❌ 未安装。运行: toolkit install claudecode --registry <url>');
-    return;
+    lines.push('  ❌ 未安装。运行: toolkit install --registry <url>');
+    return lines.join('\n');
   }
 
   // 插件状态
-  console.log(`  插件:        ${pluginExists ? '✅ 已安装' : '❌ 缺失'}`);
+  lines.push(`  插件:        ${pluginExists ? '✅ 已安装' : '❌ 缺失'}`);
   if (pluginExists) {
-    const pj = JSON.parse(fs.readFileSync(path.join(PLUGIN_DIR, '.claude-plugin', 'plugin.json'), 'utf-8'));
-    console.log(`  版本:        ${pj.version}`);
+    try {
+      const pj = JSON.parse(
+        fs.readFileSync(
+          path.join(PLUGIN_DIR, '.claude-plugin', 'plugin.json'),
+          'utf-8',
+        ),
+      );
+      lines.push(`  版本:        ${pj.version || '(未知)'}`);
+    } catch {
+      lines.push('  版本:        (读取失败)');
+    }
   }
 
-  // 配置(走 shared/config.mjs)
+  // 配置
   if (configExists) {
-    console.log(`  平台地址:    ${config.registry}${config.contexts?.metrics || '/ai-metrics'}/`);
-    console.log(`  身份 UID:    ${config.uid?.slice(0, 12)}...`);
+    lines.push(
+      `  平台地址:    ${config.registry}${config.contexts?.metrics || '/ai-metrics'}/`,
+    );
+    lines.push(`  身份 UID:    ${(config.uid || '').slice(0, 12)}...`);
   }
 
-  // 上传状态
-  try {
-    const up = JSON.parse(fs.readFileSync(UPLOADED_PATH, 'utf-8'));
-    console.log(`  已同步:      ${up.uploaded_sids?.length || 0} 个会话`);
-    console.log(`  上次同步:    ${up.last_flush || '从未'}`);
-  } catch {
-    console.log('  同步状态:    未初始化');
-  }
+  // backlog 状态(只读:status 不应有写副作用,installed_at 边界由 install 写入)
+  const st = loadBacklog();
+  lines.push(`  installed_at: ${st.installed_at || '(无)'}`);
+  lines.push(`  last_sweep:   ${st.last_sweep || '(从未)'}`);
 
-  // 待传会话计数
-  const projectsDir = path.join(HOME, '.claude', 'projects');
-  let pending = 0;
-  if (fs.existsSync(projectsDir) && configExists) {
-    const up = JSON.parse(fs.readFileSync(UPLOADED_PATH, 'utf-8'));
-    const uploadedSet = new Set(up.uploaded_sids || []);
-    for (const projDir of fs.readdirSync(projectsDir)) {
-      const pp = path.join(projectsDir, projDir);
+  // 每 project 剩余 backlog 文件计数
+  const base =
+    process.env.CLAUDE_PROJECTS_DIR ||
+    path.join(HOME, '.claude', 'projects');
+  const installedMs = st.installed_at
+    ? new Date(st.installed_at).getTime()
+    : null;
+
+  if (installedMs != null && fs.existsSync(base)) {
+    lines.push('  backlog 剩余 (按 project):');
+    let total = 0;
+    for (const proj of fs.readdirSync(base)) {
+      const pp = path.join(base, proj);
+      let stat;
       try {
-        if (!fs.statSync(pp).isDirectory()) continue;
-        for (const f of fs.readdirSync(pp)) {
-          if (f.endsWith('.jsonl') && !uploadedSet.has(f.slice(0, -6))) pending++;
+        stat = fs.statSync(pp);
+      } catch {
+        continue;
+      }
+      if (!stat.isDirectory()) continue;
+
+      const cursor = st.cursors[proj] || topCursor(installedMs);
+      let remain = 0;
+      for (const f of fs.readdirSync(pp)) {
+        if (!f.endsWith('.jsonl')) continue;
+        let s;
+        try {
+          s = fs.statSync(path.join(pp, f));
+        } catch {
+          continue;
         }
-      } catch {}
+        if (s.mtimeMs > installedMs) continue; // current 负责
+        if (compareKey({ mtime: s.mtimeMs, name: f }, cursor) < 0) remain++;
+      }
+      total += remain;
+      lines.push(`    ${proj}: ${remain}`);
     }
+    lines.push(`  合计待排干:  ${total}`);
   }
-  console.log(`  待同步:      ${pending} 个会话`);
-  console.log('════════════════════════════════════════');
+
+  lines.push('════════════════════════════════════════');
+  return lines.join('\n');
+}
+
+/**
+ * CLI 入口。
+ */
+export function status() {
+  console.log(collectStatus());
+}
+
+// self-invocation guard:被 import 时不触发 main()
+const invoked =
+  process.argv[1] && fileURLToPath(import.meta.url) === path.resolve(process.argv[1]);
+if (invoked) {
+  status();
 }

package/src/uninstall.mjs

@@ -1,16 +1,27 @@
 #!/usr/bin/env node
 /**
- * uninstall.mjs — `toolkit uninstall`
- * 删插件目录 + 移除 settings.json enabledPlugins 条目 + 可选保留 ~/.toolkit/ 数据。
+ * uninstall.mjs — `toolkit uninstall [--purge]`
+ *
+ * 删除 @skills-dir 插件目录(~/.claude/skills/toolkit)+ 旧版裸目录残留
+ * + settings.json 里失效的 toolkit@local 条目。可选 --purge 清除 ~/.toolkit/ 数据。
+ *
+ * 注:@skills-dir plugin 没有「卸载步骤」(按官方文档,删文件夹即停用)。
  */
 import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
 
 const HOME = os.homedir();
-const PLUGIN_DIR = path.join(HOME, '.claude', 'plugins', 'toolkit');
+const PLUGIN_DIR = path.join(HOME, '.claude', 'skills', 'toolkit');
+const OLD_PLUGIN_DIR = path.join(HOME, '.claude', 'plugins', 'toolkit');
 const SETTINGS_PATH = path.join(HOME, '.claude', 'settings.json');
-const PLUGIN_KEY = 'toolkit@local';
+const OLD_PLUGIN_KEY = 'toolkit@local';
+
+// 数据目录与 shared/config.mjs 的 TOOLKIT_DIR 同逻辑,但在调用时求值,
+// 以便测试用 TOOLKIT_HOME / HOME 隔离(避免模块加载时绑定的陈旧值)。
+function dataDir() {
+  return process.env.TOOLKIT_HOME || path.join(os.homedir(), '.toolkit');
+}
 
 function rmrf(dir) {
   if (!fs.existsSync(dir)) return;
@@ -25,24 +36,26 @@ function rmrf(dir) {
 }
 
 export function uninstall(opts = {}) {
-  // 1. 删插件目录
+  // 1. 删 @skills-dir 插件目录 + 旧版裸目录残留
   rmrf(PLUGIN_DIR);
-  console.log('✅ 插件目录已删除');
+  rmrf(OLD_PLUGIN_DIR);
+  console.log(`✅ 插件目录已删除(${PLUGIN_DIR})`);
 
-  // 2. 移除 settings.json enabledPlugins
+  // 2. 移除 settings.json 里失效的 toolkit@local(若有)
   try {
     const settings = JSON.parse(fs.readFileSync(SETTINGS_PATH, 'utf-8'));
-    if (settings.enabledPlugins?.[PLUGIN_KEY] !== undefined) {
-      delete settings.enabledPlugins[PLUGIN_KEY];
+    if (settings.enabledPlugins?.[OLD_PLUGIN_KEY] !== undefined) {
+      delete settings.enabledPlugins[OLD_PLUGIN_KEY];
       fs.writeFileSync(SETTINGS_PATH, JSON.stringify(settings, null, 2));
-      console.log('✅ settings.json enabledPlugins 已移除');
+      console.log('✅ settings.json 失效条目已移除');
     }
   } catch {}
 
-  // 3. 数据(~/.toolkit/)
+  // 3. 数据(~/.toolkit/,走 TOOLKIT_HOME 或 ~/.toolkit,与 install 一致)
   if (opts.purge) {
-    rmrf(path.join(HOME, '.toolkit'));
-    console.log('✅ ~/.toolkit/ 数据已清除');
+    const dir = dataDir();
+    rmrf(dir);
+    console.log(`✅ ${dir} 数据已清除`);
   } else {
     console.log('ℹ️  ~/.toolkit/ 数据保留(含 UID + 上传记录)。');
     console.log('   彻底清除: toolkit uninstall --purge');