happyskills 0.22.1 → 0.23.0

package/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+## [0.23.0] - 2026-03-30
+
+### Added
+- Add renamed file detection to `pull` merge — files renamed on one side (same content, different path) are now classified as `remote_renamed`/`local_renamed` instead of delete + add, and applied as renames on disk. Only 1-to-1 SHA matches are detected; ambiguous many-to-many cases are safely skipped.
+
 ## [0.22.1] - 2026-03-30
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "happyskills",
-	"version": "0.22.1",
+	"version": "0.23.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/pull.js

@@ -360,7 +360,16 @@ const run = (args) => catch_errors('Pull failed', async () => {
 	const [del_err] = await remove_files(skill_dir, classified.remote_only_deleted.map(f => f.path))
 	if (del_err) { spinner.fail('Failed to remove deleted files'); throw del_err[0] }
 
-	// Local-only modified/added → keep (no action needed)
+	// Remote-only renamed → rename local files
+	for (const entry of classified.remote_renamed) {
+		const old_full = path.join(skill_dir, entry.old_path)
+		const new_full = path.join(skill_dir, entry.new_path)
+		const [dir_err] = await ensure_dir(path.dirname(new_full))
+		if (dir_err) { spinner.fail(`Failed to create dir for ${entry.new_path}`); throw dir_err[0] }
+		await fs.promises.rename(old_full, new_full)
+	}
+
+	// Local-only modified/added/renamed → keep (no action needed)
 	// Local-only deleted → keep deleted (no action needed)
 	if (full_report) {
 		for (const entry of [...classified.local_only_modified, ...classified.local_only_added]) {

package/src/merge/comparator.js

@@ -7,6 +7,37 @@
  * All inputs are arrays of { path, sha } entries.
  */
 
+/**
+ * Detect 1-to-1 renames by matching SHAs between deleted and added files.
+ * Ambiguous matches (multiple deletes or adds sharing a SHA) are skipped.
+ */
+const detect_renames = (deleted, added, get_del_sha, get_add_sha) => {
+	const del_by_sha = new Map()
+	for (const entry of deleted) {
+		const sha = get_del_sha(entry)
+		if (!sha) continue
+		del_by_sha.set(sha, del_by_sha.has(sha) ? null : entry)
+	}
+	const add_by_sha = new Map()
+	for (const entry of added) {
+		const sha = get_add_sha(entry)
+		if (!sha) continue
+		add_by_sha.set(sha, add_by_sha.has(sha) ? null : entry)
+	}
+	const renames = []
+	const del_matched = new Set()
+	const add_matched = new Set()
+	for (const [sha, del_entry] of del_by_sha) {
+		if (!del_entry) continue
+		const add_entry = add_by_sha.get(sha)
+		if (!add_entry) continue
+		renames.push({ old_path: del_entry.path, new_path: add_entry.path, sha })
+		del_matched.add(del_entry.path)
+		add_matched.add(add_entry.path)
+	}
+	return { renames, del_matched, add_matched }
+}
+
 const classify_changes = (base_files, local_files, remote_files) => {
 	const base_map = new Map(base_files.map(e => [e.path, e.sha]))
 	const local_map = new Map(local_files.map(e => [e.path, e.sha]))
@@ -83,14 +114,26 @@ const classify_changes = (base_files, local_files, remote_files) => {
 		}
 	}
 
+	// Detect renames: 1-to-1 SHA matches between deleted and added on the same side
+	const r = detect_renames(
+		remote_only_deleted, remote_only_added,
+		e => base_map.get(e.path), e => e.remote_sha
+	)
+	const l = detect_renames(
+		local_only_deleted, local_only_added,
+		e => base_map.get(e.path), e => e.local_sha
+	)
+
 	return {
 		remote_only_modified,
 		local_only_modified,
 		both_modified,
-		remote_only_added,
-		local_only_added,
-		remote_only_deleted,
-		local_only_deleted,
+		remote_only_added: remote_only_added.filter(e => !r.add_matched.has(e.path)),
+		local_only_added: local_only_added.filter(e => !l.add_matched.has(e.path)),
+		remote_only_deleted: remote_only_deleted.filter(e => !r.del_matched.has(e.path)),
+		local_only_deleted: local_only_deleted.filter(e => !l.del_matched.has(e.path)),
+		remote_renamed: r.renames,
+		local_renamed: l.renames,
 		unchanged
 	}
 }

package/src/merge/comparator.test.js

@@ -158,4 +158,97 @@ describe('classify_changes', () => {
 		assert.strictEqual(r.both_modified.length, 1)
 		assert.deepStrictEqual(r.both_modified[0], { path: 'a.md', base_sha: '111', local_sha: '222', remote_sha: null })
 	})
+
+	it('detects remote rename (1-to-1 SHA match)', () => {
+		const base = [{ path: 'old.md', sha: 'aaa' }]
+		const local = [{ path: 'old.md', sha: 'aaa' }]
+		const remote = [{ path: 'new.md', sha: 'aaa' }]
+		const r = classify_changes(base, local, remote)
+		assert.strictEqual(r.remote_renamed.length, 1)
+		assert.deepStrictEqual(r.remote_renamed[0], { old_path: 'old.md', new_path: 'new.md', sha: 'aaa' })
+		assert.strictEqual(r.remote_only_deleted.length, 0)
+		assert.strictEqual(r.remote_only_added.length, 0)
+	})
+
+	it('detects local rename (1-to-1 SHA match)', () => {
+		const base = [{ path: 'old.md', sha: 'bbb' }]
+		const local = [{ path: 'new.md', sha: 'bbb' }]
+		const remote = [{ path: 'old.md', sha: 'bbb' }]
+		const r = classify_changes(base, local, remote)
+		assert.strictEqual(r.local_renamed.length, 1)
+		assert.deepStrictEqual(r.local_renamed[0], { old_path: 'old.md', new_path: 'new.md', sha: 'bbb' })
+		assert.strictEqual(r.local_only_deleted.length, 0)
+		assert.strictEqual(r.local_only_added.length, 0)
+	})
+
+	it('skips rename detection for many-to-many SHA matches', () => {
+		// Two deleted files with same SHA + two added files with same SHA → ambiguous
+		const base = [
+			{ path: 'a.md', sha: 'xxx' },
+			{ path: 'b.md', sha: 'xxx' },
+		]
+		const local = [
+			{ path: 'a.md', sha: 'xxx' },
+			{ path: 'b.md', sha: 'xxx' },
+		]
+		const remote = [
+			{ path: 'c.md', sha: 'xxx' },
+			{ path: 'd.md', sha: 'xxx' },
+		]
+		const r = classify_changes(base, local, remote)
+		assert.strictEqual(r.remote_renamed.length, 0)
+		assert.strictEqual(r.remote_only_deleted.length, 2)
+		assert.strictEqual(r.remote_only_added.length, 2)
+	})
+
+	it('skips rename when only one side is ambiguous (two deletes, one add)', () => {
+		const base = [
+			{ path: 'a.md', sha: 'xxx' },
+			{ path: 'b.md', sha: 'xxx' },
+		]
+		const local = [
+			{ path: 'a.md', sha: 'xxx' },
+			{ path: 'b.md', sha: 'xxx' },
+		]
+		const remote = [{ path: 'c.md', sha: 'xxx' }]
+		const r = classify_changes(base, local, remote)
+		assert.strictEqual(r.remote_renamed.length, 0)
+		assert.strictEqual(r.remote_only_deleted.length, 2)
+		assert.strictEqual(r.remote_only_added.length, 1)
+	})
+
+	it('does not detect rename when content changed (different SHAs)', () => {
+		const base = [{ path: 'old.md', sha: 'aaa' }]
+		const local = [{ path: 'old.md', sha: 'aaa' }]
+		const remote = [{ path: 'new.md', sha: 'bbb' }]
+		const r = classify_changes(base, local, remote)
+		assert.strictEqual(r.remote_renamed.length, 0)
+		assert.strictEqual(r.remote_only_deleted.length, 1)
+		assert.strictEqual(r.remote_only_added.length, 1)
+	})
+
+	it('handles mixed scenario with renames alongside other changes', () => {
+		const base = [
+			{ path: 'unchanged.md', sha: '000' },
+			{ path: 'old_name.md', sha: 'rrr' },
+			{ path: 'remote_mod.md', sha: '111' },
+		]
+		const local = [
+			{ path: 'unchanged.md', sha: '000' },
+			{ path: 'old_name.md', sha: 'rrr' },
+			{ path: 'remote_mod.md', sha: '111' },
+		]
+		const remote = [
+			{ path: 'unchanged.md', sha: '000' },
+			{ path: 'new_name.md', sha: 'rrr' },
+			{ path: 'remote_mod.md', sha: 'R11' },
+		]
+		const r = classify_changes(base, local, remote)
+		assert.strictEqual(r.unchanged.length, 1)
+		assert.strictEqual(r.remote_renamed.length, 1)
+		assert.deepStrictEqual(r.remote_renamed[0], { old_path: 'old_name.md', new_path: 'new_name.md', sha: 'rrr' })
+		assert.strictEqual(r.remote_only_modified.length, 1)
+		assert.strictEqual(r.remote_only_deleted.length, 0)
+		assert.strictEqual(r.remote_only_added.length, 0)
+	})
 })

package/src/merge/report.js

@@ -14,6 +14,7 @@ const CLASSIFICATIONS = [
 	'remote_only_modified', 'local_only_modified', 'both_modified',
 	'remote_only_added', 'local_only_added',
 	'remote_only_deleted', 'local_only_deleted',
+	'remote_renamed', 'local_renamed',
 	'unchanged'
 ]
 
@@ -41,14 +42,17 @@ const build_report = (skill, base_version, remote_version, classified) => {
 			if (is_conflict) conflicted++
 			else auto_merged++
 
-			files.push({
-				path: entry.path,
+			const is_rename = classification === 'remote_renamed' || classification === 'local_renamed'
+			const file_entry = {
+				path: is_rename ? entry.new_path : entry.path,
 				classification,
 				conflict_written: false,
-				base_sha: entry.base_sha || null,
+				base_sha: entry.base_sha || entry.sha || null,
 				local_sha: entry.local_sha || null,
 				remote_sha: entry.remote_sha || null
-			})
+			}
+			if (is_rename) file_entry.old_path = entry.old_path
+			files.push(file_entry)
 		}
 	}