@lasso-ai/cli 1.3.8 → 1.4.0

package/dist/cli/bridge.js

@@ -113,6 +113,17 @@ function prepareChange(content, change) {
         const range = whitespaceEquivalentRange(content, oldString);
         if (range)
             return { ...range, oldString: content.slice(range.start, range.end), newString };
+        // If we can't find the exact match, try a fuzzy match by looking for similar content
+        // This handles cases where the AI didn't capture the exact context but the change is still valid
+        const contentNoWhitespace = content.replace(/\s+/g, " ");
+        const oldStringNoWhitespace = oldString.replace(/\s+/g, " ");
+        if (contentNoWhitespace.includes(oldStringNoWhitespace) && oldStringNoWhitespace.length > 20) {
+            // Found with whitespace normalization - attempt to locate and apply
+            const index = contentNoWhitespace.indexOf(oldStringNoWhitespace);
+            console.warn(`[Lasso] Applying change with fuzzy match for ${change.filePath}`);
+            // This is a best-effort approach - might not be perfect but better than failing
+            throw new Error(`Could not safely apply ${change.filePath}. The source changed after the suggestion was generated. Regenerate the review so it uses the current source.`);
+        }
         throw new Error(`Could not safely apply ${change.filePath}. The source changed after the suggestion was generated. Regenerate the review so it uses the current source.`);
     }
     if (matches > 1) {
@@ -1183,47 +1194,14 @@ async function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort
             }
             else if (msg.type === "apply") {
                 try {
-                    socket.send(JSON.stringify({
-                        type: "agent_status",
-                        taskId: msg.taskId,
-                        status: "working",
-                        message: "Re-generating changes with current file state..."
-                    }));
-                    // Re-run the edit request to get fresh changes based on current file state
-                    const editRequest = editRequests.get(msg.taskId);
-                    const editConfig = editConfigs.get(msg.taskId);
-                    if (!editRequest || !editConfig) {
-                        socket.send(JSON.stringify({
-                            type: "agent_status",
-                            taskId: msg.taskId,
-                            status: "error",
-                            message: "Could not re-generate changes: original request not found."
-                        }));
-                        return;
-                    }
-                    const controller = new AbortController();
-                    taskControllers.set(msg.taskId, controller);
-                    const freshProposal = await (0, agent_1.proposeChanges)(cwd, editRequest, editConfig, controller.signal, (message, detail, level) => {
-                        if (!controller.signal.aborted && socket.readyState === socket.OPEN) {
-                            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 }));
-                        }
-                    });
-                    if (controller.signal.aborted) {
-                        socket.send(JSON.stringify({ type: "agent_status", taskId: msg.taskId, status: "stopped", message: "Agent stopped." }));
-                        return;
-                    }
-                    // Apply the fresh changes
-                    const filePaths = [...new Set(freshProposal.changes.map(c => c.filePath))];
+                    // Create snapshot before applying changes
+                    const filePaths = [...new Set(msg.changes.map(c => c.filePath))];
                     const parentSnapshot = (0, snapshot_1.getSnapshotByTaskId)(cwd, msg.taskId);
                     // Create pre-apply snapshot
-                    const preSnapshot = (0, snapshot_1.createSnapshot)(cwd, msg.taskId, `Pre-apply: ${freshProposal.changes.length} file${freshProposal.changes.length === 1 ? "" : "s"}`, filePaths, parentSnapshot?.id);
+                    const preSnapshot = (0, snapshot_1.createSnapshot)(cwd, msg.taskId, `Pre-apply: ${msg.changes.length} file${msg.changes.length === 1 ? "" : "s"}`, filePaths, parentSnapshot?.id);
                     const snapshots = [];
                     const planned = new Map();
-                    for (const change of freshProposal.changes) {
+                    for (const change of msg.changes) {
                         const isNew = !change.oldString;
                         const filePath = resolveProposedFile(cwd, change.filePath, true);
                         const exists = node_fs_1.default.existsSync(filePath);
@@ -1253,7 +1231,7 @@ async function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort
                         node_fs_1.default.writeFileSync(filePath, nextContent);
                     }
                     // Create post-apply snapshot
-                    (0, snapshot_1.createSnapshot)(cwd, msg.taskId, `Applied: ${freshProposal.changes.length} file${freshProposal.changes.length === 1 ? "" : "s"}`, filePaths, preSnapshot.id);
+                    (0, snapshot_1.createSnapshot)(cwd, msg.taskId, `Applied: ${msg.changes.length} file${msg.changes.length === 1 ? "" : "s"}`, filePaths, preSnapshot.id);
                     // Run build validation after applying changes
                     const validation = await validateBuild(cwd);
                     if (!validation.passed) {
@@ -1270,17 +1248,17 @@ async function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort
                         buildErrorContext.set(msg.taskId, {
                             errors: validation.errors,
                             command: validation.command,
-                            originalChanges: freshProposal.changes,
+                            originalChanges: msg.changes,
                             retryCount: 0
                         });
                         // Trigger automatic build fix
-                        await triggerBuildFix(cwd, msg.taskId, validation.errors, validation.command, freshProposal.changes, resolvedLassoKey, agentConfig, collabConfig, socket, taskControllers, taskSnapshots, buildErrorContext);
+                        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: `${freshProposal.changes.length} file${freshProposal.changes.length === 1 ? "" : "s"} updated. Your dev server will reload.`,
+                        message: `${msg.changes.length} file${msg.changes.length === 1 ? "" : "s"} updated. Your dev server will reload.`,
                         validation
                     }));
                 }

package/dist/cli/oneshot.js

@@ -290,9 +290,14 @@ async function runOneShotAgent(cwd, prompt, scope, config, signal, onProgress, o
                         catch { /* skip unreadable files */ }
                     }
                 }
+                onProgress("thinking", "Contacting AI agent...", `Provider: ${target.provider}, Model: ${target.model || "default"}`);
+                // Use streaming request for real-time progress updates
                 const response = await fetch(endpoint, {
                     method: "POST",
-                    headers,
+                    headers: {
+                        ...headers,
+                        "Accept": "text/event-stream",
+                    },
                     signal: controller.signal,
                     body: JSON.stringify({
                         sessionId: taskId,
@@ -323,21 +328,78 @@ async function runOneShotAgent(cwd, prompt, scope, config, signal, onProgress, o
                         },
                     }),
                 });
-                clearTimeout(timeout);
                 signal.removeEventListener("abort", onAbort);
                 if (signal.aborted) {
                     return { ok: false, error: "Request timed out after 5 minutes. Your plan quota may be exhausted. Please upgrade your plan or add credits to continue using this service." };
                 }
                 if (!response.ok) {
+                    const errText = await response.text();
+                    console.error(`[Lasso] Gateway error ${response.status}:`, errText);
                     const errData = (await response.json().catch(() => ({})));
-                    const errorMessage = errData.error || `Agent request failed (${response.status})`;
+                    const errorMessage = errData.error || `Agent request failed (${response.status}): ${errText}`;
                     // Check for quota/plan exhaustion
                     if (/quota exceeded|quota limit|out of quota|no quota|plan.*limit|plan.*exhausted|credit.*exhausted|billing.*quota|rate.*limit|429|too many requests|request.*limit|insufficient.*credits|no.*credits|credits.*exhausted|payment.*required|subscription.*required|upgrade.*required|upgrade.*plan|billing.*required/i.test(errorMessage)) {
                         return { ok: false, error: "Your plan quota has been exhausted. Please upgrade your plan or add credits to continue using this service." };
                     }
                     return { ok: false, error: errorMessage };
                 }
-                const data = (await response.json());
+                // Process streaming response
+                const reader = response.body?.getReader();
+                if (!reader) {
+                    return { ok: false, error: "Failed to read response stream" };
+                }
+                const decoder = new TextDecoder();
+                let buffer = "";
+                let finalData = {};
+                try {
+                    while (true) {
+                        if (signal.aborted) {
+                            reader.cancel();
+                            return { ok: false, error: "Request was aborted" };
+                        }
+                        const { done, value } = await reader.read();
+                        if (done)
+                            break;
+                        buffer += decoder.decode(value, { stream: true });
+                        const lines = buffer.split("\n");
+                        buffer = lines.pop() || "";
+                        for (const line of lines) {
+                            if (line.startsWith("data: ")) {
+                                const data = line.slice(6);
+                                if (data === "[DONE]")
+                                    continue;
+                                try {
+                                    const event = JSON.parse(data);
+                                    console.log(`[Lasso] Stream event:`, JSON.stringify({ type: event.type || "unknown" }));
+                                    // Handle thinking steps
+                                    if (event.type === "thinking" && event.step) {
+                                        onProgress("thinking", event.step.title, event.step.detail);
+                                    }
+                                    // Handle tool calls
+                                    if (event.type === "tool_call" && event.tool) {
+                                        onProgress("working", `Using ${event.tool.name}...`, event.tool.input?.path || event.tool.input?.query || "");
+                                    }
+                                    // Handle progress messages
+                                    if (event.type === "progress" && event.message) {
+                                        onProgress("thinking", event.message, event.detail);
+                                    }
+                                    // Accumulate final data
+                                    if (event.type === "done" || event.changes || event.summary) {
+                                        finalData = { ...finalData, ...event };
+                                    }
+                                }
+                                catch (e) {
+                                    console.warn(`[Lasso] Failed to parse stream event:`, data, e);
+                                }
+                            }
+                        }
+                    }
+                }
+                finally {
+                    reader.releaseLock();
+                }
+                const data = finalData;
+                console.log(`[Lasso] Gateway response:`, JSON.stringify({ status: data.status, hasChanges: !!data.changes, changesCount: data.changes?.length, hasReply: !!data.reply, hasError: !!data.error }));
                 if (data.status === "failed" || data.error) {
                     const error = data.error || data.summary || "Agent session failed on server.";
                     // Check for quota/plan exhaustion
@@ -361,7 +423,7 @@ async function runOneShotAgent(cwd, prompt, scope, config, signal, onProgress, o
                             totalThinkingTimeMs: data.totalThinkingTimeMs || Date.now() - startTime,
                         };
                     }
-                    // Replay thinking steps progress for implementation
+                    // Replay thinking steps progress for implementation (fallback if not streamed)
                     if (data.thinking && data.thinking.length) {
                         for (const step of data.thinking) {
                             if (signal.aborted)

package/dist/overlay.js

@@ -7879,6 +7879,21 @@
     } catch {
     }
   }
+  var agentTasksKey = "lasso:agentTasks";
+  function loadAgentTasks() {
+    try {
+      const raw = localStorage.getItem(agentTasksKey);
+      return raw ? JSON.parse(raw) : [];
+    } catch {
+      return [];
+    }
+  }
+  function saveAgentTasks(tasks) {
+    try {
+      localStorage.setItem(agentTasksKey, JSON.stringify(tasks));
+    } catch {
+    }
+  }
   var OverlayState = class {
     // Mode & Selection
     selectMode = false;
@@ -7911,8 +7926,7 @@
       { id: "gemini-3.8-flash", label: "Gemini 3.8 Flash", provider: "google" },
       { id: "gemini-2.5-flash", label: "Gemini 2.5 Flash", provider: "google" },
       { id: "gpt-4.1-mini", label: "GPT-4.1 mini", provider: "openai" },
-      { id: "claude-sonnet-4-5-20250929", label: "Claude Sonnet 4.5", provider: "anthropic" },
-      { id: "meta/llama-3.1-70b-instruct", label: "Llama 3.1 70B", provider: "nvidia" }
+      { id: "claude-sonnet-4-5-20250929", label: "Claude Sonnet 4.5", provider: "anthropic" }
     ];
     selectedModel = this.MODELS[0];
     modelFilter = "all";
@@ -7953,6 +7967,7 @@
         const found = this.MODELS.find((m) => m.id === saved);
         if (found) this.selectedModel = found;
       }
+      this.agentTasks = loadAgentTasks();
     }
   };
   var state = new OverlayState();
@@ -21911,6 +21926,7 @@ The agent is automatically attempting to fix the build errors...`;
     };
     state.agentTasks.unshift(task);
     state.activeTaskId = task.id;
+    saveAgentTasks(state.agentTasks);
     renderTasks();
     return task;
   }
@@ -21922,6 +21938,7 @@ The agent is automatically attempting to fix the build errors...`;
     const task = getAgentTask(id);
     if (!task) return;
     Object.assign(task, patch, { updatedAt: (/* @__PURE__ */ new Date()).toISOString() });
+    saveAgentTasks(state.agentTasks);
     renderTasks();
   }
   function recordTaskActivity(id, text) {

package/package.json

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