@theholocron/cli 2.0.0-alpha.45 → 2.0.0-alpha.46

package/README.md

@@ -107,8 +107,6 @@ export default acmeConfig;
 
 ## Status
 
-**`v2.0.0-alpha.0`** — published on npm under the `alpha` dist-tag.
-[Release notes](https://github.com/theholocron/holocron/releases/tag/v2.0.0-alpha.0).
-Design in
+Published on npm under the `alpha` dist-tag. APIs may still shift before
+stable v2.0.0. Design in
 [`.notes/archive/tech-architecture.spec.md`](../../.notes/archive/tech-architecture.spec.md).
-APIs may still shift before stable v2.0.0.

package/dist/cli.mjs

@@ -3,9 +3,10 @@ import { existsSync, mkdirSync, readFileSync, readdirSync, statSync, writeFileSy
 import path, { basename, dirname, join } from "node:path";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { ProviderApiError } from "@theholocron/http-client";
+import { ProviderApiError, ProviderApiError as ProviderApiError$1 } from "@theholocron/http-client";
 import { Entry, findCredentials } from "@napi-rs/keyring";
 import { createHash } from "node:crypto";
+import { createGitHubClient } from "@theholocron/github-client";
 import { spawnSync } from "node:child_process";
 import { access, readFile, stat } from "node:fs/promises";
 import { pathToFileURL } from "node:url";
@@ -1233,8 +1234,8 @@ jobs:
           env.GPG_KEY_SET == 'true'
         with:
           branch: \${{ github.event.pull_request.head.ref || github.head_ref || github.ref }}
-          commit_message: "chore: fix linting issues"
-          commit_options: "--no-verify --signoff"
+          commit_message: "chore: fix linting issues\\n\\nSigned-off-by: super-linter <super-linter@super-linter.dev>"
+          commit_options: "--no-verify"
           commit_user_name: super-linter
           commit_user_email: super-linter@super-linter.dev
 `,
@@ -2005,7 +2006,6 @@ function generateThinCallerContent(name, withOverrides) {
 //#endregion
 //#region src/commands/sync-github.ts
 const DEFAULT_REPO = "theholocron/.github";
-const API_BASE = "https://api.github.com";
 /**
 * Extracts the `project.workflows` array from a `holocron.config.ts` source string.
 * Handles both plain string entries and `{ name, with }` object entries.
@@ -2111,16 +2111,12 @@ function gitBlobSha(content) {
 async function runSyncGithub(input) {
 	const print = input.print ?? ((line) => console.log(line));
 	const repo = input.repo ?? DEFAULT_REPO;
-	const [owner, repoName] = repo.split("/");
 	const { token, dryRun = false, branch, createPr = false } = input;
 	const message = input.message ?? `chore: sync from theholocron/holocron`;
-	const fetchFn = input.fetch ?? globalThis.fetch;
-	const headers = {
-		Authorization: `Bearer ${token}`,
-		Accept: "application/vnd.github+json",
-		"Content-Type": "application/json",
-		"X-GitHub-Api-Version": "2022-11-28"
-	};
+	const client = createGitHubClient({
+		token,
+		fetch: input.fetch
+	});
 	print(`holocron sync-github${dryRun ? " (dry-run)" : ""}`);
 	print(`  repo:   ${repo}`);
 	if (branch) print(`  branch: ${branch}`);
@@ -2142,26 +2138,31 @@ async function runSyncGithub(input) {
 	}
 	let targetBranch = branch;
 	let defaultBranch;
-	if (!targetBranch || createPr) {
-		const repoRes = await fetchFn(`${API_BASE}/repos/${owner}/${repoName}`, { headers });
-		if (!repoRes.ok) {
-			const msg = "failed to fetch repo metadata";
-			print(`  ✗ ${msg}`);
-			return {
-				status: "fail",
-				created: 0,
-				updated: 0,
-				unchanged: 0,
-				message: msg
-			};
-		}
-		defaultBranch = (await repoRes.json()).default_branch;
+	if (!targetBranch || createPr) try {
+		defaultBranch = (await client.repos.getRepo(repo)).default_branch;
 		if (!targetBranch) targetBranch = defaultBranch;
+	} catch {
+		const msg = "failed to fetch repo metadata";
+		print(`  ✗ ${msg}`);
+		return {
+			status: "fail",
+			created: 0,
+			updated: 0,
+			unchanged: 0,
+			message: msg
+		};
 	}
 	const baseBranch = createPr && defaultBranch ? defaultBranch : targetBranch;
-	const refRes = await fetchFn(`${API_BASE}/repos/${owner}/${repoName}/git/ref/heads/${baseBranch}`, { headers });
-	if (!refRes.ok) {
-		const msg = `Branch ${baseBranch} not found`;
+	let headSha;
+	let baseTreeSha;
+	let existingBlobs;
+	try {
+		headSha = (await client.git.getRef(repo, baseBranch)).object.sha;
+		baseTreeSha = (await client.git.getCommit(repo, headSha)).tree.sha;
+		const treeData = await client.git.getTree(repo, baseTreeSha, true);
+		existingBlobs = new Map(treeData.tree.filter((i) => i.type === "blob").map((i) => [i.path, i.sha]));
+	} catch (err) {
+		const msg = err instanceof Error ? err.message : `Branch ${baseBranch} not found`;
 		print(`  ✗ ${msg}`);
 		return {
 			status: "fail",
@@ -2171,24 +2172,19 @@ async function runSyncGithub(input) {
 			message: msg
 		};
 	}
-	const { object: { sha: headSha } } = await refRes.json();
-	const { tree: { sha: baseTreeSha } } = await (await fetchFn(`${API_BASE}/repos/${owner}/${repoName}/git/commits/${headSha}`, { headers })).json();
-	const { tree: existingTree } = await (await fetchFn(`${API_BASE}/repos/${owner}/${repoName}/git/trees/${baseTreeSha}?recursive=1`, { headers })).json();
-	const existingBlobs = new Map(existingTree.filter((i) => i.type === "blob").map((i) => [i.path, i.sha]));
 	let allowedWorkflows;
 	let withOverrides;
 	if (repo !== DEFAULT_REPO) try {
 		let entries = [];
-		const jsonRes = await fetchFn(`${API_BASE}/repos/${owner}/${repoName}/contents/holocron.config.json`, { headers });
-		if (jsonRes.ok) {
-			const data = await jsonRes.json();
+		try {
+			const data = await client.git.getContents(repo, "holocron.config.json");
 			entries = (JSON.parse(Buffer.from(data.content.replace(/\n/g, ""), "base64").toString("utf8"))?.project?.workflows ?? []).map((w) => typeof w === "string" ? { name: w } : w);
-		} else {
-			const tsRes = await fetchFn(`${API_BASE}/repos/${owner}/${repoName}/contents/holocron.config.ts`, { headers });
-			if (tsRes.ok) {
-				const data = await tsRes.json();
+		} catch (err) {
+			if (!(err instanceof ProviderApiError) || err.status !== 404) throw err;
+			try {
+				const data = await client.git.getContents(repo, "holocron.config.ts");
 				entries = parseWorkflowsFromTs(Buffer.from(data.content.replace(/\n/g, ""), "base64").toString("utf8"));
-			}
+			} catch {}
 		}
 		if (entries.length > 0) {
 			allowedWorkflows = new Set(entries.map((e) => e.name));
@@ -2226,45 +2222,30 @@ async function runSyncGithub(input) {
 		unchanged
 	};
 	const treeEntries = [];
-	for (const file of changedFiles) {
-		const blobRes = await fetchFn(`${API_BASE}/repos/${owner}/${repoName}/git/blobs`, {
-			method: "POST",
-			headers,
-			body: JSON.stringify({
-				content: file.content,
-				encoding: "utf-8"
-			})
-		});
-		if (!blobRes.ok) {
-			const err = await blobRes.json();
-			const msg = `failed to create blob for ${file.path}: ${err.message ?? blobRes.status}`;
-			print(`  ✗ ${msg}`);
-			return {
-				status: "fail",
-				created,
-				updated,
-				unchanged,
-				message: msg
-			};
-		}
-		const { sha: blobSha } = await blobRes.json();
+	for (const file of changedFiles) try {
+		const blob = await client.git.createBlob(repo, file.content);
 		treeEntries.push({
 			path: file.path,
 			mode: "100644",
 			type: "blob",
-			sha: blobSha
+			sha: blob.sha
 		});
+	} catch (err) {
+		const msg = `failed to create blob for ${file.path}: ${err instanceof Error ? err.message : String(err)}`;
+		print(`  ✗ ${msg}`);
+		return {
+			status: "fail",
+			created,
+			updated,
+			unchanged,
+			message: msg
+		};
 	}
-	const newTreeRes = await fetchFn(`${API_BASE}/repos/${owner}/${repoName}/git/trees`, {
-		method: "POST",
-		headers,
-		body: JSON.stringify({
-			base_tree: baseTreeSha,
-			tree: treeEntries
-		})
-	});
-	if (!newTreeRes.ok) {
-		const msg = `failed to create tree: ${(await newTreeRes.json()).message ?? newTreeRes.status}`;
+	let newTreeSha;
+	try {
+		newTreeSha = (await client.git.createTree(repo, treeEntries, baseTreeSha)).sha;
+	} catch (err) {
+		const msg = `failed to create tree: ${err instanceof Error ? err.message : String(err)}`;
 		print(`  ✗ ${msg}`);
 		return {
 			status: "fail",
@@ -2274,18 +2255,11 @@ async function runSyncGithub(input) {
 			message: msg
 		};
 	}
-	const { sha: newTreeSha } = await newTreeRes.json();
-	const newCommitRes = await fetchFn(`${API_BASE}/repos/${owner}/${repoName}/git/commits`, {
-		method: "POST",
-		headers,
-		body: JSON.stringify({
-			message,
-			tree: newTreeSha,
-			parents: [headSha]
-		})
-	});
-	if (!newCommitRes.ok) {
-		const msg = `failed to create commit: ${(await newCommitRes.json()).message ?? newCommitRes.status}`;
+	let newCommitSha;
+	try {
+		newCommitSha = (await client.git.createCommit(repo, message, newTreeSha, [headSha])).sha;
+	} catch (err) {
+		const msg = `failed to create commit: ${err instanceof Error ? err.message : String(err)}`;
 		print(`  ✗ ${msg}`);
 		return {
 			status: "fail",
@@ -2295,32 +2269,16 @@ async function runSyncGithub(input) {
 			message: msg
 		};
 	}
-	const { sha: newCommitSha } = await newCommitRes.json();
-	let refUpdateRes;
-	if (createPr && branch) {
-		refUpdateRes = await fetchFn(`${API_BASE}/repos/${owner}/${repoName}/git/refs`, {
-			method: "POST",
-			headers,
-			body: JSON.stringify({
-				ref: `refs/heads/${branch}`,
-				sha: newCommitSha
-			})
-		});
-		if (refUpdateRes.status === 422) refUpdateRes = await fetchFn(`${API_BASE}/repos/${owner}/${repoName}/git/refs/heads/${branch}`, {
-			method: "PATCH",
-			headers,
-			body: JSON.stringify({
-				sha: newCommitSha,
-				force: true
-			})
-		});
-	} else refUpdateRes = await fetchFn(`${API_BASE}/repos/${owner}/${repoName}/git/refs/heads/${targetBranch}`, {
-		method: "PATCH",
-		headers,
-		body: JSON.stringify({ sha: newCommitSha })
-	});
-	if (!refUpdateRes.ok) {
-		const msg = `failed to update ref: ${(await refUpdateRes.json()).message ?? refUpdateRes.status}`;
+	try {
+		if (createPr && branch) try {
+			await client.git.createRef(repo, `refs/heads/${branch}`, newCommitSha);
+		} catch (err) {
+			if (!(err instanceof ProviderApiError) || err.status !== 422) throw err;
+			await client.git.updateRef(repo, `heads/${branch}`, newCommitSha, true);
+		}
+		else await client.git.updateRef(repo, `heads/${targetBranch}`, newCommitSha);
+	} catch (err) {
+		const msg = `failed to update ref: ${err instanceof Error ? err.message : String(err)}`;
 		print(`  ✗ ${msg}`);
 		return {
 			status: "fail",
@@ -2331,25 +2289,17 @@ async function runSyncGithub(input) {
 		};
 	}
 	let prUrl;
-	if (branch && createPr && !dryRun) {
-		const prRes = await fetchFn(`${API_BASE}/repos/${owner}/${repoName}/pulls`, {
-			method: "POST",
-			headers,
-			body: JSON.stringify({
-				title: message.split("\n")[0],
-				head: branch,
-				base: "main",
-				body: "Auto-generated by `holocron sync-github`. Review and merge to apply template updates."
-			})
-		});
-		if (prRes.ok) {
-			prUrl = (await prRes.json()).html_url;
-			print(`  → PR opened: ${prUrl}`);
-		} else {
-			const err = await prRes.json();
-			if (err.errors?.some((e) => e.message.includes("already exists"))) print(`  → PR already open for ${branch} — branch updated, ready to merge`);
-			else print(`  ⚠ PR creation failed: ${err.message ?? prRes.status}`);
-		}
+	if (branch && createPr && !dryRun) try {
+		prUrl = (await client.git.createPull(repo, {
+			title: message.split("\n")[0],
+			head: branch,
+			base: "main",
+			body: "Auto-generated by `holocron sync-github`. Review and merge to apply template updates."
+		})).html_url;
+		print(`  → PR opened: ${prUrl}`);
+	} catch (err) {
+		if (err instanceof ProviderApiError && err.status === 422 && String(err.details).includes("already exists")) print(`  → PR already open for ${branch} — branch updated, ready to merge`);
+		else print(`  ⚠ PR creation failed: ${err instanceof Error ? err.message : String(err)}`);
 	}
 	return {
 		status: "ok",
@@ -4019,7 +3969,7 @@ async function upsertBranchProtection(source, dryRun, requiredChecks) {
 			message: "created"
 		};
 	} catch (err) {
-		if (!(err instanceof ProviderApiError) || err.status !== 403) return {
+		if (!(err instanceof ProviderApiError$1) || err.status !== 403) return {
 			capability: "source",
 			step,
 			status: "fail",
@@ -4036,7 +3986,7 @@ async function upsertBranchProtection(source, dryRun, requiredChecks) {
 			message: `classic protection on ${repo.defaultBranch}`
 		};
 	} catch (err) {
-		if (err instanceof ProviderApiError && err.status === 403) return {
+		if (err instanceof ProviderApiError$1 && err.status === 403) return {
 			capability: "source",
 			step,
 			status: "skip",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theholocron/cli",
-  "version": "2.0.0-alpha.45",
+  "version": "2.0.0-alpha.46",
   "description": "The Holocron CLI — a pluggable, capability-based orchestrator for spinning up and operating software projects.",
   "homepage": "https://github.com/theholocron/holocron/tree/main/packages/cli#readme",
   "bugs": "https://github.com/theholocron/holocron/issues",
@@ -34,7 +34,8 @@
   ],
   "dependencies": {
     "@napi-rs/keyring": "^1.3.0",
-    "@theholocron/http-client": "^0.1.0",
+    "@theholocron/github-client": "^0.3.2",
+    "@theholocron/http-client": "^0.3.2",
     "tsx": "^4.22.4",
     "yargs": "^18.0.0"
   },