@lasso-ai/cli 1.1.2 → 1.1.4

package/dist/cli/agent.d.ts

@@ -45,7 +45,8 @@ export type AgentConfig = {
     baseUrl?: string;
 };
 export type LocalAgent = "claude-code" | "codex" | "opencode";
-export type AgentProgress = (message: string, detail?: string) => void;
+export type AgentProgressLevel = "working" | "error";
+export type AgentProgress = (message: string, detail?: string, level?: AgentProgressLevel) => void;
 export type AgentPrompt = {
     message: string;
     kind: "permission" | "input";

package/dist/cli/agent.js

@@ -36,8 +36,9 @@ async function detectLocalAgents() {
 }
 const ignored = new Set(["node_modules", ".git", ".next", "dist", "build", ".turbo"]);
 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: 40 }) {
+async function sourceFiles(directory, budget = { remaining: 25 }) {
     if (budget.remaining <= 0)
         return [];
     const cached = sourceFileCache.get(directory);
@@ -48,6 +49,8 @@ async function sourceFiles(directory, budget = { remaining: 40 }) {
     }
     const entries = await promises_1.default.readdir(directory, { withFileTypes: true });
     const files = [];
+    const layoutFilesList = [];
+    const otherFiles = [];
     for (const entry of entries) {
         if (ignored.has(entry.name) || entry.name.startsWith("."))
             continue;
@@ -59,11 +62,18 @@ async function sourceFiles(directory, budget = { remaining: 40 }) {
             files.push(...nested);
         }
         else if (sourceExtensions.test(entry.name)) {
-            files.push(fullPath);
-            budget.remaining -= 1;
+            if (layoutFiles.test(entry.name)) {
+                layoutFilesList.push(fullPath);
+            }
+            else {
+                otherFiles.push(fullPath);
+            }
         }
     }
-    sourceFileCache.set(directory, { expiresAt: Date.now() + 5000, files });
+    // Prioritize layout files first, then other files
+    files.push(...layoutFilesList, ...otherFiles);
+    budget.remaining -= files.length;
+    sourceFileCache.set(directory, { expiresAt: Date.now() + 30000, files });
     return files;
 }
 async function contextFor(cwd, element) {
@@ -95,7 +105,7 @@ async function contextFor(cwd, element) {
         try {
             const content = await promises_1.default.readFile(file, "utf8");
             if (!needle || (sourceFile && file.endsWith(sourceFile)) || content.includes(needle) || content.includes(element.label)) {
-                return `FILE: ${node_path_1.default.relative(cwd, file)}\n${content.slice(0, 8000)}`;
+                return `FILE: ${node_path_1.default.relative(cwd, file)}\n${content.slice(0, 6000)}`;
             }
         }
         catch {
@@ -104,7 +114,7 @@ async function contextFor(cwd, element) {
         return null;
     }));
     for (const result of results) {
-        if (result && snippets.length < 6)
+        if (result && snippets.length < 4)
             snippets.push(result);
     }
     return snippets.join("\n\n---\n\n");
@@ -560,9 +570,9 @@ function runLocalCommand(cwd, command, args, provider, signal, onProgress, taskI
                 else if (stream === "stderr" && line.trim()) {
                     const hint = agentFailureHint(line);
                     if (hint)
-                        onProgress?.(`${label} · ${hint}`);
+                        onProgress?.(`${label} · ${hint}`, undefined, "error");
                     if (provider === "opencode" && /quota exceeded|authentication failed|invalid api key|unauthorized|forbidden/i.test(line)) {
-                        onProgress?.("OpenCode · provider rejected the request; stopping this task…");
+                        onProgress?.("OpenCode · provider rejected the request; stopping this task…", undefined, "error");
                         child.kill("SIGTERM");
                     }
                 }
@@ -611,9 +621,9 @@ function runLocalCommand(cwd, command, args, provider, signal, onProgress, taskI
                 }
                 const hint = agentFailureHint(stderrTail);
                 if (hint)
-                    onProgress?.(`${label} · ${hint}`);
+                    onProgress?.(`${label} · ${hint}`, undefined, "error");
                 if (provider === "opencode" && /quota exceeded|authentication failed|invalid api key|unauthorized|forbidden/i.test(stderrTail)) {
-                    onProgress?.("OpenCode · provider rejected the request; stopping this task…");
+                    onProgress?.("OpenCode · provider rejected the request; stopping this task…", undefined, "error");
                 }
             }
             resolve({ stdout, stderr, exitCode: code ?? 1 });

package/dist/cli/bridge.js

@@ -118,7 +118,20 @@ function proposalMatchesCurrentSource(cwd, changes) {
     try {
         for (const change of changes) {
             const filePath = resolveProposedFile(cwd, change.filePath);
-            prepareChange(node_fs_1.default.readFileSync(filePath, "utf8"), change);
+            const content = node_fs_1.default.readFileSync(filePath, "utf8");
+            // Try exact match first
+            try {
+                prepareChange(content, change);
+            }
+            catch {
+                // If exact match fails, try with normalized whitespace
+                const normalizedContent = content.replace(/\s+/g, " ").trim();
+                const normalizedOldString = change.oldString.replace(/\s+/g, " ").trim();
+                const normalizedNewString = change.newString.replace(/\s+/g, " ").trim();
+                if (!normalizedContent.includes(normalizedOldString)) {
+                    throw new Error("Source content does not match proposed change (even with normalized whitespace)");
+                }
+            }
         }
         return true;
     }
@@ -308,9 +321,9 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
             if (socket.readyState === socket.OPEN) {
                 socket.send(JSON.stringify({ type: "agent_status", taskId: request.taskId, status: "working", message: statusMessage || "Working…" }));
             }
-            void (0, agent_1.proposeChanges)(cwd, request, config, controller.signal, (message, detail) => {
+            void (0, agent_1.proposeChanges)(cwd, request, config, controller.signal, (message, detail, level) => {
                 if (!controller.signal.aborted && socket.readyState === socket.OPEN) {
-                    socket.send(JSON.stringify({ type: "agent_status", taskId: request.taskId, status: "working", message, detail }));
+                    socket.send(JSON.stringify({ type: "agent_status", taskId: request.taskId, status: level === "error" ? "error" : "working", message, detail }));
                 }
             }, (prompt) => {
                 if (!controller.signal.aborted && socket.readyState === socket.OPEN) {
@@ -322,21 +335,30 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
                     return;
                 if (!proposalMatchesCurrentSource(cwd, proposal.changes)) {
                     const refreshAttempts = reviewRefreshAttempts.get(request.taskId) || 0;
-                    if (refreshAttempts < 1) {
+                    const MAX_REFRESH_ATTEMPTS = 3;
+                    if (refreshAttempts < MAX_REFRESH_ATTEMPTS) {
                         reviewRefreshAttempts.set(request.taskId, refreshAttempts + 1);
-                        runEditReview(request, config, "The source changed while the proposal was being prepared. Refreshing the review…");
+                        setTimeout(() => {
+                            if (!controller.signal.aborted && socket.readyState === socket.OPEN) {
+                                runEditReview(request, config, `The source changed while the proposal was being prepared. Refreshing the review… (${refreshAttempts + 1}/${MAX_REFRESH_ATTEMPTS})`);
+                            }
+                        }, 500 * (refreshAttempts + 1));
                     }
                     else {
-                        socket.send(JSON.stringify({ type: "agent_status", taskId: request.taskId, status: "error", message: "The source is still changing. Stop the dev-server edit or try the request again." }));
+                        socket.send(JSON.stringify({ type: "agent_status", taskId: request.taskId, status: "error", message: "The source is still changing after multiple refresh attempts. Stop the dev-server edit or try the request again." }));
                     }
                     return;
                 }
                 socket.send(JSON.stringify({ type: "agent_status", taskId: request.taskId, status: "review", message: proposal.summary, changes: proposal.changes }));
             })
                 .catch((error) => {
-                if (!controller.signal.aborted && socket.readyState === socket.OPEN) {
-                    socket.send(JSON.stringify({ type: "agent_status", taskId: request.taskId, status: "error", message: error instanceof Error ? error.message : "The agent could not prepare a change." }));
+                if (socket.readyState !== socket.OPEN)
+                    return;
+                if (controller.signal.aborted) {
+                    socket.send(JSON.stringify({ type: "agent_status", taskId: request.taskId, status: "stopped", message: "Agent stopped." }));
+                    return;
                 }
+                socket.send(JSON.stringify({ type: "agent_status", taskId: request.taskId, status: "error", message: error instanceof Error ? error.message : "The agent could not prepare a change." }));
             })
                 .finally(() => {
                 if (taskControllers.get(request.taskId) === controller)
@@ -432,9 +454,9 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
                     ? { provider: cliProvider, model: msg.model }
                     : { ...agentConfig, provider: (msg.provider || agentConfig.provider), model: msg.model };
                 socket.send(JSON.stringify({ type: "agent_status", taskId: msg.taskId, status: "working", message: "Working…" }));
-                void (0, agent_1.answerQuestion)(cwd, { taskId: msg.taskId, question: msg.question, context: msg.context, element: msg.element, messages: msg.messages }, selectedConfig, controller.signal, (message, detail) => {
+                void (0, agent_1.answerQuestion)(cwd, { taskId: msg.taskId, question: msg.question, context: msg.context, element: msg.element, messages: msg.messages }, selectedConfig, controller.signal, (message, detail, level) => {
                     if (!controller.signal.aborted && socket.readyState === socket.OPEN)
-                        socket.send(JSON.stringify({ type: "agent_status", taskId: msg.taskId, status: "working", message, detail }));
+                        socket.send(JSON.stringify({ type: "agent_status", taskId: msg.taskId, status: level === "error" ? "error" : "working", message, detail }));
                 }, (prompt) => {
                     if (!controller.signal.aborted && socket.readyState === socket.OPEN)
                         socket.send(JSON.stringify({ type: "agent_prompt", taskId: msg.taskId, prompt }));