@decohere/ci-tools 0.0.1-dev.4 → 0.0.1-dev.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decohere/ci-tools",
-  "version": "0.0.1-dev.4",
+  "version": "0.0.1-dev.41",
   "description": "CI utility scripts for badge generation, coverage reporting, pages artifact assembly, and GitHub API tooling",
   "keywords": [
     "typescript",

package/src/audit/summarize.mjs

@@ -21,7 +21,7 @@ try {
 		"- npm audit output could not be parsed.",
 		`- See uploaded \`${auditFilePath}\` artifact for raw output.`,
 	]);
-	process.exit(0);
+	process.exit(1);
 }
 
 const vulnerabilities = data.metadata?.vulnerabilities ?? {};

package/src/bench/bench.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * bench.mjs — run the forgev2 benchmark and compare against the last saved baseline.
+ * bench.mjs — run the forge benchmark and compare against the last saved baseline.
  *
  * Usage:
  *   node bench.mjs              — run and compare, do not save
@@ -34,7 +34,7 @@ const HISTORY_FILE = join(
 	"projects/ci-tools/dist/ci/bench/bench-history.json",
 );
 const VITEST_BIN = join(WORKSPACE_ROOT, "node_modules/.bin/vitest");
-const BENCH_FILE = "projects/foundry/e2e/build.benchmark.bench.ts";
+const BENCH_FILE = "projects/terminal/e2e/build.benchmark.bench.ts";
 const CONFIG = join(WORKSPACE_ROOT, "vitest.e2e.config.ts");
 const TRACE_LOG_DIR = join(WORKSPACE_ROOT, ".decohere", "logs");
 const MAX_RUNS = 10;

package/src/bench/trace.mjs

@@ -7,7 +7,7 @@ import { join } from "node:path";
 const WORKSPACE_ROOT = process.cwd();
 const VITEST_BIN = join(WORKSPACE_ROOT, "node_modules/.bin/vitest");
 const CONFIG = join(WORKSPACE_ROOT, "vitest.e2e.config.ts");
-const TRACE_SPEC = "projects/foundry/e2e/build.trace.e2e.spec.ts";
+const TRACE_SPEC = "projects/terminal/e2e/build.trace.e2e.spec.ts";
 const TRACE_LOG_DIR = join(WORKSPACE_ROOT, ".decohere", "logs");
 
 function truthy(value, defaultValue = false) {

package/src/coverage/badge.mjs

@@ -10,8 +10,8 @@ import path from "node:path";
 import { parseLcovByProject } from "../lib/lcov.mjs";
 import { createBadgeSvg, getColor } from "../lib/svg.mjs";
 
-const summaryPath = path.resolve(".forge/coverage/coverage-summary.json");
-const lcovPath = path.resolve(".forge/coverage/lcov.info");
+const summaryPath = path.resolve("dist/coverage/coverage-summary.json");
+const lcovPath = path.resolve("dist/coverage/lcov.info");
 const badgesDirectory = path.resolve("projects/ci-tools/dist/ci/badges");
 const globalBadgePath = path.join(badgesDirectory, "coverage.svg");
 const projectBadgesDirectory = path.join(badgesDirectory, "projects");

package/src/pages/restore-bench-history.mjs

@@ -3,9 +3,8 @@
 // Restore benchmark history from Pages, or initialize empty if not found
 
 import { execSync } from "node:child_process";
-import { existsSync, writeFileSync } from "node:fs";
+import { writeFileSync } from "node:fs";
 import { mkdir } from "node:fs/promises";
-import { dirname } from "node:path";
 
 const HISTORY_DIR = "projects/ci-tools/dist/ci/bench";
 const HISTORY_FILE = `${HISTORY_DIR}/bench-history.json`;

package/src/release/push-prerelease-commit.mjs

@@ -1,14 +1,23 @@
 #!/usr/bin/env node
 /**
- * Push prerelease version commit before publish
- * Validates working tree and pushes new prerelease commit to remote
+ * Publish prerelease version commit via PR
+ * Validates working tree, pushes prerelease commit to a release branch,
+ * and creates/updates a PR targeting the protected base branch.
  */
 
 import { execSync } from "node:child_process";
 
+function run(command) {
+	return execSync(command, { encoding: "utf8" }).trim();
+}
+
+function runInherit(command, env) {
+	execSync(command, { stdio: "inherit", env });
+}
+
 try {
 	// Check if working tree is dirty
-	const status = execSync("git status --porcelain", { encoding: "utf8" });
+	const status = run("git status --porcelain");
 	if (status.trim().length > 0) {
 		console.error(
 			"::error::Working tree is dirty after version/dependency sync; refusing to publish with uncommitted changes.",
@@ -17,25 +26,58 @@ try {
 		process.exit(1);
 	}
 
-	// Compare HEAD with origin
-	const head = execSync("git rev-parse HEAD", { encoding: "utf8" }).trim();
-	const branch =
-		process.env.GITHUB_REF_NAME ||
-		execSync("git rev-parse --abbrev-ref HEAD", {
-			encoding: "utf8",
-		}).trim();
+	// Compare HEAD with origin and create a PR branch targeting an explicit base branch.
+	const head = run("git rev-parse HEAD");
+	const sourceBranch = process.env.GITHUB_REF_NAME || run("git rev-parse --abbrev-ref HEAD");
+	const channel = process.env.RELEASE_CHANNEL ?? "beta";
+	const baseBranch = process.env.RELEASE_BASE_BRANCH || sourceBranch;
+	const releasePrBranch = `release/${channel}-${sourceBranch}-to-${baseBranch}`;
+	const token = process.env.GITHUB_TOKEN ?? process.env.GH_TOKEN;
 
 	try {
-		const origin = execSync(`git rev-parse origin/${branch}`, { encoding: "utf8" }).trim();
+		const origin = run(`git rev-parse origin/${sourceBranch}`);
 
 		if (head !== origin) {
-			console.log(`Pushing prerelease version commit to origin/${branch}`);
-			execSync(`git push origin HEAD:${branch}`, { stdio: "inherit" });
+			console.log(
+				`Publishing release commit via PR branch origin/${releasePrBranch} (base: origin/${baseBranch})`,
+			);
+			runInherit(`git push origin HEAD:${releasePrBranch} --force`, process.env);
+
+			if (token == null || token.length === 0) {
+				throw new Error("Missing GITHUB_TOKEN/GH_TOKEN for PR upsert");
+			}
+
+			const version = process.env.RELEASE_VERSION ?? "(unknown)";
+			const ownerRepo = run("git config --get remote.origin.url")
+				.replace(/^.*github\.com[:/]/, "")
+				.replace(/\.git$/, "");
+
+			runInherit(
+				[
+					"node projects/ci-tools/src/github/create-or-update-pr.mjs",
+					`--title "chore(release): ${channel} ${version}"`,
+					`--base "${baseBranch}"`,
+					`--head "${releasePrBranch}"`,
+					`--body "Automated ${channel} version bump and dependency sync.\\n\\n- Channel: ${channel}\\n- Version: ${version}\\n- Source branch: ${sourceBranch}\\n- Base branch: ${baseBranch}\\n- Source commit: ${head}\\n\\nGenerated by pull-request workflow."`,
+					`--owner "${ownerRepo.split("/")[0]}"`,
+					`--repo "${ownerRepo.split("/")[1]}"`,
+				].join(" "),
+				{ ...process.env, GITHUB_TOKEN: token },
+			);
 		} else {
 			console.log("No prerelease version commit to push.");
 		}
-	} catch {
-		console.log(`Remote branch origin/${branch} not found, skipping push.`);
+	} catch (err) {
+		const message = err?.message ?? "";
+		if (
+			message.includes(`origin/${sourceBranch}`) &&
+			message.includes("Needed a single revision")
+		) {
+			console.log(`Remote branch origin/${sourceBranch} not found, skipping push.`);
+		} else {
+			console.error("::error::Failed to publish release commit via PR branch.");
+			throw err;
+		}
 	}
 } catch (e) {
 	console.error(`Push failed: ${e.message}`);

package/src/release/sync-dependencies.mjs

@@ -10,7 +10,7 @@ const DRY_RUN = process.env.DRY_RUN === "true";
 const TERMINAL_CLI = process.env.TERMINAL_CLI || "dist/debug/projects/terminal/src/cli.js";
 const DECOHERE_CONFIG = process.env.DECOHERE_CONFIG || ".decohere.js";
 
-const baseCmd = `node "${TERMINAL_CLI}" --log-level trace --config-file "${DECOHERE_CONFIG}" foundry dependencies --configuration release sync`;
+const baseCmd = `node "${TERMINAL_CLI}" --log-level info --config-file "${DECOHERE_CONFIG}" forge dependencies --configuration release sync`;
 
 try {
 	if (DRY_RUN) {

package/tests/lib/lcov.test.mjs

@@ -5,11 +5,11 @@ import {
 	parseLcovFiles,
 } from "../../src/lib/lcov.mjs";
 
-const sampleLcov = `SF:projects/foundry/src/index.ts
+const sampleLcov = `SF:projects/forge/src/index.ts
 LF:10
 LH:9
 end_of_record
-SF:projects/foundry/src/build/index.ts
+SF:projects/forge/src/build/index.ts
 LF:20
 LH:15
 end_of_record
@@ -32,7 +32,7 @@ end_of_record
 
 describe("getProjectFromPath", () => {
 	it("extracts project name from projects/ path", () => {
-		expect(getProjectFromPath("projects/foundry/src/index.ts")).toBe("foundry");
+		expect(getProjectFromPath("projects/forge/src/index.ts")).toBe("forge");
 	});
 
 	it("returns undefined for unrecognized paths", () => {
@@ -43,16 +43,16 @@ describe("getProjectFromPath", () => {
 describe("parseLcovByProject", () => {
 	it("groups files by project and sums coverage", () => {
 		const result = parseLcovByProject(sampleLcov);
-		expect(result.get("foundry")).toBeDefined();
-		expect(result.get("foundry").totalLines).toBe(30);
-		expect(result.get("foundry").coveredLines).toBe(24);
+		expect(result.get("forge")).toBeDefined();
+		expect(result.get("forge").totalLines).toBe(30);
+		expect(result.get("forge").coveredLines).toBe(24);
 		expect(result.get("nexus")).toBeDefined();
 		expect(result.get("nexus").totalLines).toBe(5);
 		expect(result.get("nexus").coveredLines).toBe(5);
 	});
 
 	it("ignores records with LF:0", () => {
-		const lcov = `SF:projects/foundry/src/empty.ts\nLF:0\nLH:0\nend_of_record\n`;
+		const lcov = `SF:projects/forge/src/empty.ts\nLF:0\nLH:0\nend_of_record\n`;
 		const result = parseLcovByProject(lcov);
 		expect(result.size).toBe(0);
 	});