happyskills 0.20.0 → 0.21.0

package/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+## [0.21.0] - 2026-03-30
+
+### Changed
+- Upgrade `check` and `refresh` from semver-only to commit-level comparison (`base_commit` vs remote head) for accurate divergence detection — catches divergence even when version strings match (e.g., after force-publish). Falls back to version comparison for old lock files without `base_commit`.
+
+### Added
+- Add `conflicts` status to `check` command — detects unresolved merge conflicts from the lock file's `conflict_files` field without disk I/O. JSON output now includes `conflicts_count`.
+- Add local modification protection to `refresh` — skills with local edits are skipped with a warning and `happyskills pull` suggestion instead of being silently overwritten. JSON output includes `skipped` array with `{ skill, reason, suggestion }` per entry.
+
 ## [0.20.0] - 2026-03-30
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "happyskills",
-	"version": "0.20.0",
+	"version": "0.21.0",
 	"description": "Package manager for AI agent skills",
 	"license": "SEE LICENSE IN LICENSE",
 	"author": "Nicolas Dao <nic@cloudlesslabs.com> (https://cloudlesslabs.com)",

package/src/commands/check.js

@@ -1,7 +1,6 @@
 const { error: { catch_errors, wrap_errors: e } } = require('puffy-core')
 const { read_lock, get_all_locked_skills } = require('../lock/reader')
 const repos_api = require('../api/repos')
-const { gt } = require('../utils/semver')
 const { print_help, print_table, print_json, print_info, print_success, print_warn, print_hint, code } = require('../ui/output')
 const { green, yellow, red } = require('../ui/colors')
 const { exit_with_error } = require('../utils/errors')
@@ -68,13 +67,17 @@ const run = (args) => catch_errors('Check failed', async () => {
 	} else {
 		for (const [name, data] of to_check) {
 			const info = batch_data?.results?.[name]
-			if (info?.access_denied) {
+			const has_conflicts = (data.conflict_files || []).length > 0
+			if (has_conflicts) {
+				results.push({ skill: name, installed: data.version, latest: info?.latest_version || '-', status: 'conflicts' })
+			} else if (info?.access_denied) {
 				results.push({ skill: name, installed: data.version, latest: '-', status: 'no-access' })
 			} else if (!info || !info.latest_version) {
 				results.push({ skill: name, installed: data.version, latest: '-', status: 'unknown' })
-			} else if (info.latest_version === data.version) {
-				results.push({ skill: name, installed: data.version, latest: info.latest_version, status: 'up-to-date' })
-			} else if (gt(info.latest_version, data.version)) {
+			} else if (data.base_commit && info.commit && data.base_commit !== info.commit) {
+				results.push({ skill: name, installed: data.version, latest: info.latest_version, status: 'outdated' })
+			} else if (!data.base_commit && info.latest_version !== data.version) {
+				// Fallback to version comparison for old lock files without base_commit
 				results.push({ skill: name, installed: data.version, latest: info.latest_version, status: 'outdated' })
 			} else {
 				results.push({ skill: name, installed: data.version, latest: info.latest_version, status: 'up-to-date' })
@@ -85,13 +88,15 @@ const run = (args) => catch_errors('Check failed', async () => {
 	if (args.flags.json) {
 		const outdated_count = results.filter(r => r.status === 'outdated').length
 		const up_to_date_count = results.filter(r => r.status === 'up-to-date').length
-		print_json({ data: { results, outdated_count, up_to_date_count } })
+		const conflicts_count = results.filter(r => r.status === 'conflicts').length
+		print_json({ data: { results, outdated_count, up_to_date_count, conflicts_count } })
 		return
 	}
 
 	const status_colors = {
 		'up-to-date': green,
 		'outdated': yellow,
+		'conflicts': red,
 		'no-access': yellow,
 		'error': red,
 		'unknown': (s) => s
@@ -107,11 +112,17 @@ const run = (args) => catch_errors('Check failed', async () => {
 	print_table(['Skill', 'Installed', 'Latest', 'Status'], rows)
 
 	const outdated = results.filter(r => r.status === 'outdated')
+	const conflicts = results.filter(r => r.status === 'conflicts')
 	const no_access = results.filter(r => r.status === 'no-access')
+	if (conflicts.length > 0) {
+		console.log()
+		print_warn(`${conflicts.length} skill(s) have unresolved merge conflicts.`)
+		print_hint(`Run ${code('happyskills status')} for details.`)
+	}
 	if (outdated.length > 0) {
 		console.log()
 		print_info(`Run ${code('happyskills update')} to upgrade ${outdated.length} skill(s).`)
-	} else if (results.every(r => r.status === 'up-to-date')) {
+	} else if (conflicts.length === 0 && results.every(r => r.status === 'up-to-date')) {
 		console.log()
 		print_success('All skills are up to date.')
 	}

package/src/commands/refresh.js

@@ -1,13 +1,13 @@
 const { error: { catch_errors, wrap_errors: e } } = require('puffy-core')
 const { install } = require('../engine/installer')
 const { read_lock, get_all_locked_skills } = require('../lock/reader')
+const { detect_status } = require('../merge/detector')
 const repos_api = require('../api/repos')
-const { gt } = require('../utils/semver')
 const { print_help, print_table, print_json, print_info, print_success, print_warn, print_hint, code } = require('../ui/output')
 const { green, yellow, red } = require('../ui/colors')
 const { create_spinner } = require('../ui/spinner')
 const { exit_with_error } = require('../utils/errors')
-const { find_project_root, lock_root } = require('../config/paths')
+const { find_project_root, lock_root, skills_dir, skill_install_dir } = require('../config/paths')
 const { EXIT_CODES } = require('../constants')
 
 const HELP_TEXT = `Usage: happyskills refresh [options]
@@ -78,9 +78,10 @@ const run = (args) => catch_errors('Refresh failed', async () => {
 				results.push({ skill: name, installed: data.version, latest: '-', status: 'no-access' })
 			} else if (!info || !info.latest_version) {
 				results.push({ skill: name, installed: data.version, latest: '-', status: 'unknown' })
-			} else if (info.latest_version === data.version) {
-				results.push({ skill: name, installed: data.version, latest: info.latest_version, status: 'up-to-date' })
-			} else if (gt(info.latest_version, data.version)) {
+			} else if (data.base_commit && info.commit && data.base_commit !== info.commit) {
+				results.push({ skill: name, installed: data.version, latest: info.latest_version, status: 'outdated' })
+			} else if (!data.base_commit && info.latest_version !== data.version) {
+				// Fallback to version comparison for old lock files without base_commit
 				results.push({ skill: name, installed: data.version, latest: info.latest_version, status: 'outdated' })
 			} else {
 				results.push({ skill: name, installed: data.version, latest: info.latest_version, status: 'up-to-date' })
@@ -125,12 +126,29 @@ const run = (args) => catch_errors('Refresh failed', async () => {
 		}
 	}
 
-	// 5. Update outdated skills
+	// 5. Detect local modifications before updating
+	const base_dir = skills_dir(is_global, project_root)
+	const skipped = []
+	const safe_to_update = []
+
+	for (const r of outdated) {
+		const lock_entry = skills[r.skill]
+		const short_name = r.skill.split('/')[1] || r.skill
+		const dir = skill_install_dir(base_dir, short_name)
+		const [, det] = await detect_status(lock_entry, dir)
+		if (det?.local_modified) {
+			skipped.push({ skill: r.skill, reason: 'local_modifications', suggestion: `happyskills pull ${r.skill}` })
+		} else {
+			safe_to_update.push(r)
+		}
+	}
+
+	// 6. Update safe skills
 	const options = { global: is_global, fresh: true, agents: args.flags.agents || undefined, project_root }
 	const updated = []
 	const update_errors = []
 
-	for (const r of outdated) {
+	for (const r of safe_to_update) {
 		const update_spinner = !args.flags.json ? create_spinner(`Updating ${r.skill}…`) : null
 		const [errors, result] = await install(r.skill, options)
 		if (errors) {
@@ -144,7 +162,7 @@ const run = (args) => catch_errors('Refresh failed', async () => {
 		}
 	}
 
-	// 6. Output results
+	// 7. Output results
 	if (args.flags.json) {
 		print_json({
 			data: {
@@ -152,6 +170,7 @@ const run = (args) => catch_errors('Refresh failed', async () => {
 				outdated_count: outdated.length,
 				up_to_date_count: up_to_date.length,
 				updated,
+				skipped,
 				already_up_to_date: up_to_date.map(r => ({ skill: r.skill, version: r.installed })),
 				errors: update_errors
 			}
@@ -159,6 +178,14 @@ const run = (args) => catch_errors('Refresh failed', async () => {
 		return
 	}
 
+	if (skipped.length > 0) {
+		console.log()
+		print_warn(`Skipped ${skipped.length} skill(s) with local modifications:`)
+		for (const s of skipped) {
+			print_info(`  ${s.skill}`)
+		}
+		print_hint(`Use ${code('happyskills pull <skill>')} to merge remote changes.`)
+	}
 	if (updated.length > 0) {
 		console.log()
 		print_success(`Updated ${updated.length} skill(s).`)