happyskills 0.22.1 → 0.24.0

package/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+## [0.24.0] - 2026-03-30
+
+### Added
+- Add merge commit support to `pull` and `publish` — when `pull` auto-merges local and remote changes without conflicts, the lock file stores `merge_parents` (the old base and remote head). On `publish`, these are sent as `parent_shas` to create a two-parent merge commit, preserving DAG history. Conflicts fall back to rebase semantics (single-parent commit). `merge_parents` is cleared after publish, on fast-forward, or when conflicts exist.
+
+## [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.24.0",
 	"description": "Package manager for AI agent skills",
 	"license": "SEE LICENSE IN LICENSE",
 	"author": "Nicolas Dao <nic@cloudlesslabs.com> (https://cloudlesslabs.com)",

package/src/api/push.js

@@ -12,13 +12,15 @@ const estimate_payload_size = (files) => {
 	return size
 }
 
-const smart_push = (owner, repo, { version, message, files, visibility, base_commit, force }, on_progress) =>
+const smart_push = (owner, repo, { version, message, files, visibility, base_commit, force, parent_shas }, on_progress) =>
 	catch_errors('Smart push failed', async () => {
 		const payload_size = estimate_payload_size(files)
 
 		if (payload_size < DIRECT_PUSH_THRESHOLD) {
 			// Small payload — use direct push
-			const [err, data] = await repos_api.push(owner, repo, { version, message, files, visibility, base_commit, force })
+			const body = { version, message, files, visibility, base_commit, force }
+			if (parent_shas) body.parent_shas = parent_shas
+			const [err, data] = await repos_api.push(owner, repo, body)
 			if (err) throw e('Direct push failed', err)
 			return data
 		}
@@ -27,9 +29,9 @@ const smart_push = (owner, repo, { version, message, files, visibility, base_com
 		const file_meta = files.map(f => ({ path: f.path, sha: f.sha, size: f.size }))
 
 		// Step 1: Initiate
-		const [init_err, init_data] = await initiate_upload(owner, repo, {
-			version, message, files: file_meta, visibility, base_commit, force
-		})
+		const init_body = { version, message, files: file_meta, visibility, base_commit, force }
+		if (parent_shas) init_body.parent_shas = parent_shas
+		const [init_err, init_data] = await initiate_upload(owner, repo, init_body)
 		if (init_err) throw e('Upload initiation failed', init_err)
 
 		const { upload_id, presigned_urls } = init_data
@@ -52,9 +54,9 @@ const smart_push = (owner, repo, { version, message, files, visibility, base_com
 		if (upload_err) throw e('File uploads failed', upload_err)
 
 		// Step 3: Complete
-		const [complete_err, complete_data] = await complete_upload(owner, repo, {
-			upload_id, version, message, files: file_meta, base_commit, force
-		})
+		const complete_body = { upload_id, version, message, files: file_meta, base_commit, force }
+		if (parent_shas) complete_body.parent_shas = parent_shas
+		const [complete_err, complete_data] = await complete_upload(owner, repo, complete_body)
 		if (complete_err) throw e('Upload completion failed', complete_err)
 
 		return complete_data

package/src/commands/publish.js

@@ -158,17 +158,19 @@ const run = (args) => catch_errors('Publish failed', async () => {
 		}
 	}
 
-	// Read base_commit from lock file for divergence check
+	// Read base_commit and merge_parents from lock file for divergence check
 	const full_name_pre = `${workspace.slug}/${manifest.name}`
 	const project_root = find_project_root()
 	const [lock_err, lock_data] = await read_lock(project_root)
 	let base_commit = null
+	let merge_parents = null
 	if (!lock_err && lock_data) {
 		const all_skills = get_all_locked_skills(lock_data)
 		const suffix = `/${skill_name}`
 		const lock_key = Object.keys(all_skills).find(k => k.endsWith(suffix))
 		if (lock_key && all_skills[lock_key]) {
 			base_commit = all_skills[lock_key].base_commit || null
+			merge_parents = all_skills[lock_key].merge_parents || null
 		}
 	}
 
@@ -187,14 +189,18 @@ const run = (args) => catch_errors('Publish failed', async () => {
 		spinner.update(`Uploading files (${completed}/${total})...`)
 	}
 	const visibility = args.flags.public ? 'public' : 'private'
-	const [push_err, push_data] = await smart_push(workspace.slug, manifest.name, {
+	const push_options = {
 		version: manifest.version,
 		message: `Release ${manifest.version}`,
 		files: skill_files,
 		visibility,
 		base_commit: force ? null : base_commit,
 		force
-	}, on_progress)
+	}
+	if (merge_parents && !force) {
+		push_options.parent_shas = merge_parents
+	}
+	const [push_err, push_data] = await smart_push(workspace.slug, manifest.name, push_options, on_progress)
 	if (push_err) {
 		const last = push_err[push_err.length - 1]
 		if (last?.message?.includes('diverged') || last?.message?.includes('DIVERGED')) {
@@ -226,6 +232,8 @@ const run = (args) => catch_errors('Publish failed', async () => {
 				base_integrity: (!hash_err && integrity) ? integrity : null
 			}
 			if (!hash_err && integrity) updated_entry.integrity = integrity
+			delete updated_entry.merge_parents
+			delete updated_entry.conflict_files
 			const updated_skills = update_lock_skills(lock_data, { [lock_key]: updated_entry })
 			await write_lock(project_root, updated_skills)
 		} else {

package/src/commands/pull.js

@@ -205,6 +205,8 @@ const run = (args) => catch_errors('Pull failed', async () => {
 			version: cmp_data.head_version || lock_entry.version,
 			ref: clone_data.ref || lock_entry.ref
 		}
+		delete updated_entry.merge_parents
+		delete updated_entry.conflict_files
 		const merged_skills = update_lock_skills(lock_data, { [skill_name]: updated_entry })
 		const [wl_err] = await write_lock(lock_root(is_global, project_root), merged_skills)
 		if (wl_err) { spinner.fail('Failed to write lock file'); throw wl_err[0] }
@@ -360,7 +362,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]) {
@@ -431,8 +442,10 @@ const run = (args) => catch_errors('Pull failed', async () => {
 	}
 	if (conflict_files.length > 0) {
 		updated_entry.conflict_files = conflict_files
+		delete updated_entry.merge_parents // Conflicts → rebase fallback
 	} else {
 		delete updated_entry.conflict_files
+		updated_entry.merge_parents = [lock_entry.base_commit, cmp_data.head_commit]
 	}
 	const merged_skills = update_lock_skills(lock_data, { [skill_name]: updated_entry })
 	const [wl_err] = await write_lock(lock_root(is_global, project_root), merged_skills)

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)
 		}
 	}