@lasso-ai/cli 1.3.0 → 1.3.2

package/dist/cli/agent.js

@@ -14,13 +14,57 @@ exports.runLocalAgentPrompt = runLocalAgentPrompt;
 exports.proposeChanges = proposeChanges;
 exports.answerQuestion = answerQuestion;
 exports.generateCommitMessage = generateCommitMessage;
-const promises_1 = __importDefault(require("node:fs/promises"));
+const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_child_process_1 = require("node:child_process");
 const node_util_1 = require("node:util");
 const auth_1 = require("./auth");
 const execFileAsync = (0, node_util_1.promisify)(node_child_process_1.execFile);
 const execAsync = (0, node_util_1.promisify)(node_child_process_1.exec);
+function detectProjectStructure(cwd) {
+    const pkgPath = node_path_1.default.join(cwd, "package.json");
+    let framework = "unknown";
+    const directories = [];
+    const appDirs = [];
+    if (node_fs_1.default.existsSync(pkgPath)) {
+        try {
+            const pkg = JSON.parse(node_fs_1.default.readFileSync(pkgPath, "utf8"));
+            const deps = { ...pkg.dependencies, ...pkg.devDependencies };
+            if (deps.next)
+                framework = "Next.js";
+            else if (deps.vite)
+                framework = "Vite";
+            else if (deps.react)
+                framework = "React";
+        }
+        catch {
+            // Ignore errors
+        }
+    }
+    // Scan for important directories
+    const scanDirs = ["src", "app", "pages", "web", "lib", "components"];
+    for (const dir of scanDirs) {
+        if (node_fs_1.default.existsSync(node_path_1.default.join(cwd, dir))) {
+            directories.push(dir);
+            if (dir === "app")
+                appDirs.push(dir);
+            // Check for src/app structure
+            if (dir === "src" && node_fs_1.default.existsSync(node_path_1.default.join(cwd, "src", "app"))) {
+                directories.push("src/app");
+                appDirs.push("src/app");
+            }
+        }
+    }
+    // Determine source root
+    let sourceRoot = ".";
+    if (directories.includes("src/app"))
+        sourceRoot = "src";
+    else if (directories.includes("app"))
+        sourceRoot = ".";
+    else if (directories.includes("src"))
+        sourceRoot = "src";
+    return { framework, sourceRoot, directories, multipleAppDirs: appDirs };
+}
 async function installPackages(cwd, packages, onProgress) {
     const validPkgs = [...new Set(packages
             .map((p) => p.trim().replace(/^['"`]|['"`]$/g, ""))
@@ -31,7 +75,7 @@ async function installPackages(cwd, packages, onProgress) {
     let existingDeps = {};
     try {
         const pkgJsonPath = node_path_1.default.join(cwd, "package.json");
-        const raw = await promises_1.default.readFile(pkgJsonPath, "utf8");
+        const raw = node_fs_1.default.readFileSync(pkgJsonPath, "utf8");
         const parsed = JSON.parse(raw);
         existingDeps = { ...(parsed.dependencies || {}), ...(parsed.devDependencies || {}) };
     }
@@ -42,7 +86,7 @@ async function installPackages(cwd, packages, onProgress) {
     // Detect package manager
     let cmd = "npm install";
     try {
-        const rootFiles = await promises_1.default.readdir(cwd);
+        const rootFiles = node_fs_1.default.readdirSync(cwd);
         if (rootFiles.includes("bun.lockb") || rootFiles.includes("bun.lock"))
             cmd = "bun add";
         else if (rootFiles.includes("pnpm-lock.yaml"))
@@ -165,7 +209,7 @@ const ignored = new Set(["node_modules", ".git", ".next", "dist", "build", ".tur
 const sourceExtensions = /\.(tsx?|jsx?|vue|svelte|css|scss|html)$/i;
 const layoutFiles = /^(layout|_layout|_app|app|_document|document|template|_template)\.(tsx?|jsx?)$/i;
 const sourceFileCache = new Map();
-async function sourceFiles(directory, budget = { remaining: 25 }) {
+function sourceFiles(directory, budget = { remaining: 25 }) {
     if (budget.remaining <= 0)
         return [];
     const cached = sourceFileCache.get(directory);
@@ -174,7 +218,7 @@ async function sourceFiles(directory, budget = { remaining: 25 }) {
         budget.remaining -= files.length;
         return files;
     }
-    const entries = await promises_1.default.readdir(directory, { withFileTypes: true });
+    const entries = node_fs_1.default.readdirSync(directory, { withFileTypes: true });
     const files = [];
     const layoutFilesList = [];
     const otherFiles = [];
@@ -185,7 +229,7 @@ async function sourceFiles(directory, budget = { remaining: 25 }) {
         if (budget.remaining <= 0)
             break;
         if (entry.isDirectory()) {
-            const nested = await sourceFiles(fullPath, budget);
+            const nested = sourceFiles(fullPath, budget);
             files.push(...nested);
         }
         else if (sourceExtensions.test(entry.name)) {
@@ -203,10 +247,21 @@ async function sourceFiles(directory, budget = { remaining: 25 }) {
     sourceFileCache.set(directory, { expiresAt: Date.now() + 30000, files });
     return files;
 }
-async function contextFor(cwd, element) {
+function contextFor(cwd, element) {
     const needle = element.label.replace(/^[^.#]+[.#]?/, "");
     const hintedPath = element.sourceHint?.split(":")[0];
     const sourceFile = hintedPath ? node_path_1.default.basename(hintedPath) : "";
+    // Add project structure information at the top
+    const structure = detectProjectStructure(cwd);
+    let projectStructureInfo = `PROJECT STRUCTURE:
+- Framework: ${structure.framework}
+- Source root: ${structure.sourceRoot}
+- Directories found: ${structure.directories.join(", ") || "root"}
+- Multiple app directories: ${structure.multipleAppDirs.length > 0 ? structure.multipleAppDirs.join(", ") : "none"}
+- IMPORTANT: When creating files, use the existing directory structure. Do not create duplicate directories (e.g., if "src/app/" exists, use it instead of creating a new "app/").
+- Path aliases: Check tsconfig.json or jsconfig.json for path aliases like "@/components"
+
+`;
     // Extract unique class names and attributes from the element for better matching
     const classMatches = element.html?.match(/class="([^"]+)"/);
     const classNames = classMatches ? classMatches[1].split(/\s+/).filter((c) => c.length > 3) : [];
@@ -223,20 +278,20 @@ async function contextFor(cwd, element) {
             candidates.push(node_path_1.default.join(cwd, normalizedHint.slice(srcIndex + 1)));
         for (const candidate of candidates) {
             try {
-                const content = await promises_1.default.readFile(candidate, "utf8");
-                return `FILE: ${node_path_1.default.relative(cwd, candidate)}\n${content.slice(0, 16000)}`;
+                const content = node_fs_1.default.readFileSync(candidate, "utf8");
+                return `${projectStructureInfo}FILE: ${node_path_1.default.relative(cwd, candidate)}\n${content.slice(0, 16000)}`;
             }
             catch {
                 // The runtime source hint can point to a different checkout.
             }
         }
     }
-    const files = await sourceFiles(cwd);
+    const files = sourceFiles(cwd);
     const snippets = [];
     const scoredFiles = [];
-    const results = await Promise.all(files.map(async (file) => {
+    const results = files.map((file) => {
         try {
-            const content = await promises_1.default.readFile(file, "utf8");
+            const content = node_fs_1.default.readFileSync(file, "utf8");
             let score = 0;
             // Score files based on relevance
             if (sourceFile && file.endsWith(sourceFile))
@@ -264,7 +319,7 @@ async function contextFor(cwd, element) {
             // A file can disappear while a dev server is rebuilding; skip it.
         }
         return null;
-    }));
+    }).filter((r) => r !== null);
     // Sort by score and take top files
     const sortedResults = results.filter((r) => r !== null).sort((a, b) => b.score - a.score);
     for (const result of sortedResults) {
@@ -272,7 +327,7 @@ async function contextFor(cwd, element) {
             snippets.push(`FILE: ${node_path_1.default.relative(cwd, result.file)}\n${result.content.slice(0, 6000)}`);
         }
     }
-    return snippets.join("\n\n---\n\n");
+    return projectStructureInfo + snippets.join("\n\n---\n\n");
 }
 function jsonObjectCandidates(text) {
     const candidates = [];
@@ -934,7 +989,7 @@ async function runLocalAgentPrompt(cwd, config, prompt, signal, onProgress, task
     return extractLocalAgentText(result.stdout, provider);
 }
 async function proposeChanges(cwd, input, config, signal, onProgress, onPrompt) {
-    const context = await contextFor(cwd, input.element);
+    const context = contextFor(cwd, input.element);
     const runtimeErrors = input.context?.runtimeErrors || [];
     const visualContext = input.context ? { ...input.context, screenshots: undefined, runtimeErrors: undefined } : undefined;
     const history = input.messages?.map((message) => `${message.role}: ${message.content}`).join("\n") || input.instruction;
@@ -945,6 +1000,8 @@ async function proposeChanges(cwd, input, config, signal, onProgress, onPrompt)
     const runtimeErrorHint = runtimeErrors.length
         ? `\n\nLIVE CONSOLE/RUNTIME ERRORS (reported by the user's browser — the page is currently broken by these):\n${runtimeErrors.map((error) => `! ${error}`).join("\n")}`
         : "";
+    // Detect project structure for instruction
+    const structure = detectProjectStructure(cwd);
     const instruction = `Selection context:
 ${JSON.stringify(input.element, null, 2)}
 ${JSON.stringify(visualContext, null, 2)}
@@ -962,6 +1019,8 @@ Relevant source context:
 ${context || "No matching source context was found. Ask for a more specific selection rather than inventing a file."}${dragHint}${runtimeErrorHint}
 
 CRITICAL INSTRUCTIONS:
+0. PROJECT STRUCTURE AWARENESS: This project has specific directory structure. Before creating or moving files, verify the actual structure. Do not assume standard locations.
+${structure.multipleAppDirs.length > 0 ? `   WARNING: Multiple app directories detected: ${structure.multipleAppDirs.join(", ")}. Use the correct one for this project.\n` : ""}
 1. You are an autonomous agent with the ability to install npm packages and edit source code.
 2. If the user's request requires or asks for third-party libraries, icon packs, animation tools, or utility packages (e.g. icon libraries, motion, charts, UI primitives, etc.), determine the best npm package for this project and declare them in the "packages" array (e.g. ["@iconify/react", "@hugeicons/react"]).
 3. In the "changes" array, propose concrete, minimal edits to the source code to implement the request. You may freely import and use the packages you specified in "packages".
@@ -1256,7 +1315,7 @@ RULES:
     return finalProposal;
 }
 async function answerQuestion(cwd, input, config, signal, onProgress, onPrompt) {
-    const context = await contextFor(cwd, input.element);
+    const context = contextFor(cwd, input.element);
     const history = input.messages?.map((message) => `${message.role}: ${message.content}`).join("\n") || "None";
     const prompt = `Answer the user's question conversationally and directly. Do not propose file changes and do not return JSON. If the question is about the selected UI, use the selection and source context below.\n\nUser question:\n${input.question}\n\nSelected element:\n${JSON.stringify(input.element, null, 2)}\n\nVisual context:\n${JSON.stringify({ ...input.context, screenshots: undefined }, null, 2)}\n\nConversation:\n${history}\n\nRelevant source context:\n${context || "No matching source context was found."}`;
     if (config.provider === "claude-code" || config.provider === "codex" || config.provider === "opencode" || config.provider === "cursor") {

package/dist/cli/bridge.d.ts

@@ -219,6 +219,11 @@ export type ServerBridgeMessage = {
     type: "applied";
     taskId?: string;
     message: string;
+    validation?: {
+        passed: boolean;
+        errors: string[];
+        command: string;
+    };
 } | {
     type: "undone";
     taskId?: string;

package/dist/cli/bridge.js

@@ -147,6 +147,249 @@ 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)) {
+        return { passed: true, errors: [], command: "none" };
+    }
+    const pkg = JSON.parse(node_fs_1.default.readFileSync(pkgPath, "utf8"));
+    const scripts = pkg.scripts || {};
+    // Determine which build command to run
+    let buildCommand = "";
+    if (scripts.build) {
+        buildCommand = "build";
+    }
+    else if (scripts["build:cli"] || scripts["build:overlay"]) {
+        // Monorepo with separate build scripts
+        buildCommand = scripts["build:cli"] ? "build:cli" : "build:overlay";
+    }
+    else if (scripts.compile) {
+        buildCommand = "compile";
+    }
+    else if (scripts.check) {
+        buildCommand = "check";
+    }
+    else if (scripts.lint) {
+        buildCommand = "lint";
+    }
+    else if (scripts.typecheck) {
+        buildCommand = "typecheck";
+    }
+    else if (node_fs_1.default.existsSync(node_path_1.default.join(cwd, "tsconfig.json"))) {
+        buildCommand = "tsc"; // Run TypeScript compiler directly
+    }
+    else {
+        // No suitable build command found
+        return { passed: true, errors: [], command: "none" };
+    }
+    try {
+        const result = await execFileAsync(buildCommand === "tsc" ? "tsc" : "npm", buildCommand === "tsc" ? [] : ["run", buildCommand], { cwd, maxBuffer: 1024 * 1024 * 10, timeout: 60000 });
+        const output = result.stdout + result.stderr;
+        const errors = [];
+        // Parse TypeScript errors
+        if (output.includes("error TS")) {
+            const tsErrors = output.match(/error TS\d+.*$/gm) || [];
+            errors.push(...tsErrors);
+        }
+        // Parse general build errors
+        if (output.includes("Error:") || output.includes("error:")) {
+            const lines = output.split("\n");
+            for (const line of lines) {
+                if (line.includes("Error:") || line.includes("error:")) {
+                    errors.push(line.trim());
+                }
+            }
+        }
+        return {
+            passed: errors.length === 0,
+            errors,
+            command: buildCommand === "tsc" ? "tsc" : `npm run ${buildCommand}`
+        };
+    }
+    catch (error) {
+        const stderr = error.stderr || "";
+        const errors = [];
+        if (stderr.includes("error TS")) {
+            const tsErrors = stderr.match(/error TS\d+.*$/gm) || [];
+            errors.push(...tsErrors);
+        }
+        if (stderr.includes("Error:") || stderr.includes("error:")) {
+            const lines = stderr.split("\n");
+            for (const line of lines) {
+                if (line.includes("Error:") || line.includes("error:")) {
+                    errors.push(line.trim());
+                }
+            }
+        }
+        // If no specific errors found, include the full stderr
+        if (errors.length === 0 && stderr) {
+            errors.push(stderr);
+        }
+        return {
+            passed: false,
+            errors,
+            command: buildCommand === "tsc" ? "tsc" : `npm run ${buildCommand}`
+        };
+    }
+}
 function readEnvFile(cwd, filename) {
     try {
         return node_fs_1.default.readFileSync(node_path_1.default.join(cwd, filename), "utf8").split(/\r?\n/).reduce((values, line) => {
@@ -172,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,
@@ -349,38 +593,45 @@ async function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort
             ...dynamicModels.nvidia.map(m => ({ id: m.id, label: m.name, provider: m.provider })),
             // Fallback hardcoded models (only if dynamic fetch failed)
             ...(dynamicModels.anthropic.length === 0 ? [
+                { id: "claude-opus-4-5-20251101", label: "Claude Opus 4.5", provider: "anthropic" },
                 { id: "claude-sonnet-4-5-20250929", label: "Claude Sonnet 4.5", provider: "anthropic" },
-                { id: "claude-opus-4-1-20250805", label: "Claude Opus 4.1", provider: "anthropic" },
+                { id: "claude-haiku-4-5-20251015", label: "Claude Haiku 4.5", provider: "anthropic" },
             ] : []),
             ...(dynamicModels.openai.length === 0 ? [
-                { id: "gpt-4.1", label: "GPT-4.1", provider: "openai" },
-                { id: "gpt-4.1-mini", label: "GPT-4.1 mini", provider: "openai" },
+                { id: "gpt-5.1", label: "GPT-5.1", provider: "openai" },
+                { id: "gpt-5.1-codex", label: "GPT-5.1 Codex", provider: "openai" },
+                { id: "gpt-5.1-codex-mini", label: "GPT-5.1 Codex Mini", provider: "openai" },
+                { id: "o3", label: "OpenAI o3", provider: "openai" },
+                { id: "o3-mini", label: "OpenAI o3-mini", provider: "openai" },
             ] : []),
             ...(dynamicModels.google.length === 0 ? [
-                { id: "gemini-2.5-flash", label: "Gemini 2.5 Flash", provider: "google" },
-                { id: "gemini-2.5-pro", label: "Gemini 2.5 Pro", provider: "google" },
+                { id: "gemini-3-pro-preview", label: "Gemini 3 Pro", provider: "google" },
+                { id: "gemini-3-flash-preview", label: "Gemini 3 Flash", provider: "google" },
+                { id: "gemini-2.5-flash-preview-09-2025", label: "Gemini 2.5 Flash", provider: "google" },
+                { id: "gemini-2.5-flash-lite-preview-09-2025", label: "Gemini 2.5 Flash Lite", provider: "google" },
             ] : []),
             ...(dynamicModels.nvidia.length === 0 ? [
-                { id: "meta/llama-3.3-70b-instruct", label: "Llama 3.3 70B Instruct", provider: "nvidia" },
-                { id: "meta/llama-3.2-11b-vision-instruct", label: "Llama 3.2 11B Vision", provider: "nvidia" },
-                { id: "deepseek-ai/deepseek-v4-flash-0731", label: "DeepSeek V4 Flash", provider: "nvidia" },
-                { id: "google/gemma-4-31b-it", label: "Gemma 4 31B", provider: "nvidia" },
+                { id: "nvidia/llama-3.3-nemotron-super-49b-v1", label: "Llama 3.3 Nemotron Super 49B", provider: "nvidia" },
+                { id: "deepseek-ai/deepseek-r1-distill-llama-70b", label: "DeepSeek R1 Distill Llama 70B", provider: "nvidia" },
+                { id: "deepseek-ai/deepseek-r1-distill-llama-8b", label: "DeepSeek R1 Distill Llama 8B", provider: "nvidia" },
+                { id: "google/gemma-3-1b-it", label: "Gemma 3 1B Instruct", provider: "nvidia" },
+                { id: "openai/gpt-oss-120b", label: "GPT-OSS 120B", provider: "nvidia" },
             ] : []),
             // Local CLI agents (always included)
             ...(localAgents.has("claude-code") ? [
-                { id: "claude-code:sonnet", label: "Claude Code · Sonnet", provider: "cli" },
-                { id: "claude-code:opus", label: "Claude Code · Opus", provider: "cli" },
-                { id: "claude-code:haiku", label: "Claude Code · Haiku", provider: "cli" },
+                { id: "claude-code:sonnet", label: "Claude Code · Sonnet 4.5", provider: "cli" },
+                { id: "claude-code:opus", label: "Claude Code · Opus 4.5", provider: "cli" },
+                { id: "claude-code:haiku", label: "Claude Code · Haiku 4.5", provider: "cli" },
             ] : []),
             ...(localAgents.has("codex") ? [
-                { id: "codex:gpt-5", label: "Codex · GPT-5", provider: "cli" },
-                { id: "codex:gpt-5-codex", label: "Codex · GPT-5-Codex", provider: "cli" },
+                { id: "codex:gpt-5.1", label: "Codex · GPT-5.1", provider: "cli" },
+                { id: "codex:gpt-5.1-codex", label: "Codex · GPT-5.1-Codex", provider: "cli" },
             ] : []),
             ...(localAgents.has("opencode") ? [
                 { id: "opencode:opencode/big-pickle", label: "OpenCode · Big Pickle", provider: "cli" },
                 { id: "opencode:deepseek/deepseek-chat", label: "OpenCode · DeepSeek Chat", provider: "cli" },
-                { id: "opencode:anthropic/claude-sonnet-4-5", label: "OpenCode · Claude Sonnet", provider: "cli" },
-                { id: "opencode:openai/gpt-5", label: "OpenCode · GPT-5", provider: "cli" },
+                { id: "opencode:anthropic/claude-sonnet-4-5", label: "OpenCode · Claude Sonnet 4.5", provider: "cli" },
+                { id: "opencode:openai/gpt-5.1", label: "OpenCode · GPT-5.1", provider: "cli" },
             ] : []),
             ...(localAgents.has("cursor") ? [
                 { id: "cursor:claude-sonnet-4.5", label: "Cursor · Claude Sonnet 4.5", provider: "cli" },
@@ -902,7 +1153,35 @@ async function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort
                         node_fs_1.default.mkdirSync(node_path_1.default.dirname(filePath), { recursive: true });
                         node_fs_1.default.writeFileSync(filePath, nextContent);
                     }
-                    socket.send(JSON.stringify({ type: "applied", taskId: msg.taskId, message: `${msg.changes.length} file${msg.changes.length === 1 ? "" : "s"} updated. Your dev server will reload.` }));
+                    // 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,
+                        message: `${msg.changes.length} file${msg.changes.length === 1 ? "" : "s"} updated. Your dev server will reload.`,
+                        validation
+                    }));
                 }
                 catch (error) {
                     // Validation happens before writes, but restore this task's snapshot

package/dist/cli/oneshot.js

@@ -10,6 +10,7 @@ const node_child_process_1 = require("node:child_process");
 const node_util_1 = require("node:util");
 const agent_1 = require("./agent");
 const auth_1 = require("./auth");
+const framework_1 = require("./utils/framework");
 const execAsync = (0, node_util_1.promisify)(node_child_process_1.exec);
 const CLI_PROVIDERS = new Set(["claude-code", "codex", "opencode", "cursor"]);
 function isCliProvider(provider) {
@@ -225,7 +226,7 @@ async function runOneShotAgent(cwd, prompt, scope, config, signal, onProgress, o
         }
         // Skip project structure analysis for simple conversational queries
         const projectStructure = isConversational ? null : await analyzeProject(cwd);
-        const framework = isConversational ? null : detectFramework(cwd);
+        const framework = isConversational ? null : (0, framework_1.detectFramework)(cwd);
         if (!isConversational && !pageContext) {
             onProgress("thinking", "Inspecting application...", `Detected ${framework} framework`);
         }
@@ -314,6 +315,11 @@ async function runOneShotAgent(cwd, prompt, scope, config, signal, onProgress, o
                             dependencies: projectStructure?.dependencies,
                             devDependencies: projectStructure?.devDependencies,
                             files: projectStructure?.files.slice(0, 100) || [],
+                            directories: projectStructure?.directories.slice(0, 50) || [],
+                            sourceRoot: projectStructure?.sourceRoot,
+                            appRouter: projectStructure?.appRouter,
+                            pagesRouter: projectStructure?.pagesRouter,
+                            multipleAppDirs: projectStructure?.multipleAppDirs,
                             sourceHints: Object.keys(sourceHints).length > 0 ? sourceHints : undefined,
                             currentRoute: pageContext?.route || "/",
                             pageContext,
@@ -498,7 +504,7 @@ async function runOneShotAgent(cwd, prompt, scope, config, signal, onProgress, o
         }
         // Phase 2: Local agent generation fallback for code changes
         onProgress("thinking", "Generating implementation plan...", `Planning components for ${prompt}`);
-        const plan = await generatePlan(cwd, prompt, scope, projectStructure || { framework: "", hasTypeScript: false, hasTailwind: false, hasReact: false, hasNext: false, hasVite: false, dependencies: [], devDependencies: [], files: [] }, framework || "", config, signal, messages, pageContext);
+        const plan = await generatePlan(cwd, prompt, scope, projectStructure || { framework: "", hasTypeScript: false, hasTailwind: false, hasReact: false, hasNext: false, hasVite: false, dependencies: [], devDependencies: [], files: [], directories: [], sourceRoot: ".", appRouter: false, pagesRouter: false, multipleAppDirs: [] }, framework || "", config, signal, messages, pageContext);
         if (signal.aborted) {
             return { ok: false, error: "Operation was cancelled during planning" };
         }
@@ -593,24 +599,33 @@ async function analyzeProject(cwd) {
     const hasReact = dependencies.includes("react") || devDependencies.includes("react");
     const hasNext = dependencies.includes("next") || devDependencies.includes("next");
     const hasVite = dependencies.includes("vite") || devDependencies.includes("vite");
-    // Scan src / app directory
+    // Scan directory structure
     const files = [];
-    const roots = ["src", "app", "pages", "."];
+    const directories = [];
+    const appDirs = [];
+    const pagesDirs = [];
+    const roots = ["src", "app", "pages", ".", "web", "lib", "components"];
     for (const root of roots) {
         const rootPath = node_path_1.default.join(cwd, root);
         if (!node_fs_1.default.existsSync(rootPath))
             continue;
         const scanDir = (dir, base = "", depth = 0) => {
-            if (depth > 4)
+            if (depth > 5)
                 return;
             try {
                 const entries = node_fs_1.default.readdirSync(dir, { withFileTypes: true });
                 for (const entry of entries) {
-                    if (entry.name.startsWith(".") || entry.name === "node_modules" || entry.name === "dist" || entry.name === "build") {
+                    if (entry.name.startsWith(".") || entry.name === "node_modules" || entry.name === "dist" || entry.name === "build" || entry.name === ".next") {
                         continue;
                     }
                     const rel = base ? node_path_1.default.join(base, entry.name) : entry.name;
                     if (entry.isDirectory()) {
+                        directories.push(rel);
+                        // Track app and pages directories
+                        if (entry.name === "app")
+                            appDirs.push(rel);
+                        if (entry.name === "pages")
+                            pagesDirs.push(rel);
                         scanDir(node_path_1.default.join(dir, entry.name), rel, depth + 1);
                     }
                     else if (/\.(tsx?|jsx?|vue|svelte|css|html|json)$/i.test(entry.name)) {
@@ -623,11 +638,25 @@ async function analyzeProject(cwd) {
             }
         };
         scanDir(rootPath);
-        if (files.length > 60)
+        if (files.length > 100)
             break;
     }
+    // Determine source root
+    let sourceRoot = ".";
+    if (directories.includes("src/app"))
+        sourceRoot = "src";
+    else if (directories.includes("app"))
+        sourceRoot = ".";
+    else if (directories.includes("src"))
+        sourceRoot = "src";
+    // Detect App Router vs Pages Router
+    const appRouter = appDirs.length > 0 && appDirs.some(dir => {
+        const appPath = node_path_1.default.join(cwd, dir);
+        return node_fs_1.default.existsSync(node_path_1.default.join(appPath, "layout.tsx")) || node_fs_1.default.existsSync(node_path_1.default.join(appPath, "page.tsx"));
+    });
+    const pagesRouter = pagesDirs.length > 0 && node_fs_1.default.existsSync(node_path_1.default.join(cwd, "pages", "_app.tsx")) || node_fs_1.default.existsSync(node_path_1.default.join(cwd, "pages", "_document.tsx"));
     return {
-        framework: detectFramework(cwd),
+        framework: (0, framework_1.detectFramework)(cwd),
         hasTypeScript,
         hasTailwind,
         hasReact,
@@ -636,31 +665,13 @@ async function analyzeProject(cwd) {
         dependencies: dependencies,
         devDependencies: devDependencies,
         files,
+        directories,
+        sourceRoot,
+        appRouter,
+        pagesRouter,
+        multipleAppDirs: appDirs,
     };
 }
-function detectFramework(cwd) {
-    const pkgPath = node_path_1.default.join(cwd, "package.json");
-    if (node_fs_1.default.existsSync(pkgPath)) {
-        try {
-            const pkg = JSON.parse(node_fs_1.default.readFileSync(pkgPath, "utf8"));
-            const deps = { ...pkg.dependencies, ...pkg.devDependencies };
-            if (deps.next)
-                return "next";
-            if (deps.vite)
-                return "vite";
-            if (deps.react)
-                return "react";
-            if (deps.vue)
-                return "vue";
-            if (deps.svelte)
-                return "svelte";
-        }
-        catch {
-            // fallback
-        }
-    }
-    return "unknown";
-}
 async function generatePlan(cwd, prompt, _scope, structure, framework, config, signal, _messages, pageContext) {
     const steps = [];
     // Identify relevant files to supply as context.

package/dist/overlay.js

@@ -7848,6 +7848,8 @@
     return `${Math.floor(seconds / 86400)}d`;
   }
   var modelSessionKey = "lasso:selected-model";
+  var chatHistoryKey = "lasso:chat-history";
+  var changesHistoryKey = "lasso:changes-history";
   function storedModelId() {
     try {
       return window.sessionStorage.getItem(modelSessionKey);
@@ -7861,6 +7863,22 @@
     } catch {
     }
   }
+  function loadChatHistory() {
+    try {
+      const chatHistory = JSON.parse(localStorage.getItem(chatHistoryKey) || "[]");
+      const changesHistory = JSON.parse(localStorage.getItem(changesHistoryKey) || "[]");
+      return { chatHistory, changesHistory };
+    } catch {
+      return { chatHistory: [], changesHistory: [] };
+    }
+  }
+  function saveChatHistory(chatHistory, changesHistory) {
+    try {
+      localStorage.setItem(chatHistoryKey, JSON.stringify(chatHistory));
+      localStorage.setItem(changesHistoryKey, JSON.stringify(changesHistory));
+    } catch {
+    }
+  }
   var OverlayState = class {
     // Mode & Selection
     selectMode = false;
@@ -21611,7 +21629,24 @@
               recordTaskActivity(task.id, message.message || "Done.");
             }
             const isPromptTask = !taskId2 || taskId2 === state.promptTaskId;
-            const result = message.message || "Done.";
+            let result = message.message || "Done.";
+            if (message.type === "applied" && message.validation) {
+              const { passed, errors, command } = message.validation;
+              if (!passed && errors.length > 0) {
+                result = `${message.message}
+
+\u26A0\uFE0F Build validation failed after running \`${command}\`:
+
+${errors.slice(0, 5).join("\n")}${errors.length > 5 ? `
+...and ${errors.length - 5} more errors` : ""}
+
+The agent is automatically attempting to fix the build errors...`;
+              } else if (passed) {
+                result = `${message.message}
+
+\u2705 Build validation passed.`;
+              }
+            }
             void notifyAgent(message.type === "applied" ? "Changes applied" : "Change undone", result);
             appendChat("assistant", result, taskId2);
             if (task?.element) releaseHeldLock(elementKey(task.element));
@@ -21743,6 +21778,8 @@
     updateAgentTask(id, {
       changesHistory: [...task.changesHistory, { summary, changes: changes.map((change) => ({ ...change })), createdAt: (/* @__PURE__ */ new Date()).toISOString() }]
     });
+    state.changesHistory = task.changesHistory;
+    saveChatHistory(state.chatHistory, state.changesHistory);
   }
   function appendTaskMessage(id, role, text) {
     const task = getAgentTask(id);
@@ -21757,6 +21794,8 @@
       contextId: task.selectionId || void 0
     };
     updateAgentTask(task.id, { messages: [...task.messages, message] });
+    state.chatHistory = task.messages;
+    saveChatHistory(state.chatHistory, state.changesHistory);
     return message;
   }
   function selectAgentTask(id) {
@@ -21916,6 +21955,7 @@
     state.selectionId = selectionId;
     state.chatHistory = conversation.messages;
     state.changesHistory = conversation.changesHistory;
+    saveChatHistory(state.chatHistory, state.changesHistory);
   }
   function buildPrompt() {
     const dom = getDOM();
@@ -22101,6 +22141,12 @@
       if (task) restoreTaskPrompt(task);
       else resetPromptSession();
     });
+    const { chatHistory, changesHistory } = loadChatHistory();
+    if (chatHistory.length > 0) {
+      state.chatHistory = chatHistory;
+      state.changesHistory = changesHistory;
+      renderChatThread();
+    }
     onAgentTaskReviewRequested((task) => {
       state.promptTaskId = task.id;
       state.pendingChanges = [...task.pendingChanges.length ? task.pendingChanges : task.changes || []];
@@ -22610,6 +22656,7 @@
         contextId: state.selectionId || void 0
       });
     }
+    saveChatHistory(state.chatHistory, state.changesHistory);
     renderChatThread();
   }
   function renderChatText(container, text) {
@@ -22696,6 +22743,7 @@
       state.chatHistory = [];
       state.changesHistory = [];
       state.selectionId = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
+      saveChatHistory(state.chatHistory, state.changesHistory);
     }
     state.screenshotPromise = Promise.resolve({});
     hideReview();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lasso-ai/cli",
-  "version": "1.3.0",
+  "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",