@safeskill/cli 0.3.0 → 0.3.2

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## 0.3.0
+## 0.3.2
+
+- Fixed the published npm binary entrypoint so `npx @safeskill/cli` executes the bundled CLI instead of exiting with no output.
+
+## 0.3.1
 
 - Added upstream synchronization infrastructure with `vercel-labs/skills` kept as a subtree reference under `upstream/vercel-labs-skills`.
 - Added metadata sanitization, local frontmatter parsing, GitHub blob tree utilities, bounded nested skill discovery, and improved Git source parsing and clone fallback behavior.
@@ -9,6 +13,8 @@
 - Expanded supported agent targets, including Eve subagents and additional upstream agent definitions, while retaining SafeSkill-specific `flocks` and `kimi-cli` support.
 - Added agent environment detection via `@vercel/detect-agent`, including banner suppression and non-interactive `find` guidance in detected agent environments.
 - Updated the test script to exclude subtree and temporary worktree test suites from normal project verification.
+- Fixed SafeSkill hub installs so region fallback is attempted during resolve instead of being blocked by the status endpoint.
+- Added `hermes` as an alias for the `hermes-agent` install target.
 
 ## 0.2.2
 

package/bin/cli.mjs

@@ -2,6 +2,8 @@
 
 import module from 'node:module';
 
+process.env.SAFESKILL_CLI_ENTRYPOINT = '1';
+
 // https://nodejs.org/api/module.html#module-compile-cache
 if (module.enableCompileCache && !process.env.NODE_DISABLE_COMPILE_CACHE) {
   try {

package/dist/cli.mjs

@@ -623,10 +623,8 @@ const REGION_DOMAINS = {
 	global: "safeskill.io"
 };
 const REGION_DETECT_URLS = ["https://ifconfig.co/country-iso", "https://ipapi.co/country/"];
-const STATUS_TIMEOUT_MS = 2500;
 const DETECT_TIMEOUT_MS = 1500;
 let resolvedRegionPromise = null;
-let regionAvailabilityCache = /* @__PURE__ */ new Map();
 let safeSkillRegionOverride = null;
 function normalizeSafeSkillRegion(region) {
 	const value = region?.trim().toLowerCase();
@@ -662,61 +660,11 @@ async function detectRegionByPublicIP() {
 	}
 	return "global";
 }
-function hasCustomEndpoints() {
-	return !!(process.env.SAFESKILL_HUB_URL || process.env.SAFESKILL_SEARCH_URL || process.env.SAFESKILL_TELEMETRY_URL || process.env.SKILLS_API_URL);
-}
 function ensureAbsoluteUrl(url, fallbackPath) {
 	const parsed = new URL(url);
 	if (!parsed.pathname || parsed.pathname === "/") parsed.pathname = fallbackPath;
 	return parsed.toString().replace(/\/$/, "");
 }
-function getShellSpecificCommands(variable, value) {
-	const shell = process.env.SHELL;
-	const platform = process.platform;
-	const parentProcess = process.env.PROMPT || process.env.COMSPEC;
-	const commands = [];
-	if (platform === "win32") {
-		process.env.WT_SESSION || process.env.TERM_PROGRAM;
-		const isPowerShell = process.env.PSModulePath || parentProcess?.includes("powershell.exe") || parentProcess?.includes("pwsh.exe");
-		const isCMD = parentProcess?.includes("cmd.exe");
-		if (isCMD && !isPowerShell) commands.push(`CMD: set ${variable}=${value}`);
-		else if (isPowerShell && !isCMD) commands.push(`PowerShell: $env:${variable}="${value}"`);
-		else if (isCMD && isPowerShell) {
-			commands.push(`CMD: set ${variable}=${value}`);
-			commands.push(`PowerShell: $env:${variable}="${value}"`);
-		} else {
-			commands.push(`CMD: set ${variable}=${value}`);
-			commands.push(`PowerShell: $env:${variable}="${value}"`);
-		}
-	} else if (shell?.includes("bash") || shell?.includes("zsh")) commands.push(`bash/zsh: export ${variable}="${value}"`);
-	else if (shell?.includes("fish")) commands.push(`fish: set -gx ${variable} "${value}"`);
-	else commands.push(`export ${variable}="${value}"`);
-	return commands;
-}
-async function ensureRegionAvailable(region, hubBaseUrl) {
-	if (hasCustomEndpoints()) return;
-	const cacheKey = `${region}`;
-	if (regionAvailabilityCache.has(cacheKey)) {
-		await regionAvailabilityCache.get(cacheKey);
-		return;
-	}
-	const availabilityPromise = (async () => {
-		const statusUrl = new URL("/api/v1/status", hubBaseUrl).toString();
-		try {
-			if ((await fetch(statusUrl, {
-				signal: withTimeout(STATUS_TIMEOUT_MS),
-				headers: getHeaders()
-			})).ok) return;
-		} catch {}
-		const alternateRegion = region === "cn" ? "global" : "cn";
-		REGION_DOMAINS[alternateRegion];
-		const currentDomain = REGION_DOMAINS[region];
-		const commandList = getShellSpecificCommands("SAFESKILL_REGION", alternateRegion).map((cmd) => `  ${cmd}`).join("\n");
-		throw new Error(`SafeSkill ${region} region (${currentDomain}) is currently unavailable.\nTry these solutions:\n  1. Set environment variable:\n${commandList}\n  2. Or disable telemetry: DISABLE_TELEMETRY=1\n\nFor assistance, contact: dev@safeskill.io`);
-	})();
-	regionAvailabilityCache.set(cacheKey, availabilityPromise);
-	await availabilityPromise;
-}
 async function resolveSafeSkillRegion() {
 	if (resolvedRegionPromise) return resolvedRegionPromise;
 	resolvedRegionPromise = (async () => {
@@ -729,10 +677,7 @@ async function resolveSafeSkillRegion() {
 }
 async function getSafeSkillHubBaseUrl() {
 	if (process.env.SAFESKILL_HUB_URL) return process.env.SAFESKILL_HUB_URL;
-	const region = await resolveSafeSkillRegion();
-	const baseUrl = `https://hubapi.${REGION_DOMAINS[region]}`;
-	await ensureRegionAvailable(region, baseUrl);
-	return baseUrl;
+	return `https://hubapi.${REGION_DOMAINS[await resolveSafeSkillRegion()]}`;
 }
 async function getSafeSkillSearchUrlWithHub(hubBaseUrl) {
 	const configured = process.env.SAFESKILL_SEARCH_URL || process.env.SKILLS_API_URL;
@@ -972,7 +917,7 @@ async function resolveHubSkill(source, agent) {
 				source,
 				agent
 			})
-		}) : null;
+		}).catch(() => null) : null;
 		return resolveWithAgent && resolveWithAgent.ok ? resolveWithAgent : fetch(resolveUrl, {
 			method: "POST",
 			headers: getHeaders({ "content-type": "application/json" }),
@@ -980,15 +925,25 @@ async function resolveHubSkill(source, agent) {
 		});
 	};
 	let resolvedBaseUrl = baseUrl;
-	let response = await resolveFromBaseUrl(baseUrl);
-	const alternateBaseUrl = response.status >= 500 ? getAlternateHubBaseUrl(baseUrl) : null;
+	let response = null;
+	let lastError;
+	try {
+		response = await resolveFromBaseUrl(baseUrl);
+	} catch (error) {
+		lastError = error;
+	}
+	const alternateBaseUrl = !response || response.status >= 500 ? getAlternateHubBaseUrl(baseUrl) : null;
 	if (alternateBaseUrl) {
-		const alternateResponse = await resolveFromBaseUrl(alternateBaseUrl);
-		if (alternateResponse.ok || !response.ok) {
+		const alternateResponse = await resolveFromBaseUrl(alternateBaseUrl).catch((error) => {
+			lastError = error;
+			return null;
+		});
+		if (alternateResponse && (alternateResponse.ok || !response || !response.ok)) {
 			response = alternateResponse;
 			resolvedBaseUrl = alternateBaseUrl;
 		}
 	}
+	if (!response) throw lastError instanceof Error ? lastError : /* @__PURE__ */ new Error("hub resolve failed");
 	if (!response.ok) throw new Error(`hub resolve failed: ${response.status}`);
 	const resolved = await readEnvelope(response);
 	resolved.hubBaseUrl = resolvedBaseUrl;
@@ -2080,6 +2035,21 @@ const agents = {
 		detectInstalled: async () => false
 	}
 };
+const agentAliases = { hermes: "hermes-agent" };
+function normalizeAgentType(input) {
+	if (input in agents) return input;
+	return agentAliases[input] ?? null;
+}
+function normalizeAgentTypes(inputs) {
+	const normalized = inputs.map((agent) => ({
+		input: agent,
+		normalized: normalizeAgentType(agent)
+	}));
+	return {
+		normalizedAgents: normalized.filter((agent) => Boolean(agent.normalized)).map((agent) => agent.normalized),
+		invalidAgents: normalized.filter((agent) => !agent.normalized).map((agent) => agent.input)
+	};
+}
 async function detectInstalledAgents() {
 	return (await Promise.all(Object.entries(agents).map(async ([type, config]) => ({
 		type,
@@ -2930,7 +2900,7 @@ async function saveSelectedAgents(agents) {
 	lock.lastSelectedAgents = agents;
 	await writeSkillLock(lock);
 }
-var version$1 = "0.3.0";
+var version$1 = "0.3.2";
 const isCancelled$1 = (value) => typeof value === "symbol";
 async function isSourcePrivate(source) {
 	const ownerRepo = parseOwnerRepo(source);
@@ -3169,13 +3139,13 @@ async function handleWellKnownSkills(source, url, options, spinner) {
 		targetAgents = validAgents;
 		M.info(`Installing to all ${targetAgents.length} agents`);
 	} else if (options.agent && options.agent.length > 0) {
-		const invalidAgents = options.agent.filter((a) => !validAgents.includes(a));
+		const { normalizedAgents, invalidAgents } = normalizeAgentTypes(options.agent);
 		if (invalidAgents.length > 0) {
 			M.error(`Invalid agents: ${invalidAgents.join(", ")}`);
 			M.info(`Valid agents: ${validAgents.join(", ")}`);
 			process.exit(1);
 		}
-		targetAgents = options.agent;
+		targetAgents = normalizedAgents;
 	} else {
 		spinner.start("Loading agents...");
 		const installedAgents = await detectInstalledAgents();
@@ -3581,14 +3551,14 @@ async function runAdd(args, options = {}) {
 			targetAgents = validAgents;
 			M.info(`Installing to all ${targetAgents.length} agents`);
 		} else if (options.agent && options.agent.length > 0) {
-			const invalidAgents = options.agent.filter((a) => !validAgents.includes(a));
+			const { normalizedAgents, invalidAgents } = normalizeAgentTypes(options.agent);
 			if (invalidAgents.length > 0) {
 				M.error(`Invalid agents: ${invalidAgents.join(", ")}`);
 				M.info(`Valid agents: ${validAgents.join(", ")}`);
 				await cleanup(tempDir);
 				process.exit(1);
 			}
-			targetAgents = options.agent;
+			targetAgents = normalizedAgents;
 		} else {
 			spinner.start("Loading agents...");
 			const installedAgents = await detectInstalledAgents();
@@ -4364,13 +4334,13 @@ async function runSync(args, options = {}) {
 		targetAgents = validAgents;
 		M.info(`Installing to all ${targetAgents.length} agents`);
 	} else if (options.agent && options.agent.length > 0) {
-		const invalidAgents = options.agent.filter((a) => !validAgents.includes(a));
+		const { normalizedAgents, invalidAgents } = normalizeAgentTypes(options.agent);
 		if (invalidAgents.length > 0) {
 			M.error(`Invalid agents: ${invalidAgents.join(", ")}`);
 			M.info(`Valid agents: ${validAgents.join(", ")}`);
 			process.exit(1);
 		}
-		targetAgents = options.agent;
+		targetAgents = normalizedAgents;
 	} else {
 		spinner.start("Loading agents...");
 		const installedAgents = await detectInstalledAgents();
@@ -4614,13 +4584,13 @@ async function runList(args) {
 	let agentFilter;
 	if (options.agent && options.agent.length > 0) {
 		const validAgents = Object.keys(agents);
-		const invalidAgents = options.agent.filter((a) => !validAgents.includes(a));
+		const { normalizedAgents, invalidAgents } = normalizeAgentTypes(options.agent);
 		if (invalidAgents.length > 0) {
 			console.log(`${YELLOW}Invalid agents: ${invalidAgents.join(", ")}${RESET$2}`);
 			console.log(`${DIM$2}Valid agents: ${validAgents.join(", ")}${RESET$2}`);
 			process.exit(1);
 		}
-		agentFilter = options.agent;
+		agentFilter = normalizedAgents;
 	}
 	const installedSkills = await listInstalledSkills({
 		global: scope,
@@ -4715,14 +4685,16 @@ async function removeCommand(skillNames, options) {
 		Se(import_picocolors.default.yellow("No skills found to remove."));
 		return;
 	}
+	let normalizedAgentFilter;
 	if (options.agent && options.agent.length > 0) {
 		const validAgents = Object.keys(agents);
-		const invalidAgents = options.agent.filter((a) => !validAgents.includes(a));
+		const { normalizedAgents, invalidAgents } = normalizeAgentTypes(options.agent);
 		if (invalidAgents.length > 0) {
 			M.error(`Invalid agents: ${invalidAgents.join(", ")}`);
 			M.info(`Valid agents: ${validAgents.join(", ")}`);
 			process.exit(1);
 		}
+		normalizedAgentFilter = normalizedAgents;
 	}
 	let selectedSkills = [];
 	if (options.all) selectedSkills = installedSkills;
@@ -4749,7 +4721,7 @@ async function removeCommand(skillNames, options) {
 		selectedSkills = selected;
 	}
 	let targetAgents;
-	if (options.agent && options.agent.length > 0) targetAgents = options.agent;
+	if (normalizedAgentFilter && normalizedAgentFilter.length > 0) targetAgents = normalizedAgentFilter;
 	else {
 		targetAgents = Object.keys(agents);
 		spinner.stop(`Targeting ${targetAgents.length} potential agent(s)`);
@@ -6762,6 +6734,7 @@ async function main() {
 	}
 }
 function isCliEntrypoint() {
+	if (process.env.SAFESKILL_CLI_ENTRYPOINT === "1") return true;
 	const entrypoint = process.argv[1];
 	return entrypoint ? import.meta.url === pathToFileURL(entrypoint).href : false;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@safeskill/cli",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "SafeSkill CLI, for safe your skills",
   "type": "module",
   "bin": {