@builder.io/buildercode 0.3.6 → 0.3.8

package/dist/cli.mjs

@@ -244266,7 +244266,7 @@ const LIB_CACHE = /* @__PURE__ */ new Map();
 const PENDING_LIB_CACHE = /* @__PURE__ */ new Map();
 const NODE_MODULE_CACHE = /* @__PURE__ */ new Map();
 const TSCONFIG_CACHE = /* @__PURE__ */ new Map();
-const pkgVersion = process.env.OVERRIDE_VERSION ?? "0.3.6";
+const pkgVersion = process.env.OVERRIDE_VERSION ?? "0.3.8";
 //#endregion
 //#region ../dev-tools/core/detect-frameworks.ts
 async function detectFrameworks$1(sys) {
@@ -520772,13 +520772,7 @@ Tips:
 			...this.#lastAICommits,
 			...allCommits
 		};
-		if (!(await this.#emitGitStatus())?.currentCommit) {
-			this.#sys.Sentry?.captureException(/* @__PURE__ */ new Error(`Failed to get current commit hash after revert`), { tags: {
-				operation: "codegen-git",
-				endpoint: "revertToCommitHash"
-			} });
-			return;
-		}
+		await this.#emitGitStatus();
 		this.requestRefresh();
 		await this.#completionFinalize({ lastCommit: serializeGitSnapshot(allCommits) });
 	}
@@ -521577,7 +521571,10 @@ Make the necessary changes and try again.`
 			checkpointCommitHash = (await this.#emitGitStatus())?.currentCommit;
 		}
 		const subagent_type = agentConfig.subagent_type;
-		const agentSession = new CodeGenSession(agentConfig.options);
+		const agentSession = new CodeGenSession({
+			...agentConfig.options,
+			git: false
+		});
 		const subAgentId = options.sessionId ?? options.resume ?? sessionId;
 		const agentPromise = Promise.withResolvers();
 		this.#runningSubAgents.set(subAgentId, {
@@ -523370,6 +523367,7 @@ failed with code ${result.code}`,
 				projectId: this.#projectId,
 				branchName: this.#branchName,
 				repoHash: this.#repoHash,
+				repoBranch: this.#aiBranch,
 				pingEvents: true,
 				workingDirectory: this.#bashWorkingDirectory,
 				beforeCommit,
@@ -528449,6 +528447,7 @@ async function* completionStream(sys, credentials, body, signal, debug) {
 		const res = await safeFetch(url, {
 			method: "POST",
 			body: json,
+			keepalive: true,
 			headers: {
 				"Content-Type": "application/json",
 				Authorization: `Bearer ${credentials.builderPrivateKey}`
@@ -530388,7 +530387,9 @@ async function getFusionConfig(sys, args) {
 			"netlify *",
 			"node *",
 			"tsx *",
-			"builderio *"
+			"builderio *",
+			"builder *",
+			"open *"
 		]
 	};
 	if (args.configJson) try {
@@ -533826,7 +533827,14 @@ function useCodeGenStateHandler() {
 				state.activeUserQuestions = void 0;
 				const doneThinking = state.messages.findLast((m) => m.type === "thinking");
 				if (doneThinking) doneThinking.streaming = false;
-				if (step.applyResults?.length) turnApplyResults.push(...step.applyResults);
+				if (step.applyResults?.length) for (const result of step.applyResults) {
+					const existing = turnApplyResults.find((r) => r.filePath === result.filePath);
+					if (existing) {
+						existing.addedLines += result.addedLines;
+						existing.removedLines += result.removedLines;
+						existing.action = result.action;
+					} else turnApplyResults.push({ ...result });
+				}
 				turnCreditsUsed += step.creditsUsed ?? 0;
 				break;
 			}
@@ -538131,7 +538139,7 @@ const FooterSection = (0, import_react.memo)(() => {
 			children: [
 				"•",
 				" Fusion ",
-				"0.3.6"
+				"0.3.8"
 			]
 		});
 		$[10] = t7;
@@ -600772,7 +600780,7 @@ function initSentry() {
 	init({
 		dsn: "https://1c5033d697e0271ebe53773bff826de0@o117565.ingest.us.sentry.io/4511107776905216",
 		tracesSampleRate: 0,
-		release: "0.3.6",
+		release: "0.3.8",
 		environment: process.env.NODE_ENV ?? "development",
 		enabled: false,
 		registerEsmLoaderHooks: false,
@@ -600796,7 +600804,7 @@ function isStandaloneBinary() {
 	return !path$6.basename(process.execPath, ".exe").startsWith("node");
 }
 function getCurrentVersion() {
-	return "0.3.6";
+	return "0.3.8";
 }
 async function fetchLatestVersion() {
 	return new Promise((resolve, reject) => {
@@ -600886,16 +600894,39 @@ async function selfUpdate(onProgress) {
 	const tarballUrl = `https://registry.npmjs.org/@builder.io/${pkgName}/-/${pkgName}-${latestVersion}.tgz`;
 	const tmpDir = createTempDir(path$6.dirname(process.execPath));
 	const tarballPath = path$6.join(tmpDir, "builder.tgz");
+	let activeRequest = null;
+	let activeChild = null;
+	const onSigint = () => {
+		activeRequest?.destroy();
+		activeChild?.kill();
+		try {
+			fs$20.rmSync(tmpDir, {
+				recursive: true,
+				force: true
+			});
+		} catch {}
+		onProgress("\nUpdate cancelled.");
+		process.exit(130);
+	};
+	process.on("SIGINT", onSigint);
 	try {
-		await downloadFile(tarballUrl, tarballPath);
+		await downloadFile(tarballUrl, tarballPath, (req) => {
+			activeRequest = req;
+		});
+		activeRequest = null;
 		onProgress("Installing...");
 		await new Promise((resolve, reject) => {
-			spawn("tar", [
+			const tar = spawn("tar", [
 				"-xzf",
 				tarballPath,
 				"-C",
 				tmpDir
-			], { stdio: "inherit" }).on("close", (code) => code === 0 ? resolve() : reject(/* @__PURE__ */ new Error(`tar exited with ${code}`)));
+			], { stdio: "inherit" });
+			activeChild = tar;
+			tar.on("close", (code) => {
+				activeChild = null;
+				code === 0 ? resolve() : reject(/* @__PURE__ */ new Error(`tar exited with ${code}`));
+			});
 		});
 		const binaryName = process.platform === "win32" ? "builder.exe" : "builder";
 		const extractedBinary = path$6.join(tmpDir, "package", binaryName);
@@ -600915,6 +600946,7 @@ async function selfUpdate(onProgress) {
 		});
 		onProgress(`Updated to ${latestVersion}. Restart builder to apply.`);
 	} finally {
+		process.off("SIGINT", onSigint);
 		fs$20.rmSync(tmpDir, {
 			recursive: true,
 			force: true
@@ -600943,11 +600975,11 @@ function atomicReplace(source, dest) {
 		} else throw err;
 	}
 }
-async function downloadFile(url, dest) {
+async function downloadFile(url, dest, onRequest) {
 	return new Promise((resolve, reject) => {
 		const file = fs$20.createWriteStream(dest);
 		const request = (targetUrl) => {
-			https$4.get(targetUrl, (res) => {
+			const req = https$4.get(targetUrl, (res) => {
 				if (res.statusCode === 301 || res.statusCode === 302) {
 					const location = res.headers.location;
 					if (!location) {
@@ -600957,10 +600989,11 @@ async function downloadFile(url, dest) {
 					res.resume();
 					file.close();
 					const newFile = fs$20.createWriteStream(dest);
-					https$4.get(location, (r) => {
+					const redirectReq = https$4.get(location, (r) => {
 						r.pipe(newFile);
 						newFile.on("finish", () => newFile.close(() => resolve()));
 					}).on("error", reject);
+					onRequest?.(redirectReq);
 					return;
 				}
 				if (res.statusCode !== 200) {
@@ -600973,13 +601006,14 @@ async function downloadFile(url, dest) {
 				fs$20.unlink(dest, () => {});
 				reject(err);
 			});
+			onRequest?.(req);
 		};
 		request(url);
 	});
 }
 //#endregion
 //#region src/cli.tsx
-const VERSION = "0.3.6";
+const VERSION = "0.3.8";
 async function startInk(command, options) {
 	await render(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
 		command,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/buildercode",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "description": "Builder.io CLI - AI-powered code generation",
   "license": "MIT",
   "bin": {