@lasso-ai/cli 1.0.13 → 1.0.15

package/dist/cli/agent.js

@@ -49,17 +49,26 @@ async function sourceFiles(directory) {
     return files;
 }
 async function contextFor(cwd, element) {
-    const needle = element.sourceHint || element.label.replace(/^[^.#]+[.#]?/, "");
+    const needle = element.label.replace(/^[^.#]+[.#]?/, "");
     const hintedPath = element.sourceHint?.split(":")[0];
     const sourceFile = hintedPath ? node_path_1.default.basename(hintedPath) : "";
     if (hintedPath) {
-        const candidate = node_path_1.default.isAbsolute(hintedPath) ? hintedPath : node_path_1.default.resolve(cwd, hintedPath);
-        try {
-            const content = await promises_1.default.readFile(candidate, "utf8");
-            return `FILE: ${node_path_1.default.relative(cwd, candidate)}\n${content.slice(0, 16000)}`;
-        }
-        catch {
-            // Fall back to the indexed search when the runtime source hint is stale.
+        const candidates = [
+            node_path_1.default.isAbsolute(hintedPath) ? hintedPath : node_path_1.default.resolve(cwd, hintedPath),
+        ];
+        const normalizedHint = hintedPath.replace(/\\/g, "/");
+        const srcMarker = "/src/";
+        const srcIndex = normalizedHint.lastIndexOf(srcMarker);
+        if (srcIndex >= 0)
+            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)}`;
+            }
+            catch {
+                // The runtime source hint can point to a different checkout.
+            }
         }
     }
     const files = await sourceFiles(cwd);
@@ -82,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") {

package/dist/cli/bridge.js

@@ -52,6 +52,24 @@ function fileLineEnding(content) {
 function withLineEnding(value, lineEnding) {
     return value.replace(/\r\n?|\n/g, lineEnding);
 }
+function resolveProposedFile(cwd, proposedPath) {
+    const root = node_path_1.default.resolve(cwd);
+    const candidate = node_path_1.default.resolve(root, proposedPath);
+    if (candidate.startsWith(`${root}${node_path_1.default.sep}`) && node_fs_1.default.existsSync(candidate))
+        return candidate;
+    // Some React/Next source maps contain an absolute path from an older
+    // checkout. Rebase only the recognizable src/... suffix into this project.
+    const normalized = proposedPath.replace(/\\/g, "/");
+    const srcIndex = normalized.lastIndexOf("/src/");
+    if (srcIndex >= 0) {
+        const rebased = node_path_1.default.join(root, normalized.slice(srcIndex + 1));
+        if (rebased.startsWith(`${root}${node_path_1.default.sep}`) && node_fs_1.default.existsSync(rebased))
+            return rebased;
+    }
+    if (!candidate.startsWith(`${root}${node_path_1.default.sep}`))
+        throw new Error(`The proposed file is outside the current project: ${proposedPath}`);
+    throw new Error(`Could not find the proposed file in the current project: ${proposedPath}`);
+}
 function occurrenceCount(content, needle) {
     if (!needle)
         return 0;
@@ -419,9 +437,7 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
                     lastSnapshot = [];
                     const planned = new Map();
                     for (const change of msg.changes) {
-                        const filePath = node_path_1.default.resolve(cwd, change.filePath);
-                        if (!filePath.startsWith(`${node_path_1.default.resolve(cwd)}${node_path_1.default.sep}`))
-                            throw new Error("A proposed file was outside the project.");
+                        const filePath = resolveProposedFile(cwd, change.filePath);
                         const content = node_fs_1.default.readFileSync(filePath, "utf8");
                         const prepared = prepareChange(content, change);
                         const fileChanges = planned.get(filePath) || [];

package/package.json

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