@builder.io/buildercode 0.3.6 → 0.3.9

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.9";
 //#endregion
 //#region ../dev-tools/core/detect-frameworks.ts
 async function detectFrameworks$1(sys) {
@@ -290208,7 +290208,7 @@ function wc$1({ parent: e }) {
 		default: return !1;
 	}
 }
-function _c$17({ parent: e, grandparent: t }) {
+function _c$18({ parent: e, grandparent: t }) {
 	return t?.type === "JSXAttribute" && e.type === "JSXExpressionContainer" && t.name.type === "JSXIdentifier" && t.name.name === "css";
 }
 async function co(e, t, r) {
@@ -295224,7 +295224,7 @@ var init_estree = __esmMin((() => {
 		(e, t) => e.type === "CallExpression" && e.callee.type === "Identifier" && e.callee.name === "Component" && t === "arguments",
 		(e, t) => e.type === "Decorator" && t === "expression"
 	];
-	po$1 = (e) => Oc$1(e) || wc$1(e) || _c$17(e) || oo$2(e);
+	po$1 = (e) => Oc$1(e) || wc$1(e) || _c$18(e) || oo$2(e);
 	Es$6 = 0;
 	fo = mo.bind(void 0, "html"), yo = mo.bind(void 0, "angular");
 	jc = [
@@ -399401,7 +399401,7 @@ function xc(t, e, s = {}) {
 	let r = It(t, s.backwards ? e - 1 : e, s);
 	return r !== Gt(t, r, s);
 }
-function _c$16(t, e) {
+function _c$17(t, e) {
 	if (e === !1) return !1;
 	if (t.charAt(e) === "/" && t.charAt(e + 1) === "*") {
 		for (let s = e + 2; s < t.length; ++s) if (t.charAt(s) === "*" && t.charAt(s + 1) === "/") return s + 2;
@@ -405226,7 +405226,7 @@ https://evilmartians.com/chronicles/postcss-8-plugin-migration`));
 ` || t === "\r" || t === "\u2028" || t === "\u2029";
 	Gt = vc;
 	Yt = xc;
-	xi$1 = _c$16;
+	xi$1 = _c$17;
 	_i = bc;
 	Vt$1 = Ec;
 	De = Oc;
@@ -518362,6 +518362,7 @@ var CodeGenSession = class CodeGenSession {
 		this.#privacyMode = options.privacyMode ?? options.fusionConfig?.privacyMode;
 		this.#devServerOrchestrator = options.devServerOrchestrator;
 		this.#git = options.git ?? false;
+		this.#softContextWindow = options.softContextWindow;
 		if (this.#git) process.env.GIT_CEILING_DIRECTORIES = this.#workingDirectory;
 		this.#gitAutoInit = options.gitAutoInit ?? false;
 		this.#fusionConfig = options.fusionConfig;
@@ -518472,6 +518473,10 @@ var CodeGenSession = class CodeGenSession {
 					branchName: this.#branchName,
 					hasPlanToApply: this.#hasPlanToApply,
 					sessionMode: this.getSessionMode()
+				},
+				extraAttributes: {
+					projectId: this.#projectId,
+					branchName: this.#branchName
 				}
 			});
 		});
@@ -518765,6 +518770,7 @@ var CodeGenSession = class CodeGenSession {
 					this.#position = resolved.options.position;
 					this.#queueMode = resolved.options.queueMode ?? "next-turn";
 					this.#asyncSubAgents = resolved.options.asyncSubAgents ?? false;
+					this.#softContextWindow = resolved.options.softContextWindow;
 					this.#builtInMCPServerConfig = {
 						...this.#builtInMCPServerConfig,
 						...resolved.options.builtInMCPServerConfig
@@ -519116,7 +519122,7 @@ Tips:
 			}
 		}
 	}
-	async #setRemoteUrl(config, cwd) {
+	async #setRemoteUrl(config, cwd, folderName) {
 		let currentOriginUrl;
 		try {
 			currentOriginUrl = (await this.git([
@@ -519152,7 +519158,11 @@ Tips:
 			"origin",
 			url
 		], cwd);
-		if ((provider === "github" || provider === "selfHostedGithub") && token) process.env["GH_TOKEN"] = token;
+		if ((provider === "github" || provider === "selfHostedGithub") && token) {
+			if (!folderName || folderName === this.gitEnabledFolders[0]?.name) process.env["GH_TOKEN"] = token;
+			const isMultiRepo = this.gitEnabledFolders.length > 1;
+			if (folderName && isMultiRepo) process.env[toGhTokenEnvKey(folderName)] = token;
+		}
 	}
 	async pushRepoV2(repoInfo) {
 		return await this.#addToPendingPromises(this.#pushChanges({
@@ -519214,7 +519224,7 @@ Tips:
 				const config = gitConfigs?.[repo.repoName];
 				if (config?.url) {
 					const resolvedPath = this.#sys.resolve(this.#workingDirectory, repo.path);
-					await this.#setRemoteUrl(config, resolvedPath);
+					await this.#setRemoteUrl(config, resolvedPath, repo.name);
 				}
 			}
 			return {
@@ -520772,13 +520782,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) });
 	}
@@ -521404,10 +521408,11 @@ Tips:
 		const agents = sessionContext.customAgents;
 		const agent = agentName ? agents.find((a) => a.name.toLowerCase() === agentName.toLowerCase()) : void 0;
 		const subagentType = agent?.name ?? "explorer";
-		const { mcpServers = false, model, mode = "quality-v4-agent", systemPrompt, subagent_type, includeMemories, needDevServer, needValidation, queueMode, asyncSubAgents, resetAfterRun = false, reasoning } = {
+		const { mcpServers = false, model, mode = "quality-v4-agent", systemPrompt, subagent_type, includeMemories, needDevServer, needValidation, queueMode, asyncSubAgents, resetAfterRun = false, reasoning, softContextWindow } = {
 			mcpServers: agent?.mcpServers,
 			subagent_type: subagentType,
 			systemPrompt: agent?.systemPrompt,
+			softContextWindow: agent?.softContextWindow,
 			model: (() => {
 				if (agent?.roundRobinModels?.length) {
 					const key = agent.name;
@@ -521534,6 +521539,7 @@ Make the necessary changes and try again.`
 				credentials: this.#credentials,
 				position: agent?.position ?? `${basePosition}-${subagentType}`,
 				mode,
+				softContextWindow,
 				includeMemories,
 				modelOverride: agent?.inheritSessionModel && (this.#lastModelOverride ?? this.#modelOverride) ? this.#lastModelOverride ?? this.#modelOverride : resolveModelShortcut(resolvedModel) ?? this.#lastModelOverride ?? this.#modelOverride,
 				sessionOrCompletionId: sessionId,
@@ -521577,7 +521583,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 +523379,7 @@ failed with code ${result.code}`,
 				projectId: this.#projectId,
 				branchName: this.#branchName,
 				repoHash: this.#repoHash,
+				repoBranch: this.#aiBranch,
 				pingEvents: true,
 				workingDirectory: this.#bashWorkingDirectory,
 				beforeCommit,
@@ -523390,7 +523400,8 @@ failed with code ${result.code}`,
 				redactUserMessages: this.#privacyMode?.redactUserMessages,
 				redactLLMMessages: this.#privacyMode?.redactLLMMessages,
 				modelOverride: userInput.modelOverride ?? this.#modelOverride,
-				reasoning: this.#reasoning
+				reasoning: this.#reasoning,
+				interruptActiveTask: userInput.userMessage?.queue === false || void 0
 			};
 			if (this.#debug) this.#logger.debug(`(generateCompletion-${currentId}): request partial body. ${JSON.stringify({
 				url: body.url,
@@ -527117,6 +527128,7 @@ async function executeShellCommand(toolContext, command, timeout, toolId, shellT
 			...devServerOrchestrator?.envVars
 		};
 		if (process.env.GH_TOKEN) env.GH_TOKEN = process.env.GH_TOKEN;
+		for (const key of Object.keys(process.env)) if (key.startsWith("GH_TOKEN_") && process.env[key]) env[key] = process.env[key];
 		const shouldLogin = !devServerOrchestrator?.hasSetupEnvVars;
 		const proc = safeSpawn(shell, command, {
 			stdio: [
@@ -527268,6 +527280,11 @@ function dispatchAgent(toolContext, { prompt, subagent_type, resume, origin_chan
 				resume,
 				attachmentUrls
 			});
+			if (toolContext.signal.aborted) return {
+				isError: true,
+				toolResult: `Agent task was aborted by the user, or by the system due to a new message being processesed.`,
+				title: "Agent Task Aborted"
+			};
 			if (!result.success) return {
 				isError: true,
 				toolResult: result.response,
@@ -528449,6 +528466,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}`
@@ -528891,6 +528909,13 @@ const getEnvironmentVariablesPrompt = (envs) => {
 	prompt += `</environment_variables>\n`;
 	return prompt;
 };
+/**
+* Converts a folder name to a per-repo GitHub token env var key.
+* e.g. "code" → "GH_TOKEN_CODE", "ai-services" → "GH_TOKEN_AI_SERVICES"
+*/
+function toGhTokenEnvKey(folderName) {
+	return `GH_TOKEN_${folderName.toUpperCase().replace(/[^A-Z0-9]/g, "_")}`;
+}
 function inferGitProvider(repoUrl) {
 	if (!repoUrl) return "unknown";
 	const url = repoUrl.toLowerCase();
@@ -528941,8 +528966,14 @@ function generateGitStatusReminder(gitStatus, gitEnabledFolders, context) {
 			break;
 	}
 	if (repoName) lines.push(`  - Repository: ${repoName}`);
-	if (provider !== "unknown") if ((provider === "github" || provider === "selfHostedGithub") && process.env["GH_TOKEN"]) lines.push(`  - Provider: GitHub ( gh cli is available using the Bash tool )`);
-	else lines.push(`  - Provider: ${provider}`);
+	if (provider !== "unknown") if ((provider === "github" || provider === "selfHostedGithub") && process.env["GH_TOKEN"]) {
+		lines.push(`  - Provider: GitHub ( gh cli is available using the Bash tool )`);
+		const repoTokenKeys = Object.keys(process.env).filter((k) => k.startsWith("GH_TOKEN_")).sort();
+		if (repoTokenKeys.length > 0) {
+			lines.push(`  - GitHub token env vars: GH_TOKEN (primary repo default), ${repoTokenKeys.join(", ")}`);
+			lines.push(`  - Use the repo-specific GH_TOKEN_<REPO> when targeting a specific linked repo; fall back to GH_TOKEN for the primary repo`);
+		}
+	} else lines.push(`  - Provider: ${provider}`);
 	lines.push(`  - Current branch: ${gitStatus.currentBranch}`);
 	lines.push(`  - Remote branch exists: ${gitStatus.remoteBranchExists ? "yes" : "no"}`);
 	if (gitStatus.currentCommit) lines.push(`  - Current commit: ${gitStatus.currentCommit.slice(0, 7)}`);
@@ -530388,7 +530419,9 @@ async function getFusionConfig(sys, args) {
 			"netlify *",
 			"node *",
 			"tsx *",
-			"builderio *"
+			"builderio *",
+			"builder *",
+			"open *"
 		]
 	};
 	if (args.configJson) try {
@@ -531982,24 +532015,61 @@ function getNextLineIndex(text, cursor) {
 	for (let i = 0; i <= lineIdx; i++) newIdx += lines[i].length + 1;
 	return newIdx + Math.min(col, targetLine.length);
 }
+const inputHistory = {
+	history: [],
+	historyIndex: -1,
+	historyDraft: "",
+	listeners: /* @__PURE__ */ new Set()
+};
+function notifyHistoryListeners() {
+	inputHistory.listeners.forEach((l) => l());
+}
+function useInputHistory() {
+	const $ = (0, import_compiler_runtime.c)(3);
+	const [, forceUpdate] = (0, import_react.useState)(0);
+	let t0;
+	if ($[0] !== forceUpdate) {
+		t0 = () => {
+			const listener = () => forceUpdate(_temp$7);
+			inputHistory.listeners.add(listener);
+			return () => {
+				inputHistory.listeners.delete(listener);
+			};
+		};
+		$[0] = forceUpdate;
+		$[1] = t0;
+	} else t0 = $[1];
+	let t1;
+	if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
+		t1 = [];
+		$[2] = t1;
+	} else t1 = $[2];
+	(0, import_react.useEffect)(t0, t1);
+	return inputHistory;
+}
+function _temp$7(n) {
+	return n + 1;
+}
 function useTextInput(options = {}) {
 	const { onSubmit, onChange, onScrollUp, onScrollDown, onTab, isActive = true, getIsMenuActive, submitDisabled = false, disableHistory = false } = options;
 	const [value, setValueState] = (0, import_react.useState)("");
 	const [cursorIndex, setCursorIndex] = (0, import_react.useState)(0);
 	const [pasteLength, setPasteLength] = (0, import_react.useState)(0);
-	const [history, setHistory] = (0, import_react.useState)([]);
-	const [historyIndex, setHistoryIndex] = (0, import_react.useState)(-1);
-	const [historyDraft, setHistoryDraft] = (0, import_react.useState)("");
+	useInputHistory();
+	const fnDeleteRef = (0, import_react.useRef)(false);
+	(0, import_react.useEffect)(() => {
+		const onData = (data) => {
+			if (data.includes("\x1B[3~")) fnDeleteRef.current = true;
+		};
+		process.stdin.on("data", onData);
+		return () => {
+			process.stdin.off("data", onData);
+		};
+	}, []);
 	const valueRef = (0, import_react.useRef)(value);
 	const cursorRef = (0, import_react.useRef)(cursorIndex);
-	const historyRef = (0, import_react.useRef)(history);
-	const historyIndexRef = (0, import_react.useRef)(historyIndex);
-	const historyDraftRef = (0, import_react.useRef)(historyDraft);
 	valueRef.current = value;
 	cursorRef.current = cursorIndex;
-	historyRef.current = history;
-	historyIndexRef.current = historyIndex;
-	historyDraftRef.current = historyDraft;
 	const applyValue = (0, import_react.useCallback)((val, cursor) => {
 		const nextCursor = cursor ?? val.length;
 		setValueState(val);
@@ -532013,8 +532083,9 @@ function useTextInput(options = {}) {
 		setValueState("");
 		setCursorIndex(0);
 		setPasteLength(0);
-		setHistoryIndex(-1);
-		setHistoryDraft("");
+		inputHistory.historyIndex = -1;
+		inputHistory.historyDraft = "";
+		notifyHistoryListeners();
 		onChange?.("");
 	}, [onChange]);
 	useInput((input, key) => {
@@ -532037,9 +532108,10 @@ function useTextInput(options = {}) {
 		if (isMenuActive && (key.upArrow || key.downArrow || key.return || key.escape)) return;
 		if (key.return && !key.ctrl && !key.shift && !key.meta && !isMenuActive) {
 			if (submitDisabled) return;
-			if (val_1.trim()) setHistory((h) => [...h, val_1]);
-			setHistoryIndex(-1);
-			setHistoryDraft("");
+			if (val_1.trim()) inputHistory.history = [...inputHistory.history, val_1];
+			inputHistory.historyIndex = -1;
+			inputHistory.historyDraft = "";
+			notifyHistoryListeners();
 			onSubmit?.(val_1);
 			setValueState("");
 			setCursorIndex(0);
@@ -532108,13 +532180,13 @@ function useTextInput(options = {}) {
 		if (key.upArrow) {
 			const isMultiLine = val_1.includes("\n");
 			if (!disableHistory && isOnFirstLine(val_1, cursor_0) && !isMultiLine) {
-				const h_0 = historyRef.current;
-				const hi = historyIndexRef.current;
+				const { history: h, historyIndex: hi } = inputHistory;
 				const nextIndex = hi + 1;
-				if (nextIndex < h_0.length) {
-					if (hi === -1) setHistoryDraft(val_1);
-					const historyValue = h_0[h_0.length - 1 - nextIndex];
-					setHistoryIndex(nextIndex);
+				if (nextIndex < h.length) {
+					if (hi === -1) inputHistory.historyDraft = val_1;
+					const historyValue = h[h.length - 1 - nextIndex];
+					inputHistory.historyIndex = nextIndex;
+					notifyHistoryListeners();
 					setValueState(historyValue);
 					setCursorIndex(historyValue.length);
 					onChange?.(historyValue);
@@ -532126,18 +532198,18 @@ function useTextInput(options = {}) {
 		if (key.downArrow) {
 			const isMultiLine_0 = val_1.includes("\n");
 			if (!disableHistory && isOnLastLine(val_1, cursor_0) && !isMultiLine_0) {
-				const h_1 = historyRef.current;
-				const hi_0 = historyIndexRef.current;
-				const hd = historyDraftRef.current;
+				const { history: h_0, historyIndex: hi_0, historyDraft: hd } = inputHistory;
 				if (hi_0 > 0) {
 					const nextIndex_0 = hi_0 - 1;
-					const historyValue_0 = h_1[h_1.length - 1 - nextIndex_0];
-					setHistoryIndex(nextIndex_0);
+					const historyValue_0 = h_0[h_0.length - 1 - nextIndex_0];
+					inputHistory.historyIndex = nextIndex_0;
+					notifyHistoryListeners();
 					setValueState(historyValue_0);
 					setCursorIndex(historyValue_0.length);
 					onChange?.(historyValue_0);
 				} else if (hi_0 === 0) {
-					setHistoryIndex(-1);
+					inputHistory.historyIndex = -1;
+					notifyHistoryListeners();
 					setValueState(hd);
 					setCursorIndex(hd.length);
 					onChange?.(hd);
@@ -532156,26 +532228,36 @@ function useTextInput(options = {}) {
 			setPasteLength(0);
 			return;
 		}
-		if (key.backspace || key.delete) {
-			if (cursor_0 > 0) {
-				const next_3 = val_1.slice(0, cursor_0 - 1) + val_1.slice(cursor_0);
-				setValueState(next_3);
+		if (key.delete || key.backspace) {
+			const isFnDelete = fnDeleteRef.current;
+			fnDeleteRef.current = false;
+			if (isFnDelete) {
+				if (cursor_0 < val_1.length) {
+					const next_3 = val_1.slice(0, cursor_0) + val_1.slice(cursor_0 + 1);
+					setValueState(next_3);
+					setPasteLength(0);
+					onChange?.(next_3);
+				}
+			} else if (cursor_0 > 0) {
+				const next_4 = val_1.slice(0, cursor_0 - 1) + val_1.slice(cursor_0);
+				setValueState(next_4);
 				setCursorIndex(cursor_0 - 1);
 				setPasteLength(0);
-				onChange?.(next_3);
+				onChange?.(next_4);
 			}
 			return;
 		}
 		if (input) {
-			if (historyIndexRef.current !== -1) {
-				setHistoryIndex(-1);
-				setHistoryDraft("");
+			if (inputHistory.historyIndex !== -1) {
+				inputHistory.historyIndex = -1;
+				inputHistory.historyDraft = "";
+				notifyHistoryListeners();
 			}
-			const next_4 = val_1.slice(0, cursor_0) + input + val_1.slice(cursor_0);
-			setValueState(next_4);
+			const next_5 = val_1.slice(0, cursor_0) + input + val_1.slice(cursor_0);
+			setValueState(next_5);
 			setCursorIndex(cursor_0 + input.length);
 			setPasteLength(input.length > 1 ? input.length : 0);
-			onChange?.(next_4);
+			onChange?.(next_5);
 		}
 	}, { isActive });
 	return {
@@ -532233,161 +532315,78 @@ function computeCursorPos(value, cursorIndex, tabSize) {
 		isNewline
 	};
 }
-const ControlledTextInput = (0, import_react.memo)(function ControlledTextInput(t0) {
-	const $ = (0, import_compiler_runtime.c)(44);
-	const { value, cursorIndex: t1, placeholder: t2, showCursor: t3, focus: t4, rows, maxRows: t5, tabSize: t6 } = t0;
-	const cursorIndex = t1 === void 0 ? 0 : t1;
-	const placeholder = t2 === void 0 ? "" : t2;
-	const showCursor = t3 === void 0 ? true : t3;
-	const focus = t4 === void 0 ? true : t4;
-	const maxRows = t5 === void 0 ? 10 : t5;
-	const tabSize = t6 === void 0 ? 4 : t6;
+const ControlledTextInput = (0, import_react.memo)(function ControlledTextInput({ value, cursorIndex = 0, placeholder = "", showCursor = true, focus = true, rows, maxRows = 10, tabSize = 4 }) {
 	const minRows = rows ?? 1;
-	let t7;
-	if ($[0] !== cursorIndex || $[1] !== tabSize || $[2] !== value) {
-		t7 = value ? computeCursorPos(value, cursorIndex, tabSize) : null;
-		$[0] = cursorIndex;
-		$[1] = tabSize;
-		$[2] = value;
-		$[3] = t7;
-	} else t7 = $[3];
-	const cursorInfo = t7;
-	let t8;
-	if ($[4] !== tabSize || $[5] !== value) {
-		t8 = value ? fmt(value, tabSize).split("\n") : [];
-		$[4] = tabSize;
-		$[5] = value;
-		$[6] = t8;
-	} else t8 = $[6];
-	const allLines = t8;
+	const cursorInfo = (0, import_react.useMemo)(() => value ? computeCursorPos(value, cursorIndex, tabSize) : null, [
+		value,
+		cursorIndex,
+		tabSize
+	]);
+	const allLines = (0, import_react.useMemo)(() => value ? fmt(value, tabSize).split("\n") : [], [value, tabSize]);
 	const lineCount = allLines.length;
 	const cursorLineIdx = cursorInfo?.lineIdx ?? 0;
 	const cursorColIdx = cursorInfo?.colIdx ?? 0;
 	const cursorDisplayChar = cursorInfo?.char ?? " ";
 	const charIsNewline = cursorInfo?.isNewline ?? false;
 	const visibleRows = value ? Math.max(minRows, Math.min(maxRows, lineCount)) : minRows;
-	const scrollStart = value ? Math.max(0, Math.min(lineCount - visibleRows, cursorLineIdx - visibleRows + 1)) : 0;
-	let t9;
-	if ($[7] !== allLines || $[8] !== scrollStart || $[9] !== value || $[10] !== visibleRows) {
-		t9 = value ? allLines.slice(scrollStart, scrollStart + visibleRows) : [];
-		$[7] = allLines;
-		$[8] = scrollStart;
-		$[9] = value;
-		$[10] = visibleRows;
-		$[11] = t9;
-	} else t9 = $[11];
-	const visibleLines = t9;
+	const scrollStartRef = (0, import_react.useRef)(0);
+	let scrollStart;
 	if (!value) {
-		let t10;
-		if ($[12] !== focus || $[13] !== showCursor) {
-			t10 = showCursor && focus && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-				inverse: true,
-				children: " "
-			});
-			$[12] = focus;
-			$[13] = showCursor;
-			$[14] = t10;
-		} else t10 = $[14];
-		let t11;
-		if ($[15] !== placeholder) {
-			t11 = placeholder ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-				dimColor: true,
-				children: placeholder
-			}) : null;
-			$[15] = placeholder;
-			$[16] = t11;
-		} else t11 = $[16];
-		let t12;
-		if ($[17] !== t10 || $[18] !== t11) {
-			t12 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [t10, t11] });
-			$[17] = t10;
-			$[18] = t11;
-			$[19] = t12;
-		} else t12 = $[19];
-		let t13;
-		if ($[20] !== minRows || $[21] !== t12) {
-			t13 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
-				height: minRows,
-				overflow: "hidden",
-				flexDirection: "column",
-				flexShrink: 0,
-				flexGrow: 0,
-				children: t12
-			});
-			$[20] = minRows;
-			$[21] = t12;
-			$[22] = t13;
-		} else t13 = $[22];
-		return t13;
-	}
-	if (!focus) {
-		let t10;
-		if ($[23] !== visibleLines) {
-			t10 = visibleLines.map(_temp$7);
-			$[23] = visibleLines;
-			$[24] = t10;
-		} else t10 = $[24];
-		let t11;
-		if ($[25] !== t10) {
-			t11 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
-				flexDirection: "column",
-				flexShrink: 0,
-				flexGrow: 0,
-				children: t10
-			});
-			$[25] = t10;
-			$[26] = t11;
-		} else t11 = $[26];
-		return t11;
-	}
-	let t10;
-	if ($[27] !== charIsNewline || $[28] !== cursorColIdx || $[29] !== cursorDisplayChar || $[30] !== cursorLineIdx || $[31] !== scrollStart || $[32] !== showCursor || $[33] !== visibleLines) {
-		let t11;
-		if ($[35] !== charIsNewline || $[36] !== cursorColIdx || $[37] !== cursorDisplayChar || $[38] !== cursorLineIdx || $[39] !== scrollStart || $[40] !== showCursor) {
-			t11 = (line_0, i_0) => {
-				const absLine = i_0 + scrollStart;
-				if (absLine !== cursorLineIdx) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: line_0 || " " }, absLine);
-				const beforeCursor = line_0.slice(0, cursorColIdx);
-				const afterCursor = charIsNewline ? "" : line_0.slice(cursorColIdx + cursorDisplayChar.length);
-				return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: beforeCursor }),
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-						inverse: showCursor,
-						children: cursorDisplayChar
-					}),
-					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: afterCursor })
-				] }, absLine);
-			};
-			$[35] = charIsNewline;
-			$[36] = cursorColIdx;
-			$[37] = cursorDisplayChar;
-			$[38] = cursorLineIdx;
-			$[39] = scrollStart;
-			$[40] = showCursor;
-			$[41] = t11;
-		} else t11 = $[41];
-		t10 = visibleLines.map(t11);
-		$[27] = charIsNewline;
-		$[28] = cursorColIdx;
-		$[29] = cursorDisplayChar;
-		$[30] = cursorLineIdx;
-		$[31] = scrollStart;
-		$[32] = showCursor;
-		$[33] = visibleLines;
-		$[34] = t10;
-	} else t10 = $[34];
-	let t11;
-	if ($[42] !== t10) {
-		t11 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
-			flexDirection: "column",
-			flexShrink: 0,
-			flexGrow: 0,
-			children: t10
-		});
-		$[42] = t10;
-		$[43] = t11;
-	} else t11 = $[43];
-	return t11;
+		scrollStart = 0;
+		scrollStartRef.current = 0;
+	} else {
+		let s = scrollStartRef.current;
+		if (cursorLineIdx < s) s = cursorLineIdx;
+		else if (cursorLineIdx >= s + visibleRows) s = cursorLineIdx - visibleRows + 1;
+		s = Math.max(0, Math.min(lineCount - visibleRows, s));
+		scrollStartRef.current = s;
+		scrollStart = s;
+	}
+	const visibleLines = (0, import_react.useMemo)(() => value ? allLines.slice(scrollStart, scrollStart + visibleRows) : [], [
+		value,
+		allLines,
+		scrollStart,
+		visibleRows
+	]);
+	if (!value) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+		height: minRows,
+		overflow: "hidden",
+		flexDirection: "column",
+		flexShrink: 0,
+		flexGrow: 0,
+		children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [showCursor && focus && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+			inverse: true,
+			children: " "
+		}), placeholder ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+			dimColor: true,
+			children: placeholder
+		}) : null] })
+	});
+	if (!focus) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+		flexDirection: "column",
+		flexShrink: 0,
+		flexGrow: 0,
+		children: visibleLines.map((line, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: line || " " }, i))
+	});
+	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+		flexDirection: "column",
+		flexShrink: 0,
+		flexGrow: 0,
+		children: visibleLines.map((line_0, i_0) => {
+			const absLine = i_0 + scrollStart;
+			if (absLine !== cursorLineIdx) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: line_0 || " " }, absLine);
+			const beforeCursor = line_0.slice(0, cursorColIdx);
+			const afterCursor = charIsNewline ? "" : line_0.slice(cursorColIdx + cursorDisplayChar.length);
+			return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: beforeCursor }),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+					inverse: showCursor,
+					children: cursorDisplayChar
+				}),
+				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: afterCursor })
+			] }, absLine);
+		})
+	});
 });
 /**
 * `TextInput` manages its own value state (via `useTextInput`) and delegates
@@ -532443,9 +532442,6 @@ function TextInput(t0) {
 	} else t2 = $[16];
 	return t2;
 }
-function _temp$7(line, i) {
-	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: line || " " }, i);
-}
 //#endregion
 //#region ../../node_modules/jsonrepair/lib/esm/utils/JSONRepairError.js
 var JSONRepairError = class extends Error {
@@ -533719,6 +533715,10 @@ function useCodeGenStateHandler() {
 				state.metadata = step;
 				break;
 			case "start":
+				if (step.name !== "thinking") {
+					const prevThinking = state.messages.findLast((m_0) => m_0.type === "thinking");
+					if (prevThinking) prevThinking.streaming = false;
+				}
 				if (step.name === "text") state.messages.push({
 					id: step.name,
 					type: "text",
@@ -533741,10 +533741,6 @@ function useCodeGenStateHandler() {
 					content: step.content ?? "",
 					streaming: true
 				});
-				else {
-					const prevThinking = state.messages.findLast((m_0) => m_0.type === "thinking");
-					if (prevThinking) prevThinking.streaming = false;
-				}
 				break;
 			case "delta": {
 				const stepName = step.name;
@@ -533826,7 +533822,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;
 			}
@@ -534166,7 +534169,7 @@ function SlashCommandMenu(t0) {
 				borderBottom: false,
 				borderTop: false,
 				paddingX: 2,
-				paddingTop: 1,
+				paddingY: 1,
 				backgroundColor: theme.background,
 				children: t7
 			});
@@ -534235,7 +534238,7 @@ function SlashCommandMenu(t0) {
 			borderTop: false,
 			borderBottom: false,
 			paddingX: 0,
-			paddingTop: 1,
+			paddingY: 1,
 			backgroundColor: theme.background,
 			children: t8
 		});
@@ -534530,7 +534533,7 @@ const InputPrompt = (0, import_react.memo)(({ onSubmit, onChange, onSlashCommand
 	]);
 	slashMenuActiveRef.current = slashMenuActive;
 	atMenuActiveRef.current = atMenuActive;
-	const planIsActive = hasPlan && !value;
+	const planIsActive = hasPlan && !value && state.state !== "generating";
 	(0, import_react.useEffect)(() => {
 		onSlashMenuActiveChange?.(slashMenuActive);
 		return () => {
@@ -536738,12 +536741,16 @@ const WelcomeScreen = (0, import_react.memo)((t0) => {
 	const { stdout } = useStdout();
 	const theme = useTheme();
 	const [cols, setCols] = (0, import_react.useState)(stdout?.columns ?? 80);
+	const [rows, setRows] = (0, import_react.useState)(stdout?.rows ?? 24);
 	let t2;
 	let t3;
 	if ($[0] !== stdout) {
 		t2 = () => {
 			if (!stdout) return;
-			const onResize = () => setCols(stdout.columns ?? 80);
+			const onResize = () => {
+				setCols(stdout.columns ?? 80);
+				setRows(stdout.rows ?? 24);
+			};
 			stdout.on("resize", onResize);
 			return () => {
 				stdout.off("resize", onResize);
@@ -536766,7 +536773,7 @@ const WelcomeScreen = (0, import_react.memo)((t0) => {
 	} else t4 = $[4];
 	const displayCwd = t4;
 	const inputWidth = Math.min(Math.max(cols, 20), 90);
-	const t5 = cols >= 70 ? LOGO : cols >= 28 ? LOGO_SMALL : "BUILDER";
+	const t5 = cols >= 70 && rows >= 20 ? LOGO : cols >= 28 && rows >= 14 ? LOGO_SMALL : "BUILDER";
 	let t6;
 	if ($[5] !== t5 || $[6] !== theme.background) {
 		t6 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
@@ -538131,7 +538138,7 @@ const FooterSection = (0, import_react.memo)(() => {
 			children: [
 				"•",
 				" Fusion ",
-				"0.3.6"
+				"0.3.9"
 			]
 		});
 		$[10] = t7;
@@ -599046,18 +599053,19 @@ function CompletedTextBlock(t0) {
 }
 const THINKING_MAX_CHARS = 400;
 function ThinkingBlock(t0) {
-	const $ = (0, import_compiler_runtime.c)(12);
+	const $ = (0, import_compiler_runtime.c)(13);
 	const { text, streaming: t1 } = t0;
 	const streaming = t1 === void 0 ? false : t1;
 	let t2;
-	if ($[0] !== text) {
-		t2 = text.length > THINKING_MAX_CHARS ? text.slice(0, THINKING_MAX_CHARS).trimEnd() + "…" : text.trim();
-		$[0] = text;
-		$[1] = t2;
-	} else t2 = $[1];
+	if ($[0] !== streaming || $[1] !== text) {
+		t2 = text.length > THINKING_MAX_CHARS ? streaming ? "…" + text.slice(-THINKING_MAX_CHARS).trimStart() : text.slice(0, THINKING_MAX_CHARS).trimEnd() + "…" : text.trim();
+		$[0] = streaming;
+		$[1] = text;
+		$[2] = t2;
+	} else t2 = $[2];
 	const preview = t2;
 	let t3;
-	if ($[2] !== streaming) {
+	if ($[3] !== streaming) {
 		t3 = streaming ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 			bold: true,
 			color: "cyan",
@@ -599066,29 +599074,29 @@ function ThinkingBlock(t0) {
 			dimColor: true,
 			children: "◆"
 		});
-		$[2] = streaming;
-		$[3] = t3;
-	} else t3 = $[3];
+		$[3] = streaming;
+		$[4] = t3;
+	} else t3 = $[4];
 	let t4;
-	if ($[4] === Symbol.for("react.memo_cache_sentinel")) {
+	if ($[5] === Symbol.for("react.memo_cache_sentinel")) {
 		t4 = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 			bold: true,
 			dimColor: true,
 			children: "Thinking"
 		});
-		$[4] = t4;
-	} else t4 = $[4];
+		$[5] = t4;
+	} else t4 = $[5];
 	let t5;
-	if ($[5] !== t3) {
+	if ($[6] !== t3) {
 		t5 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
 			gap: 1,
 			children: [t3, t4]
 		});
-		$[5] = t3;
-		$[6] = t5;
-	} else t5 = $[6];
+		$[6] = t3;
+		$[7] = t5;
+	} else t5 = $[7];
 	let t6;
-	if ($[7] !== preview) {
+	if ($[8] !== preview) {
 		t6 = preview.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
 			paddingLeft: 2,
 			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
@@ -599097,21 +599105,21 @@ function ThinkingBlock(t0) {
 				children: preview
 			})
 		});
-		$[7] = preview;
-		$[8] = t6;
-	} else t6 = $[8];
+		$[8] = preview;
+		$[9] = t6;
+	} else t6 = $[9];
 	let t7;
-	if ($[9] !== t5 || $[10] !== t6) {
+	if ($[10] !== t5 || $[11] !== t6) {
 		t7 = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
 			flexDirection: "column",
 			paddingX: 1,
 			marginY: 1,
 			children: [t5, t6]
 		});
-		$[9] = t5;
-		$[10] = t6;
-		$[11] = t7;
-	} else t7 = $[11];
+		$[10] = t5;
+		$[11] = t6;
+		$[12] = t7;
+	} else t7 = $[12];
 	return t7;
 }
 function formatDuration(ms) {
@@ -599605,6 +599613,8 @@ const CodeSession = (0, import_react.memo)(({ onExit, isTabActive = true }) => {
 								const idx = startIndex + i;
 								const msgProxy = proxy.messages[idx];
 								const msgId = msgProxy.id;
+								const isLastMessage = idx === messageCount - 1;
+								const isStreaming = state.state === "generating";
 								return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ErrorBoundary, {
 									fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
 										paddingX: 2,
@@ -599614,21 +599624,12 @@ const CodeSession = (0, import_react.memo)(({ onExit, isTabActive = true }) => {
 											children: "[failed to render message]"
 										})
 									}),
-									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MessageBlockView, { message: msgProxy }, `msg-${msgId}-${idx}`)
+									children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
+										minHeight: isLastMessage && isStreaming ? Math.floor(rows * .4) : void 0,
+										children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MessageBlockView, { message: msgProxy })
+									})
 								}, `err-${msgId}-${idx}`);
-							}),
-							state.state === "generating" && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
-								gap: 1,
-								marginTop: 2,
-								marginBottom: 1,
-								children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProgressBar, {}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
-									dimColor: true,
-									children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-										bold: true,
-										children: "esc"
-									}), " interrupt"]
-								})]
-							}, "generating-progress-bar")
+							})
 						]
 					})
 				})
@@ -599650,13 +599651,24 @@ const CodeSession = (0, import_react.memo)(({ onExit, isTabActive = true }) => {
 							children: state.lastError.message
 						})
 					}),
-					showInput && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ErrorBoundary, {
+					showInput && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(ErrorBoundary, {
 						fallback: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 							color: "red",
 							dimColor: true,
 							children: "Input unavailable · Ctrl+C to exit"
 						}),
-						children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(InputPrompt, {
+						children: [state.state === "generating" && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
+							gap: 1,
+							marginTop: 2,
+							marginBottom: 1,
+							children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProgressBar, {}), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
+								dimColor: true,
+								children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+									bold: true,
+									children: "esc"
+								}), " interrupt"]
+							})]
+						}, "generating-progress-bar"), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(InputPrompt, {
 							onSubmit: handlePromptSubmit,
 							onScrollUp: handleMouseScrollUp,
 							onScrollDown: handleMouseScrollDown,
@@ -599665,7 +599677,7 @@ const CodeSession = (0, import_react.memo)(({ onExit, isTabActive = true }) => {
 							onSlashMenuActiveChange: setSlashMenuActive,
 							onImplementPlan: handleImplementPlan,
 							isTabActive
-						})
+						})]
 					}),
 					/* @__PURE__ */ (0, import_jsx_runtime.jsx)(StatusBar, { ctrlCPending })
 				]
@@ -600772,7 +600784,7 @@ function initSentry() {
 	init({
 		dsn: "https://1c5033d697e0271ebe53773bff826de0@o117565.ingest.us.sentry.io/4511107776905216",
 		tracesSampleRate: 0,
-		release: "0.3.6",
+		release: "0.3.9",
 		environment: process.env.NODE_ENV ?? "development",
 		enabled: false,
 		registerEsmLoaderHooks: false,
@@ -600796,7 +600808,7 @@ function isStandaloneBinary() {
 	return !path$6.basename(process.execPath, ".exe").startsWith("node");
 }
 function getCurrentVersion() {
-	return "0.3.6";
+	return "0.3.9";
 }
 async function fetchLatestVersion() {
 	return new Promise((resolve, reject) => {
@@ -600886,16 +600898,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 +600950,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 +600979,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 +600993,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 +601010,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.9";
 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.9",
   "description": "Builder.io CLI - AI-powered code generation",
   "license": "MIT",
   "bin": {