happyskills 0.23.0 → 0.24.0

package/CHANGELOG.md

@@ -7,6 +7,11 @@ 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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "happyskills",
-	"version": "0.23.0",
+	"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] }
@@ -440,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)