@lasso-ai/cli 1.0.15 → 1.0.17

package/dist/cli/agent.js

@@ -314,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

@@ -114,6 +114,18 @@ function prepareChange(content, change) {
     const start = content.indexOf(oldString);
     return { start, end: start + oldString.length, oldString, newString };
 }
+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);
+        }
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 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) => {
@@ -136,6 +148,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,
@@ -254,6 +269,43 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
             if (socket.readyState === socket.OPEN)
                 socket.send(JSON.stringify({ type: "git_state", git }));
         });
+        const runEditReview = (request, config, statusMessage) => {
+            activeAgentController?.abort();
+            const controller = new AbortController();
+            activeAgentController = controller;
+            if (statusMessage && socket.readyState === socket.OPEN) {
+                socket.send(JSON.stringify({ type: "agent_status", status: "working", message: statusMessage }));
+            }
+            void (0, agent_1.proposeChanges)(cwd, request, config, controller.signal, (message, detail) => {
+                if (!controller.signal.aborted && socket.readyState === socket.OPEN) {
+                    socket.send(JSON.stringify({ type: "agent_status", status: "working", message, detail }));
+                }
+            })
+                .then((proposal) => {
+                if (controller.signal.aborted || socket.readyState !== socket.OPEN)
+                    return;
+                if (!proposalMatchesCurrentSource(cwd, proposal.changes)) {
+                    if (reviewRefreshAttempts < 1) {
+                        reviewRefreshAttempts += 1;
+                        runEditReview(request, config, "The source changed while the proposal was being prepared. Refreshing the review…");
+                    }
+                    else {
+                        socket.send(JSON.stringify({ type: "agent_status", status: "error", message: "The source is still changing. Stop the dev-server edit or try the request again." }));
+                    }
+                    return;
+                }
+                socket.send(JSON.stringify({ type: "agent_status", 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", status: "error", message: error instanceof Error ? error.message : "The agent could not prepare a change." }));
+                }
+            })
+                .finally(() => {
+                if (activeAgentController === controller)
+                    activeAgentController = null;
+            });
+        };
         socket.on("message", async (raw) => {
             const msg = JSON.parse(raw.toString());
             if (msg.type === "edit" || msg.type === "ask") {
@@ -304,31 +356,13 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
                     socket.send(JSON.stringify({ type: "agent_status", status: "error", message: "Add a supported agent key: GOOGLE_GENERATIVE_AI_API_KEY, OPENAI_API_KEY, or ANTHROPIC_API_KEY." }));
                     return;
                 }
-                activeAgentController?.abort();
-                const controller = new AbortController();
-                activeAgentController = controller;
                 const selectedConfig = localProvider
                     ? { provider: cliProvider, model: msg.model }
                     : { ...agentConfig, provider: (msg.provider || agentConfig.provider), model: msg.model };
-                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 }));
-                    }
-                })
-                    .then((proposal) => {
-                    if (!controller.signal.aborted)
-                        socket.send(JSON.stringify({ type: "agent_status", status: "review", message: proposal.summary, changes: proposal.changes }));
-                })
-                    .catch((error) => {
-                    if (controller.signal.aborted)
-                        return;
-                    const message = error instanceof Error ? error.message : "The agent could not prepare a change.";
-                    socket.send(JSON.stringify({ type: "agent_status", status: "error", message }));
-                })
-                    .finally(() => {
-                    if (activeAgentController === controller)
-                        activeAgentController = null;
-                });
+                lastEditRequest = msg;
+                lastEditConfig = selectedConfig;
+                reviewRefreshAttempts = 0;
+                runEditReview(msg, selectedConfig);
             }
             else if (msg.type === "stop") {
                 activeAgentController?.abort();
@@ -463,7 +497,14 @@ 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) {
+                        runEditReview(lastEditRequest, lastEditConfig, "The source changed. Refreshing the review against the current file…");
+                    }
+                    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.15",
+  "version": "1.0.17",
   "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",