@fprad0/skill-master-mcp 0.0.12 → 1.0.1

package/bin/lib/skill-installation.mjs

@@ -1,215 +1,215 @@
-import {
-  cpSync,
-  existsSync,
-  mkdirSync,
-  readFileSync,
-  readdirSync,
-  writeFileSync,
-} from 'node:fs';
-import path from 'node:path';
-
-export const DEFAULT_PROJECT_SKILL_ROOTS = [
-  '.agents/skills',
-  '.codex/skills',
-  '.claude/skills',
-  '.gemini/skills',
-];
-
-export function listSkillSources(sourcePath) {
-  const entries = readdirSync(sourcePath, { withFileTypes: true });
-  const directSkills = entries
-    .filter((entry) => entry.isDirectory() && existsSync(path.join(sourcePath, entry.name, 'SKILL.md')))
-    .map((entry) => ({ name: entry.name, path: path.join(sourcePath, entry.name) }));
-
-  if (directSkills.length) {
-    return directSkills.sort((left, right) => left.name.localeCompare(right.name));
-  }
-
-  return entries
-    .filter((entry) => entry.isDirectory())
-    .flatMap((entry) => {
-      const versionPath = path.join(sourcePath, entry.name);
-      return readdirSync(versionPath, { withFileTypes: true })
-        .filter((skillEntry) => skillEntry.isDirectory() && existsSync(path.join(versionPath, skillEntry.name, 'SKILL.md')))
-        .map((skillEntry) => ({ name: skillEntry.name, path: path.join(versionPath, skillEntry.name) }));
-    })
-    .sort((left, right) => left.name.localeCompare(right.name));
-}
-
-export function parseRootList(value) {
-  return String(value ?? '')
-    .split(',')
-    .map((entry) => entry.trim())
-    .filter(Boolean);
-}
-
-export function normalizeProjectSkillRoots(projectRoot, roots = DEFAULT_PROJECT_SKILL_ROOTS) {
-  const uniqueRoots = Array.from(new Set(roots.map((root) => {
-    const normalized = root.replace(/\\/g, '/');
-    return path.isAbsolute(normalized) ? normalized : normalized.replace(/^\.\//, '');
-  })));
-  return uniqueRoots.map((root) => ({
-    relative: root,
-    absolute: path.isAbsolute(root) ? root : path.resolve(projectRoot, root),
-  }));
-}
-
-export function installSkillsToTarget({ skills, target, overwrite = false, dryRun = false }) {
-  if (!dryRun) {
-    mkdirSync(target, { recursive: true });
-  }
-
-  const installed = [];
-  const skipped = [];
-
-  for (const skill of skills) {
-    const destination = path.join(target, skill.name);
-    if (existsSync(destination) && !overwrite) {
-      skipped.push(skill.name);
-      continue;
-    }
-
-    if (!dryRun) {
-      cpSync(skill.path, destination, { recursive: true, force: overwrite });
-    }
-    installed.push(skill.name);
-  }
-
-  return { target, installed, skipped };
-}
-
-export function buildProjectSkillCatalog({
-  projectRoot,
-  skillRoots,
-  skills,
-  packageName,
-  packageVersion,
-}) {
-  return {
-    schemaVersion: 1,
-    generatedAt: new Date().toISOString(),
-    packageName,
-    packageVersion,
-    projectRoot,
-    skillRoots: skillRoots.map((root) => root.relative),
-    skillCount: Array.from(new Set(skills.map((skill) => skill.name))).length,
-    skills: Array.from(new Set(skills.map((skill) => skill.name))).sort(),
-  };
-}
-
-export function writeProjectSkillCatalog({ projectRoot, catalog, catalogPath = '.skill-master/catalog.json', dryRun = false }) {
-  const absolutePath = path.isAbsolute(catalogPath)
-    ? catalogPath
-    : path.resolve(projectRoot, catalogPath);
-
-  if (!dryRun) {
-    mkdirSync(path.dirname(absolutePath), { recursive: true });
-    writeFileSync(absolutePath, `${JSON.stringify(catalog, null, 2)}\n`, 'utf8');
-  }
-
-  return absolutePath;
-}
-
-export function syncProjectPackageJson({
-  projectRoot,
-  skillRoots,
-  catalogPath = '.skill-master/catalog.json',
-  packageName,
-  packageVersion,
-  createIfMissing = false,
-  dryRun = false,
-}) {
-  const packageJsonPath = path.join(projectRoot, 'package.json');
-  const packageJsonExists = existsSync(packageJsonPath);
-
-  if (!packageJsonExists && !createIfMissing) {
-    return { path: packageJsonPath, status: 'missing' };
-  }
-
-  const current = packageJsonExists
-    ? JSON.parse(readFileSync(packageJsonPath, 'utf8'))
-    : { private: true };
-
-  const scripts = current.scripts && typeof current.scripts === 'object' ? current.scripts : {};
-  const installScript = 'skill-master-install-project-skills --sync-package-json';
-
-  const next = {
-    ...current,
-    scripts: {
-      ...scripts,
-      'skill-master:install-project-skills': scripts['skill-master:install-project-skills'] ?? installScript,
-    },
-    skillMaster: {
-      ...(current.skillMaster && typeof current.skillMaster === 'object' ? current.skillMaster : {}),
-      package: packageName,
-      packageVersion,
-      projectSkillRoots: skillRoots.map((root) => root.relative),
-      projectSkillCatalog: catalogPath,
-      installCommand: installScript,
-    },
-  };
-
-  if (!dryRun) {
-    writeFileSync(packageJsonPath, `${JSON.stringify(next, null, 2)}\n`, 'utf8');
-  }
-
-  if (dryRun) {
-    return { path: packageJsonPath, status: packageJsonExists ? 'would-update' : 'would-create' };
-  }
-
-  return { path: packageJsonPath, status: packageJsonExists ? 'updated' : 'created' };
-}
-
-export function installProjectSkills({
-  source,
-  projectRoot,
-  roots = DEFAULT_PROJECT_SKILL_ROOTS,
-  overwrite = false,
-  dryRun = false,
-  writeCatalog = true,
-  syncPackageJson = true,
-  createPackageJson = false,
-  catalogPath = '.skill-master/catalog.json',
-  packageName,
-  packageVersion,
-}) {
-  const skills = listSkillSources(source);
-  const skillRoots = normalizeProjectSkillRoots(projectRoot, roots);
-  const targets = skillRoots.map((root) => installSkillsToTarget({
-    skills,
-    target: root.absolute,
-    overwrite,
-    dryRun,
-  }));
-  const catalog = buildProjectSkillCatalog({
-    projectRoot,
-    skillRoots,
-    skills,
-    packageName,
-    packageVersion,
-  });
-  const writtenCatalogPath = writeCatalog
-    ? writeProjectSkillCatalog({ projectRoot, catalog, catalogPath, dryRun })
-    : null;
-  const packageJson = syncPackageJson
-    ? syncProjectPackageJson({
-      projectRoot,
-      skillRoots,
-      catalogPath,
-      packageName,
-      packageVersion,
-      createIfMissing: createPackageJson,
-      dryRun,
-    })
-    : { path: path.join(projectRoot, 'package.json'), status: 'skipped' };
-
-  return {
-    source,
-    projectRoot,
-    roots: skillRoots,
-    skills,
-    targets,
-    catalogPath: writtenCatalogPath,
-    packageJson,
-  };
-}
+import {
+  cpSync,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  readdirSync,
+  writeFileSync,
+} from 'node:fs';
+import path from 'node:path';
+
+export const DEFAULT_PROJECT_SKILL_ROOTS = [
+  '.agents/skills',
+  '.codex/skills',
+  '.claude/skills',
+  '.gemini/skills',
+];
+
+export function listSkillSources(sourcePath) {
+  const entries = readdirSync(sourcePath, { withFileTypes: true });
+  const directSkills = entries
+    .filter((entry) => entry.isDirectory() && existsSync(path.join(sourcePath, entry.name, 'SKILL.md')))
+    .map((entry) => ({ name: entry.name, path: path.join(sourcePath, entry.name) }));
+
+  if (directSkills.length) {
+    return directSkills.sort((left, right) => left.name.localeCompare(right.name));
+  }
+
+  return entries
+    .filter((entry) => entry.isDirectory())
+    .flatMap((entry) => {
+      const versionPath = path.join(sourcePath, entry.name);
+      return readdirSync(versionPath, { withFileTypes: true })
+        .filter((skillEntry) => skillEntry.isDirectory() && existsSync(path.join(versionPath, skillEntry.name, 'SKILL.md')))
+        .map((skillEntry) => ({ name: skillEntry.name, path: path.join(versionPath, skillEntry.name) }));
+    })
+    .sort((left, right) => left.name.localeCompare(right.name));
+}
+
+export function parseRootList(value) {
+  return String(value ?? '')
+    .split(',')
+    .map((entry) => entry.trim())
+    .filter(Boolean);
+}
+
+export function normalizeProjectSkillRoots(projectRoot, roots = DEFAULT_PROJECT_SKILL_ROOTS) {
+  const uniqueRoots = Array.from(new Set(roots.map((root) => {
+    const normalized = root.replace(/\\/g, '/');
+    return path.isAbsolute(normalized) ? normalized : normalized.replace(/^\.\//, '');
+  })));
+  return uniqueRoots.map((root) => ({
+    relative: root,
+    absolute: path.isAbsolute(root) ? root : path.resolve(projectRoot, root),
+  }));
+}
+
+export function installSkillsToTarget({ skills, target, overwrite = false, dryRun = false }) {
+  if (!dryRun) {
+    mkdirSync(target, { recursive: true });
+  }
+
+  const installed = [];
+  const skipped = [];
+
+  for (const skill of skills) {
+    const destination = path.join(target, skill.name);
+    if (existsSync(destination) && !overwrite) {
+      skipped.push(skill.name);
+      continue;
+    }
+
+    if (!dryRun) {
+      cpSync(skill.path, destination, { recursive: true, force: overwrite });
+    }
+    installed.push(skill.name);
+  }
+
+  return { target, installed, skipped };
+}
+
+export function buildProjectSkillCatalog({
+  projectRoot,
+  skillRoots,
+  skills,
+  packageName,
+  packageVersion,
+}) {
+  return {
+    schemaVersion: 1,
+    generatedAt: new Date().toISOString(),
+    packageName,
+    packageVersion,
+    projectRoot,
+    skillRoots: skillRoots.map((root) => root.relative),
+    skillCount: Array.from(new Set(skills.map((skill) => skill.name))).length,
+    skills: Array.from(new Set(skills.map((skill) => skill.name))).sort(),
+  };
+}
+
+export function writeProjectSkillCatalog({ projectRoot, catalog, catalogPath = '.skill-master/catalog.json', dryRun = false }) {
+  const absolutePath = path.isAbsolute(catalogPath)
+    ? catalogPath
+    : path.resolve(projectRoot, catalogPath);
+
+  if (!dryRun) {
+    mkdirSync(path.dirname(absolutePath), { recursive: true });
+    writeFileSync(absolutePath, `${JSON.stringify(catalog, null, 2)}\n`, 'utf8');
+  }
+
+  return absolutePath;
+}
+
+export function syncProjectPackageJson({
+  projectRoot,
+  skillRoots,
+  catalogPath = '.skill-master/catalog.json',
+  packageName,
+  packageVersion,
+  createIfMissing = false,
+  dryRun = false,
+}) {
+  const packageJsonPath = path.join(projectRoot, 'package.json');
+  const packageJsonExists = existsSync(packageJsonPath);
+
+  if (!packageJsonExists && !createIfMissing) {
+    return { path: packageJsonPath, status: 'missing' };
+  }
+
+  const current = packageJsonExists
+    ? JSON.parse(readFileSync(packageJsonPath, 'utf8'))
+    : { private: true };
+
+  const scripts = current.scripts && typeof current.scripts === 'object' ? current.scripts : {};
+  const installScript = 'skill-master-install-project-skills --sync-package-json';
+
+  const next = {
+    ...current,
+    scripts: {
+      ...scripts,
+      'skill-master:install-project-skills': scripts['skill-master:install-project-skills'] ?? installScript,
+    },
+    skillMaster: {
+      ...(current.skillMaster && typeof current.skillMaster === 'object' ? current.skillMaster : {}),
+      package: packageName,
+      packageVersion,
+      projectSkillRoots: skillRoots.map((root) => root.relative),
+      projectSkillCatalog: catalogPath,
+      installCommand: installScript,
+    },
+  };
+
+  if (!dryRun) {
+    writeFileSync(packageJsonPath, `${JSON.stringify(next, null, 2)}\n`, 'utf8');
+  }
+
+  if (dryRun) {
+    return { path: packageJsonPath, status: packageJsonExists ? 'would-update' : 'would-create' };
+  }
+
+  return { path: packageJsonPath, status: packageJsonExists ? 'updated' : 'created' };
+}
+
+export function installProjectSkills({
+  source,
+  projectRoot,
+  roots = DEFAULT_PROJECT_SKILL_ROOTS,
+  overwrite = false,
+  dryRun = false,
+  writeCatalog = true,
+  syncPackageJson = true,
+  createPackageJson = false,
+  catalogPath = '.skill-master/catalog.json',
+  packageName,
+  packageVersion,
+}) {
+  const skills = listSkillSources(source);
+  const skillRoots = normalizeProjectSkillRoots(projectRoot, roots);
+  const targets = skillRoots.map((root) => installSkillsToTarget({
+    skills,
+    target: root.absolute,
+    overwrite,
+    dryRun,
+  }));
+  const catalog = buildProjectSkillCatalog({
+    projectRoot,
+    skillRoots,
+    skills,
+    packageName,
+    packageVersion,
+  });
+  const writtenCatalogPath = writeCatalog
+    ? writeProjectSkillCatalog({ projectRoot, catalog, catalogPath, dryRun })
+    : null;
+  const packageJson = syncPackageJson
+    ? syncProjectPackageJson({
+      projectRoot,
+      skillRoots,
+      catalogPath,
+      packageName,
+      packageVersion,
+      createIfMissing: createPackageJson,
+      dryRun,
+    })
+    : { path: path.join(projectRoot, 'package.json'), status: 'skipped' };
+
+  return {
+    source,
+    projectRoot,
+    roots: skillRoots,
+    skills,
+    targets,
+    catalogPath: writtenCatalogPath,
+    packageJson,
+  };
+}

package/bin/lib/update-cli-core.mjs

@@ -0,0 +1,117 @@
+import { existsSync } from 'node:fs';
+import path from 'node:path';
+import process from 'node:process';
+import { formatShellCommand } from './client-config.mjs';
+import { OPERATION_EXIT_CODES } from './operation-result.mjs';
+
+export const DEFAULT_UPDATE_PACKAGE = '@fprad0/skill-master-mcp@latest';
+export const DEFAULT_UPDATE_REGISTRY = 'https://registry.npmjs.org';
+
+export function readOption(args, name, fallback) {
+  const index = args.indexOf(name);
+  if (index === -1) {
+    return fallback;
+  }
+
+  return args[index + 1] || fallback;
+}
+
+export function buildInstallArgs(args) {
+  const packageName = readOption(args, '--package', DEFAULT_UPDATE_PACKAGE);
+  const registry = readOption(args, '--registry', DEFAULT_UPDATE_REGISTRY);
+  return ['install', '-g', packageName, `--registry=${registry}`];
+}
+
+export function resolveNpmExecutable({
+  platform = process.platform,
+  nodeExecPath = process.execPath,
+  env = process.env,
+  existsSyncImpl = existsSync,
+} = {}) {
+  if (platform !== 'win32') {
+    return {
+      command: 'npm',
+      argsPrefix: [],
+      displayCommand: 'npm',
+      source: 'path',
+    };
+  }
+
+  const envNpmExecPath = env.npm_execpath;
+  if (envNpmExecPath && existsSyncImpl(envNpmExecPath)) {
+    return {
+      command: nodeExecPath,
+      argsPrefix: [envNpmExecPath],
+      displayCommand: 'npm',
+      source: 'npm_execpath',
+    };
+  }
+
+  const siblingNpmCli = path.join(path.dirname(nodeExecPath), 'node_modules', 'npm', 'bin', 'npm-cli.js');
+  if (existsSyncImpl(siblingNpmCli)) {
+    return {
+      command: nodeExecPath,
+      argsPrefix: [siblingNpmCli],
+      displayCommand: 'npm',
+      source: 'bundled-cli',
+    };
+  }
+
+  return {
+    command: 'cmd.exe',
+    argsPrefix: ['/d', '/s', '/c', 'npm.cmd'],
+    displayCommand: 'npm',
+    source: 'cmd-wrapper',
+  };
+}
+
+export function isInstalledGlobalPackageExecution(scriptPath, {
+  platform = process.platform,
+} = {}) {
+  if (platform !== 'win32') {
+    return false;
+  }
+
+  const normalized = String(scriptPath ?? '').replace(/\\/g, '/').toLowerCase();
+  return normalized.includes('/node_modules/@fprad0/skill-master-mcp/');
+}
+
+export function buildUpdateCommandPreview(commandInfo, installArgs) {
+  return formatShellCommand(commandInfo.displayCommand ?? commandInfo.command, installArgs);
+}
+
+export function shouldBlockDirectUpdate({
+  platform = process.platform,
+  scriptPath,
+  forceDirect = false,
+} = {}) {
+  if (forceDirect) {
+    return false;
+  }
+
+  return platform === 'win32' && isInstalledGlobalPackageExecution(scriptPath, { platform });
+}
+
+export function buildBlockedUpdateMessage(commandPreview) {
+  return [
+    'A atualizacao exige que o processo atual seja encerrado antes da troca do pacote.',
+    'O pacote global parece estar em uso nesta execucao do Windows.',
+    `Execute fora do menu: ${commandPreview}`,
+    'Feche o menu e reinicie os clientes MCP depois da atualizacao.',
+  ].join('\n');
+}
+
+export function classifyUpdateFailure(output, exitCode) {
+  const normalized = String(output ?? '').toLowerCase();
+  if (normalized.includes('ebusy') || normalized.includes('resource busy or locked')) {
+    return {
+      exitCode: OPERATION_EXIT_CODES.error,
+      message: 'O pacote esta em uso neste momento. Feche o menu ou o cliente MCP e rode o update fora desta execucao.',
+    };
+  }
+
+  return {
+    exitCode: Number.isInteger(exitCode) ? exitCode : 1,
+    message: null,
+  };
+}