@lasso-ai/cli 1.0.14 → 1.0.16

package/dist/cli/agent.js

@@ -91,17 +91,60 @@ async function contextFor(cwd, element) {
     }
     return snippets.join("\n\n---\n\n");
 }
+function jsonObjectCandidates(text) {
+    const candidates = [];
+    for (let start = 0; start < text.length; start += 1) {
+        if (text[start] !== "{")
+            continue;
+        let depth = 0;
+        let inString = false;
+        let escaped = false;
+        for (let index = start; index < text.length; index += 1) {
+            const character = text[index];
+            if (inString) {
+                if (escaped)
+                    escaped = false;
+                else if (character === "\\")
+                    escaped = true;
+                else if (character === '"')
+                    inString = false;
+                continue;
+            }
+            if (character === '"') {
+                inString = true;
+            }
+            else if (character === "{") {
+                depth += 1;
+            }
+            else if (character === "}" && --depth === 0) {
+                candidates.push(text.slice(start, index + 1));
+                break;
+            }
+        }
+    }
+    return candidates;
+}
 function jsonFrom(text) {
-    const fenced = text.match(/```(?:json)?\s*([\s\S]*?)```/i)?.[1] || text;
-    const parsed = JSON.parse(fenced.trim());
-    if (!Array.isArray(parsed.changes))
-        throw new Error("The agent returned no reviewable changes.");
-    for (const change of parsed.changes) {
-        if (!change.filePath || typeof change.oldString !== "string" || typeof change.newString !== "string") {
-            throw new Error("The agent returned an invalid file change.");
+    const fenced = text.match(/```(?:json)?\s*([\s\S]*?)```/i)?.[1];
+    const candidates = [...(fenced ? [fenced] : []), ...jsonObjectCandidates(text)];
+    for (const candidate of candidates) {
+        try {
+            const parsed = JSON.parse(candidate.trim());
+            if (!Array.isArray(parsed.changes))
+                continue;
+            for (const change of parsed.changes) {
+                if (!change.filePath || typeof change.oldString !== "string" || typeof change.newString !== "string") {
+                    throw new Error("The agent returned an invalid file change.");
+                }
+            }
+            return { summary: parsed.summary || "The proposed source changes are ready for review.", changes: parsed.changes };
+        }
+        catch (error) {
+            if (error instanceof Error && error.message === "The agent returned an invalid file change.")
+                throw error;
         }
     }
-    return { summary: parsed.summary || "The proposed source changes are ready for review.", changes: parsed.changes };
+    throw new Error("The agent returned no valid reviewable changes. Progress output may have been mixed with the final JSON.");
 }
 function extractLocalAgentText(raw, provider) {
     if (provider === "claude-code") {
@@ -271,7 +314,7 @@ function localCommand(provider, model, prompt) {
     return { command: "codex", args: ["exec", "--json", "--sandbox", "read-only", "--skip-git-repo-check", ...(selectedModel ? ["--model", selectedModel] : []), prompt || ""] };
 }
 async function proposeWithLocalAgent(cwd, instruction, context, config, signal, onProgress) {
-    const outputContract = `Return ONLY valid JSON in this exact shape: {"summary":"short explanation","changes":[{"filePath":"relative/path","oldString":"exact existing text","newString":"replacement text"}]}. Every oldString must occur exactly once. Do not edit files, run write commands, commit, or produce markdown fences.`;
+    const outputContract = `Return ONLY valid JSON in this exact shape: {"summary":"short explanation","changes":[{"filePath":"relative/path","oldString":"exact existing text","newString":"replacement text"}]}. Treat the supplied source context as read-only. Before returning, verify every oldString against that context. Use project-relative paths only. Do not edit files, run write commands, commit, or produce markdown fences.`;
     const prompt = `${instruction}\n\n${outputContract}\n\nLasso has already assembled this source context:\n${context || "No matching source context was found."}`;
     const local = localCommand(config.provider, config.model, prompt);
     const command = local.command;

package/dist/cli/bridge.js

@@ -136,6 +136,9 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
     const wss = new ws_1.WebSocketServer({ server: bridgeServer });
     let overlaySocket = null;
     let lastSnapshot = [];
+    let lastEditRequest = null;
+    let lastEditConfig = null;
+    let reviewRefreshAttempts = 0;
     const envRoots = [cwd, node_path_1.default.join(cwd, "web"), node_path_1.default.join(cwd, "server")];
     const fileEnv = envRoots.reduce((values, root) => ({
         ...values,
@@ -310,6 +313,9 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
                 const selectedConfig = localProvider
                     ? { provider: cliProvider, model: msg.model }
                     : { ...agentConfig, provider: (msg.provider || agentConfig.provider), model: msg.model };
+                lastEditRequest = msg;
+                lastEditConfig = selectedConfig;
+                reviewRefreshAttempts = 0;
                 void (0, agent_1.proposeChanges)(cwd, msg, selectedConfig, controller.signal, (message, detail) => {
                     if (!controller.signal.aborted && socket.readyState === socket.OPEN) {
                         socket.send(JSON.stringify({ type: "agent_status", status: "working", message, detail }));
@@ -463,7 +469,37 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
                     for (const snapshot of lastSnapshot)
                         node_fs_1.default.writeFileSync(snapshot.filePath, snapshot.content);
                     lastSnapshot = [];
-                    socket.send(JSON.stringify({ type: "agent_status", status: "error", message: error instanceof Error ? error.message : "The change could not be applied." }));
+                    const message = error instanceof Error ? error.message : "The change could not be applied.";
+                    const sourceChanged = message.includes("The source changed after the suggestion was generated");
+                    if (sourceChanged && lastEditRequest && lastEditConfig && reviewRefreshAttempts < 1) {
+                        reviewRefreshAttempts += 1;
+                        socket.send(JSON.stringify({ type: "agent_status", status: "working", message: "The source changed. Refreshing the review against the current file…" }));
+                        activeAgentController?.abort();
+                        const controller = new AbortController();
+                        activeAgentController = controller;
+                        void (0, agent_1.proposeChanges)(cwd, lastEditRequest, lastEditConfig, controller.signal, (progress, detail) => {
+                            if (!controller.signal.aborted && socket.readyState === socket.OPEN) {
+                                socket.send(JSON.stringify({ type: "agent_status", status: "working", message: progress, detail }));
+                            }
+                        })
+                            .then((proposal) => {
+                            if (!controller.signal.aborted && socket.readyState === socket.OPEN) {
+                                socket.send(JSON.stringify({ type: "agent_status", status: "review", message: `Review refreshed: ${proposal.summary}`, changes: proposal.changes }));
+                            }
+                        })
+                            .catch((refreshError) => {
+                            if (!controller.signal.aborted && socket.readyState === socket.OPEN) {
+                                socket.send(JSON.stringify({ type: "agent_status", status: "error", message: refreshError instanceof Error ? refreshError.message : "The refreshed review could not be prepared." }));
+                            }
+                        })
+                            .finally(() => {
+                            if (activeAgentController === controller)
+                                activeAgentController = null;
+                        });
+                    }
+                    else {
+                        socket.send(JSON.stringify({ type: "agent_status", status: "error", message }));
+                    }
                 }
             }
             else if (msg.type === "undo") {

package/package.json

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