@lasso-ai/cli 1.3.5 → 1.3.6

package/dist/cli/bridge.d.ts

@@ -1,6 +1,6 @@
 import { type SourceChange, type AgentPrompt } from "./agent";
 import type { CollabConfig } from "./project";
-import { type TimelineSnapshot, type ConflictInfo } from "./snapshot";
+import { type TimelineSnapshot } from "./snapshot";
 export declare const DEFAULT_BRIDGE_PORT = 3056;
 type GitState = {
     isRepo: boolean;
@@ -144,11 +144,6 @@ export type BridgeMessage = {
     }>;
     taskId?: string;
     pageContext?: any;
-} | {
-    type: "resolve_conflict";
-    taskId: string;
-    action: "retry" | "force" | "rebase";
-    conflicts: ConflictInfo[];
 } | {
     type: "restore_snapshot";
     snapshotId: string;
@@ -249,11 +244,6 @@ export type ServerBridgeMessage = {
     text?: string;
     provider?: string;
     error?: string;
-} | {
-    type: "conflict_detected";
-    taskId: string;
-    conflicts: ConflictInfo[];
-    message: string;
 } | {
     type: "timeline";
     snapshots: TimelineSnapshot[];

package/dist/cli/bridge.js

@@ -1183,29 +1183,47 @@ async function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort
             }
             else if (msg.type === "apply") {
                 try {
-                    // 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: ${msg.changes.length} file${msg.changes.length === 1 ? "" : "s"}`, filePaths, parentSnapshot?.id);
-                    const snapshots = [];
-                    const planned = new Map();
-                    // Check for conflicts before applying
-                    const expectedFiles = msg.changes.map(change => ({
-                        filePath: change.filePath,
-                        content: change.oldString || null,
+                    socket.send(JSON.stringify({
+                        type: "agent_status",
+                        taskId: msg.taskId,
+                        status: "working",
+                        message: "Re-generating changes with current file state..."
                     }));
-                    const conflicts = (0, snapshot_1.detectConflicts)(cwd, expectedFiles);
-                    if (conflicts.length > 0) {
+                    // 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: "conflict_detected",
+                            type: "agent_status",
                             taskId: msg.taskId,
-                            conflicts,
-                            message: `Conflict detected in ${conflicts.length} file${conflicts.length === 1 ? "" : "s"}. The source has changed since the suggestion was generated.`
+                            status: "error",
+                            message: "Could not re-generate changes: original request not found."
                         }));
                         return;
                     }
-                    for (const change of msg.changes) {
+                    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))];
+                    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 snapshots = [];
+                    const planned = new Map();
+                    for (const change of freshProposal.changes) {
                         const isNew = !change.oldString;
                         const filePath = resolveProposedFile(cwd, change.filePath, true);
                         const exists = node_fs_1.default.existsSync(filePath);
@@ -1220,8 +1238,7 @@ async function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort
                         fileChanges.push({ filePath, content, exists, ...prepared });
                         planned.set(filePath, fileChanges);
                     }
-                    // Validate every change before writing any file, then apply each
-                    // file's replacements from the end toward the beginning.
+                    // Apply each file's replacements from the end toward the beginning
                     taskSnapshots.set(msg.taskId, snapshots);
                     for (const [filePath, changes] of planned) {
                         const exists = changes[0].exists;
@@ -1236,7 +1253,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: ${msg.changes.length} file${msg.changes.length === 1 ? "" : "s"}`, filePaths, preSnapshot.id);
+                    (0, snapshot_1.createSnapshot)(cwd, msg.taskId, `Applied: ${freshProposal.changes.length} file${freshProposal.changes.length === 1 ? "" : "s"}`, filePaths, preSnapshot.id);
                     // Run build validation after applying changes
                     const validation = await validateBuild(cwd);
                     if (!validation.passed) {
@@ -1253,23 +1270,22 @@ async function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort
                         buildErrorContext.set(msg.taskId, {
                             errors: validation.errors,
                             command: validation.command,
-                            originalChanges: msg.changes,
+                            originalChanges: freshProposal.changes,
                             retryCount: 0
                         });
                         // Trigger automatic build fix
-                        await triggerBuildFix(cwd, msg.taskId, validation.errors, validation.command, msg.changes, resolvedLassoKey, agentConfig, collabConfig, socket, taskControllers, taskSnapshots, buildErrorContext);
+                        await triggerBuildFix(cwd, msg.taskId, validation.errors, validation.command, freshProposal.changes, resolvedLassoKey, agentConfig, collabConfig, socket, taskControllers, taskSnapshots, buildErrorContext);
                         return;
                     }
                     socket.send(JSON.stringify({
                         type: "applied",
                         taskId: msg.taskId,
-                        message: `${msg.changes.length} file${msg.changes.length === 1 ? "" : "s"} updated. Your dev server will reload.`,
+                        message: `${freshProposal.changes.length} file${freshProposal.changes.length === 1 ? "" : "s"} updated. Your dev server will reload.`,
                         validation
                     }));
                 }
                 catch (error) {
-                    // Validation happens before writes, but restore this task's snapshot
-                    // if a filesystem error occurs during the write phase.
+                    // Restore this task's snapshot if a filesystem error occurs
                     for (const snapshot of taskSnapshots.get(msg.taskId) || []) {
                         if (snapshot.content === null) {
                             if (node_fs_1.default.existsSync(snapshot.filePath))
@@ -1281,18 +1297,11 @@ async function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort
                     }
                     taskSnapshots.delete(msg.taskId);
                     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");
-                    const editRequest = editRequests.get(msg.taskId);
-                    const editConfig = editConfigs.get(msg.taskId);
-                    const refreshAttempts = reviewRefreshAttempts.get(msg.taskId) || 0;
-                    if (sourceChanged && editRequest && editConfig && refreshAttempts < 1) {
-                        reviewRefreshAttempts.set(msg.taskId, refreshAttempts + 1);
-                        enqueueTask(msg.taskId, editRequest, editConfig, 0);
-                        socket.send(JSON.stringify({ type: "agent_status", taskId: msg.taskId, status: "working", message: "The source changed. Refreshing the review against the current file…" }));
-                    }
-                    else {
-                        socket.send(JSON.stringify({ type: "agent_status", taskId: msg.taskId, status: "error", message }));
-                    }
+                    socket.send(JSON.stringify({ type: "agent_status", taskId: msg.taskId, status: "error", message }));
+                }
+                finally {
+                    if (taskControllers.get(msg.taskId))
+                        taskControllers.delete(msg.taskId);
                 }
             }
             else if (msg.type === "undo") {
@@ -1309,95 +1318,6 @@ async function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort
                 taskSnapshots.delete(msg.taskId || "");
                 socket.send(JSON.stringify({ type: "undone", taskId: msg.taskId, message: snapshots.length ? "The accepted change was reverted." : "There is no accepted change to undo." }));
             }
-            else if (msg.type === "resolve_conflict") {
-                const { taskId, action, conflicts } = msg;
-                if (action === "retry") {
-                    // Re-run the edit request with current file content
-                    const editRequest = editRequests.get(taskId);
-                    const editConfig = editConfigs.get(taskId);
-                    if (editRequest && editConfig) {
-                        reviewRefreshAttempts.set(taskId, 0);
-                        enqueueTask(taskId, editRequest, editConfig, 0);
-                        socket.send(JSON.stringify({ type: "agent_status", taskId, status: "working", message: "Retrying with current file content..." }));
-                    }
-                    else {
-                        socket.send(JSON.stringify({ type: "agent_status", taskId, status: "error", message: "Could not retry: original request not found." }));
-                    }
-                }
-                else if (action === "force") {
-                    // Force apply despite conflicts (user's choice)
-                    try {
-                        const snapshots = [];
-                        const planned = new Map();
-                        // Get the original changes from the edit request
-                        const editRequest = editRequests.get(taskId);
-                        if (!editRequest) {
-                            socket.send(JSON.stringify({ type: "agent_status", taskId, status: "error", message: "Could not force apply: original request not found." }));
-                            return;
-                        }
-                        // Re-prepare changes with current content (may fail, but that's expected)
-                        for (const change of editRequest.changesHistory?.[editRequest.changesHistory.length - 1]?.changes || []) {
-                            const isNew = !change.oldString;
-                            const filePath = resolveProposedFile(cwd, change.filePath, true);
-                            const exists = node_fs_1.default.existsSync(filePath);
-                            const content = exists ? node_fs_1.default.readFileSync(filePath, "utf8") : "";
-                            const prepared = (!exists || isNew)
-                                ? { start: 0, end: content.length, oldString: content, newString: change.newString }
-                                : prepareChange(content, change);
-                            const fileChanges = planned.get(filePath) || [];
-                            if (fileChanges.some((item) => prepared.start < item.end && item.start < prepared.end)) {
-                                throw new Error(`Could not safely apply ${change.filePath}. Proposed changes overlap.`);
-                            }
-                            fileChanges.push({ filePath, content, exists, ...prepared });
-                            planned.set(filePath, fileChanges);
-                        }
-                        taskSnapshots.set(taskId, snapshots);
-                        for (const [filePath, changes] of planned) {
-                            const exists = changes[0].exists;
-                            const content = changes[0].content;
-                            snapshots.push({ filePath, content: exists ? content : null });
-                            const nextContent = exists
-                                ? [...changes]
-                                    .sort((a, b) => b.start - a.start)
-                                    .reduce((value, change) => value.slice(0, change.start) + change.newString + value.slice(change.end), content)
-                                : changes[0].newString;
-                            node_fs_1.default.mkdirSync(node_path_1.default.dirname(filePath), { recursive: true });
-                            node_fs_1.default.writeFileSync(filePath, nextContent);
-                        }
-                        socket.send(JSON.stringify({
-                            type: "applied",
-                            taskId,
-                            message: "Changes force-applied despite conflicts."
-                        }));
-                    }
-                    catch (error) {
-                        for (const snapshot of taskSnapshots.get(taskId) || []) {
-                            if (snapshot.content === null) {
-                                if (node_fs_1.default.existsSync(snapshot.filePath))
-                                    node_fs_1.default.unlinkSync(snapshot.filePath);
-                            }
-                            else {
-                                node_fs_1.default.writeFileSync(snapshot.filePath, snapshot.content);
-                            }
-                        }
-                        taskSnapshots.delete(taskId);
-                        socket.send(JSON.stringify({ type: "agent_status", taskId, status: "error", message: error instanceof Error ? error.message : "Force apply failed." }));
-                    }
-                }
-                else if (action === "rebase") {
-                    // User wants to rebase - re-run the edit with updated context
-                    const editRequest = editRequests.get(taskId);
-                    const editConfig = editConfigs.get(taskId);
-                    if (editRequest && editConfig) {
-                        reviewRefreshAttempts.set(taskId, 0);
-                        enqueueTask(taskId, editRequest, editConfig, 0);
-                        socket.send(JSON.stringify({ type: "agent_status", taskId, status: "working", message: "Rebasing changes against current file content..." }));
-                    }
-                    else {
-                        socket.send(JSON.stringify({ type: "agent_status", taskId, status: "error", message: "Could not rebase: original request not found." }));
-                    }
-                }
-            }
             else if (msg.type === "restore_snapshot") {
                 const success = (0, snapshot_1.restoreSnapshot)(cwd, msg.snapshotId);
                 socket.send(JSON.stringify({

package/dist/overlay.js

@@ -10556,127 +10556,6 @@
       color: var(--lo-text-2);
     }
 
-    /* ==========================================================
-       CONFLICT PANEL
-       ========================================================== */
-
-    .lasso-conflict {
-      position: fixed;
-      width: min(540px, calc(100vw - 24px));
-      max-height: min(400px, calc(100vh - 24px));
-      overflow: auto;
-      padding: 18px;
-      border: 1px solid #f59e0b;
-      border-radius: var(--lo-radius-xl);
-      background: rgba(30, 27, 22, 0.98);
-      backdrop-filter: blur(24px);
-      -webkit-backdrop-filter: blur(24px);
-      color: var(--lo-text);
-      box-shadow: 0 20px 48px rgba(0, 0, 0, 0.6), 0 0 0 1px rgba(245, 158, 11, 0.2);
-      pointer-events: auto;
-      font-family: inherit;
-      z-index: 25;
-    }
-
-    .lasso-conflict[hidden] {
-      display: none;
-    }
-
-    .lasso-conflict-header {
-      display: flex;
-      align-items: flex-start;
-      justify-content: space-between;
-      gap: 16px;
-      margin-bottom: 14px;
-    }
-
-    .lasso-conflict-title {
-      margin: 0;
-      font-size: 15px;
-      font-weight: 700;
-      color: #f59e0b;
-    }
-
-    .lasso-conflict-subtitle {
-      margin: 4px 0 0;
-      color: var(--lo-text-2);
-      font-size: 12px;
-      line-height: 1.4;
-    }
-
-    .lasso-conflict-close {
-      border: 0;
-      background: transparent;
-      color: var(--lo-text-3);
-      font-size: 18px;
-      cursor: pointer;
-    }
-
-    .lasso-conflict-close:hover {
-      color: var(--lo-text);
-    }
-
-    .lasso-conflict-file {
-      margin-top: 10px;
-      overflow: hidden;
-      border: 1px solid var(--lo-border);
-      border-radius: var(--lo-radius-md);
-    }
-
-    .lasso-conflict-file-name {
-      padding: 8px 10px;
-      background: rgba(245, 158, 11, 0.1);
-      color: #f59e0b;
-      font: 600 11px/1.2 var(--lo-font-mono);
-    }
-
-    .lasso-conflict-details {
-      padding: 10px;
-      font-size: 11px;
-      color: var(--lo-text-2);
-    }
-
-    .lasso-conflict-hash {
-      display: flex;
-      flex-direction: column;
-      gap: 4px;
-      font-family: var(--lo-font-mono);
-    }
-
-    .lasso-conflict-actions {
-      display: flex;
-      justify-content: flex-end;
-      gap: 8px;
-      margin-top: 16px;
-    }
-
-    .lasso-conflict-actions button {
-      min-height: 34px;
-      padding: 0 14px;
-      border: 1px solid var(--lo-border);
-      border-radius: var(--lo-radius-md);
-      background: var(--lo-surface-2);
-      color: var(--lo-text);
-      font: 600 12px/1 inherit;
-      cursor: pointer;
-      transition: background 120ms ease, transform 120ms ease;
-    }
-
-    .lasso-conflict-actions button:hover {
-      background: var(--lo-surface-hover);
-      transform: translateY(-1px);
-    }
-
-    .lasso-conflict-force {
-      border-color: #f59e0b;
-      background: rgba(245, 158, 11, 0.1);
-      color: #f59e0b;
-    }
-
-    .lasso-conflict-force:hover {
-      background: rgba(245, 158, 11, 0.2);
-    }
-
     /* ==========================================================
        TIMELINE PANEL
        ========================================================== */
@@ -21874,13 +21753,6 @@
               }
             }
           }
-          if (message.type === "conflict_detected" && message.conflicts && message.taskId) {
-            const taskId2 = message.taskId;
-            if (taskId2 === state.promptTaskId) {
-              showConflict(message.conflicts, message.message);
-            }
-            void notifyAgent("Conflict detected", message.message);
-          }
           if (message.type === "timeline" && message.snapshots) {
             state.timelineSnapshots = message.snapshots;
             showTimeline();
@@ -22206,7 +22078,6 @@ The agent is automatically attempting to fix the build errors...`;
   var reviewPanel = null;
   var agentPromptPanel = null;
   var agentPromptTaskId = null;
-  var conflictPanel = null;
   var timelinePanel = null;
   var modelBtn = null;
   var modelName = null;
@@ -22427,30 +22298,6 @@ The agent is automatically attempting to fix the build errors...`;
   `;
     dom.shadow.appendChild(rev);
     reviewPanel = rev;
-    const conflict = document.createElement("div");
-    conflict.className = "lasso-conflict";
-    conflict.hidden = true;
-    conflict.innerHTML = `
-    <div class="lasso-conflict-header">
-      <div>
-        <h3 class="lasso-conflict-title">\u26A0\uFE0F Source conflict detected</h3>
-        <p class="lasso-conflict-subtitle">The file(s) have changed since the suggestion was generated.</p>
-      </div>
-      <button class="lasso-conflict-close" type="button" aria-label="Close conflict panel">\xD7</button>
-    </div>
-    <div class="lasso-conflict-files"></div>
-    <div class="lasso-conflict-actions">
-      <button class="lasso-conflict-retry" type="button">Retry with current content</button>
-      <button class="lasso-conflict-rebase" type="button">Rebase changes</button>
-      <button class="lasso-conflict-force" type="button">Force apply</button>
-    </div>
-  `;
-    dom.shadow.appendChild(conflict);
-    conflictPanel = conflict;
-    conflict.querySelector(".lasso-conflict-close").addEventListener("click", closeConflict2);
-    conflict.querySelector(".lasso-conflict-retry").addEventListener("click", () => resolveConflict("retry"));
-    conflict.querySelector(".lasso-conflict-rebase").addEventListener("click", () => resolveConflict("rebase"));
-    conflict.querySelector(".lasso-conflict-force").addEventListener("click", () => resolveConflict("force"));
     const timeline = document.createElement("div");
     timeline.className = "lasso-timeline";
     timeline.hidden = true;
@@ -23077,7 +22924,6 @@ The agent is automatically attempting to fix the build errors...`;
   }
   function hideReview() {
     if (reviewPanel) reviewPanel.hidden = true;
-    closeConflict2();
   }
   function resetPromptSession(element = state.selected) {
     state.promptTaskId = null;
@@ -23179,54 +23025,6 @@ The agent is automatically attempting to fix the build errors...`;
     hideReview();
     resetAgentState();
   }
-  function showConflict(conflicts, message) {
-    if (!conflictPanel) return;
-    const subtitle = conflictPanel.querySelector(".lasso-conflict-subtitle");
-    const files = conflictPanel.querySelector(".lasso-conflict-files");
-    if (!subtitle || !files) return;
-    subtitle.textContent = message;
-    files.replaceChildren(
-      ...conflicts.map((conflict) => {
-        const file = document.createElement("div");
-        file.className = "lasso-conflict-file";
-        const name = document.createElement("div");
-        name.className = "lasso-conflict-file-name";
-        name.textContent = conflict.filePath;
-        const details = document.createElement("div");
-        details.className = "lasso-conflict-details";
-        details.innerHTML = `
-        <div class="lasso-conflict-hash">
-          <span>Expected: ${conflict.expectedHash.slice(0, 8)}...</span>
-          <span>Actual: ${conflict.actualHash.slice(0, 8)}...</span>
-        </div>
-      `;
-        file.append(name, details);
-        return file;
-      })
-    );
-    conflictPanel.hidden = false;
-    const left = Math.max(12, (window.innerWidth - Math.min(520, window.innerWidth - 24)) / 2);
-    const top = Math.max(12, (window.innerHeight - Math.min(400, window.innerHeight - 24)) / 2);
-    conflictPanel.style.left = `${left}px`;
-    conflictPanel.style.top = `${top}px`;
-  }
-  function closeConflict2() {
-    if (!conflictPanel) return;
-    conflictPanel.hidden = true;
-  }
-  function resolveConflict(action) {
-    const taskId2 = state.promptTaskId;
-    if (!taskId2 || !state.bridgeSocket || state.bridgeSocket.readyState !== WebSocket.OPEN) return;
-    state.bridgeSocket.send(JSON.stringify({
-      type: "resolve_conflict",
-      taskId: taskId2,
-      action,
-      conflicts: []
-      // Bridge will re-detect conflicts
-    }));
-    closeConflict2();
-    closeReview();
-  }
   function showTimeline() {
     if (!timelinePanel) return;
     const list2 = timelinePanel.querySelector(".lasso-timeline-list");

package/package.json

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