@lasso-ai/cli 1.3.1 → 1.3.2

package/dist/cli/bridge.js

@@ -147,6 +147,164 @@ function proposalMatchesCurrentSource(cwd, changes) {
         return false;
     }
 }
+async function triggerBuildFix(cwd, taskId, buildErrors, buildCommand, originalChanges, resolvedLassoKey, agentConfig, collabConfig, socket, taskControllers, taskSnapshots, buildErrorContext) {
+    const MAX_RETRIES = 3;
+    const context = buildErrorContext.get(taskId);
+    if (!context)
+        return;
+    context.retryCount += 1;
+    if (context.retryCount > MAX_RETRIES) {
+        // Max retries reached - revert changes and show error
+        for (const snapshot of taskSnapshots.get(taskId) || []) {
+            if (snapshot.content === null) {
+                if (node_fs_1.default.existsSync(snapshot.filePath))
+                    node_fs_1.default.unlinkSync(snapshot.filePath);
+            }
+            else {
+                node_fs_1.default.writeFileSync(snapshot.filePath, snapshot.content);
+            }
+        }
+        taskSnapshots.delete(taskId);
+        buildErrorContext.delete(taskId);
+        socket.send(JSON.stringify({
+            type: "agent_status",
+            taskId,
+            status: "error",
+            message: `⚠️ Build validation failed after ${MAX_RETRIES} attempts. The change was reverted. Errors:\n${buildErrors.slice(0, 5).join("\n")}${buildErrors.length > 5 ? `\n... and ${buildErrors.length - 5} more errors` : ""}`
+        }));
+        return;
+    }
+    // Re-apply the original changes
+    try {
+        const planned = new Map();
+        for (const change of originalChanges) {
+            const isNew = !change.oldString;
+            const filePath = resolveProposedFile(cwd, change.filePath, true);
+            const exists = node_fs_1.default.existsSync(filePath);
+            const content = exists ? node_fs_1.default.readFileSync(filePath, "utf8") : "";
+            const prepared = (!exists || isNew)
+                ? { start: 0, end: content.length, oldString: content, newString: change.newString }
+                : prepareChange(content, change);
+            const fileChanges = planned.get(filePath) || [];
+            if (fileChanges.some((item) => prepared.start < item.end && item.start < prepared.end)) {
+                throw new Error(`Could not safely apply ${change.filePath}. Proposed changes overlap.`);
+            }
+            fileChanges.push({ filePath, content, exists, ...prepared });
+            planned.set(filePath, fileChanges);
+        }
+        for (const [filePath, changes] of planned) {
+            const exists = changes[0].exists;
+            const content = changes[0].content;
+            const nextContent = exists
+                ? [...changes]
+                    .sort((a, b) => b.start - a.start)
+                    .reduce((value, change) => value.slice(0, change.start) + change.newString + value.slice(change.end), content)
+                : changes[0].newString;
+            node_fs_1.default.mkdirSync(node_path_1.default.dirname(filePath), { recursive: true });
+            node_fs_1.default.writeFileSync(filePath, nextContent);
+        }
+    }
+    catch (applyError) {
+        socket.send(JSON.stringify({
+            type: "agent_status",
+            taskId,
+            status: "error",
+            message: `Failed to re-apply original changes: ${applyError instanceof Error ? applyError.message : "Unknown error"}`
+        }));
+        return;
+    }
+    // Run agent to fix build errors
+    const { runOneShotAgent } = await import("./oneshot.js");
+    const fixPrompt = `The previous change caused build errors. Please fix them. Build command: ${buildCommand}\n\nBuild errors:\n${buildErrors.slice(0, 10).join("\n")}${buildErrors.length > 10 ? `\n... and ${buildErrors.length - 10} more errors` : ""}\n\nFix these errors by making minimal changes to the files. Attempt ${context.retryCount} of ${MAX_RETRIES}.`;
+    const controller = new AbortController();
+    taskControllers.set(taskId, controller);
+    socket.send(JSON.stringify({ type: "agent_status", taskId, status: "thinking", message: `Fixing build errors (attempt ${context.retryCount}/${MAX_RETRIES})...` }));
+    try {
+        const result = await runOneShotAgent(cwd, fixPrompt, "project", { provider: "google", model: "gemini-2.5-flash", lassoKey: resolvedLassoKey, serverUrl: "https://api.lasso.byorello.space" }, controller.signal, (status, message, detail) => {
+            if (!controller.signal.aborted && socket.readyState === socket.OPEN) {
+                socket.send(JSON.stringify({ type: "agent_status", taskId, status, message, detail }));
+            }
+        }, (prompt) => {
+            if (!controller.signal.aborted && socket.readyState === socket.OPEN) {
+                socket.send(JSON.stringify({ type: "agent_prompt", taskId, prompt }));
+            }
+        }, undefined, "https://api.lasso.byorello.space", resolvedLassoKey || agentConfig?.apiKey || collabConfig?.apiKey, taskId, undefined);
+        if (result.ok && result.changes && result.changes.length > 0) {
+            // Apply the fix
+            const snapshots = [];
+            const planned = new Map();
+            for (const change of result.changes) {
+                const isNew = !change.oldString;
+                const filePath = resolveProposedFile(cwd, change.filePath, true);
+                const exists = node_fs_1.default.existsSync(filePath);
+                const content = exists ? node_fs_1.default.readFileSync(filePath, "utf8") : "";
+                const prepared = (!exists || isNew)
+                    ? { start: 0, end: content.length, oldString: content, newString: change.newString }
+                    : prepareChange(content, change);
+                const fileChanges = planned.get(filePath) || [];
+                if (fileChanges.some((item) => prepared.start < item.end && item.start < prepared.end)) {
+                    throw new Error(`Could not safely apply ${change.filePath}. Proposed changes overlap.`);
+                }
+                fileChanges.push({ filePath, content, exists, ...prepared });
+                planned.set(filePath, fileChanges);
+            }
+            taskSnapshots.set(taskId, snapshots);
+            for (const [filePath, changes] of planned) {
+                const exists = changes[0].exists;
+                const content = changes[0].content;
+                snapshots.push({ filePath, content: exists ? content : null });
+                const nextContent = exists
+                    ? [...changes]
+                        .sort((a, b) => b.start - a.start)
+                        .reduce((value, change) => value.slice(0, change.start) + change.newString + value.slice(change.end), content)
+                    : changes[0].newString;
+                node_fs_1.default.mkdirSync(node_path_1.default.dirname(filePath), { recursive: true });
+                node_fs_1.default.writeFileSync(filePath, nextContent);
+            }
+            // Validate the fix
+            const validation = await validateBuild(cwd);
+            if (validation.passed) {
+                // Build fixed!
+                buildErrorContext.delete(taskId);
+                socket.send(JSON.stringify({
+                    type: "applied",
+                    taskId,
+                    message: `Build errors fixed after ${context.retryCount} attempt${context.retryCount > 1 ? "s" : ""}. ${result.changes.length} file${result.changes.length === 1 ? "" : "s"} updated.`,
+                    validation
+                }));
+            }
+            else {
+                // Still failing - trigger another retry
+                socket.send(JSON.stringify({
+                    type: "agent_status",
+                    taskId,
+                    status: "working",
+                    message: `⚠️ Build still failing. Retrying...`,
+                    detail: `Build command: ${validation.command}\nErrors:\n${validation.errors.slice(0, 5).join("\n")}${validation.errors.length > 5 ? `\n... and ${validation.errors.length - 5} more errors` : ""}`
+                }));
+                // Update context with new errors
+                buildErrorContext.set(taskId, {
+                    errors: validation.errors,
+                    command: validation.command,
+                    originalChanges: originalChanges,
+                    retryCount: context.retryCount
+                });
+                await triggerBuildFix(cwd, taskId, validation.errors, validation.command, originalChanges, resolvedLassoKey, agentConfig, collabConfig, socket, taskControllers, taskSnapshots, buildErrorContext);
+            }
+        }
+        else {
+            // Agent failed to produce a fix
+            socket.send(JSON.stringify({ type: "agent_status", taskId, status: "error", message: result.error || "Failed to fix build errors" }));
+        }
+    }
+    catch (error) {
+        socket.send(JSON.stringify({ type: "agent_status", taskId, status: "error", message: error instanceof Error ? error.message : "Build fix encountered an error" }));
+    }
+    finally {
+        if (taskControllers.get(taskId) === controller)
+            taskControllers.delete(taskId);
+    }
+}
 async function validateBuild(cwd) {
     const pkgPath = node_path_1.default.join(cwd, "package.json");
     if (!node_fs_1.default.existsSync(pkgPath)) {
@@ -257,6 +415,7 @@ async function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort
     const editRequests = new Map();
     const editConfigs = new Map();
     const reviewRefreshAttempts = new Map();
+    const buildErrorContext = new Map();
     const envRoots = [cwd, node_path_1.default.join(cwd, "web"), node_path_1.default.join(cwd, "server")];
     const fileEnv = envRoots.reduce((values, root) => ({
         ...values,
@@ -996,6 +1155,27 @@ async function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort
                     }
                     // Run build validation after applying changes
                     const validation = await validateBuild(cwd);
+                    if (!validation.passed) {
+                        // Build failed - automatically trigger retry with build error context
+                        const errorContext = validation.errors.slice(0, 10).join("\n");
+                        socket.send(JSON.stringify({
+                            type: "agent_status",
+                            taskId: msg.taskId,
+                            status: "working",
+                            message: `⚠️ Build validation failed. Attempting to fix build errors automatically...`,
+                            detail: `Build command: ${validation.command}\nErrors:\n${errorContext}${validation.errors.length > 10 ? `\n... and ${validation.errors.length - 10} more errors` : ""}`
+                        }));
+                        // Store context for retry
+                        buildErrorContext.set(msg.taskId, {
+                            errors: validation.errors,
+                            command: validation.command,
+                            originalChanges: msg.changes,
+                            retryCount: 0
+                        });
+                        // Trigger automatic build fix
+                        await triggerBuildFix(cwd, msg.taskId, validation.errors, validation.command, msg.changes, resolvedLassoKey, agentConfig, collabConfig, socket, taskControllers, taskSnapshots, buildErrorContext);
+                        return;
+                    }
                     socket.send(JSON.stringify({
                         type: "applied",
                         taskId: msg.taskId,

package/dist/overlay.js

@@ -21640,7 +21640,7 @@
 ${errors.slice(0, 5).join("\n")}${errors.length > 5 ? `
 ...and ${errors.length - 5} more errors` : ""}
 
-You may need to manually fix these errors or undo the change.`;
+The agent is automatically attempting to fix the build errors...`;
               } else if (passed) {
                 result = `${message.message}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lasso-ai/cli",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Select any part of your running app, describe a change, and let AI edit the real source code.",
   "type": "commonjs",
   "main": "dist/cli/index.js",