@lasso-ai/cli 2.1.9 → 2.1.11

package/dist/cli/bridge.js

@@ -523,7 +523,7 @@ async function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort
         }
     }
     // Handler for edit/ask - uses runtime
-    async function handleHostedConversation(taskId, prompt, model, provider, messages, socket, signal) {
+    async function handleHostedConversation(taskId, prompt, model, provider, messages, socket, signal, conversationId) {
         const requestController = new AbortController();
         const abortRequest = () => requestController.abort();
         signal.addEventListener("abort", abortRequest, { once: true });
@@ -549,6 +549,8 @@ async function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort
                     prompt,
                     model: { id: model, provider },
                     messages: Array.isArray(messages) ? messages : undefined,
+                    conversationId: conversationId || undefined,
+                    projectId: projectId || undefined,
                 }),
                 signal: requestController.signal,
             });
@@ -606,7 +608,7 @@ async function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort
         taskControllers.set(taskId, controller);
         const isLocalAgent = ["claude_code", "opencode", "codex_cli", "cursor"].includes(provider || "");
         if ((message.type === "ask" || isConversationalPrompt(instruction)) && !isLocalAgent) {
-            await handleHostedConversation(taskId, instruction, model, provider, messages, socket, controller.signal);
+            await handleHostedConversation(taskId, instruction, model, provider, messages, socket, controller.signal, message.conversationId);
             return;
         }
         // Do not echo the user's prompt into the thinking feed. The prompt is
@@ -935,7 +937,7 @@ async function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort
         try {
             const isLocalAgent = ["claude_code", "opencode", "codex_cli", "cursor"].includes(provider || "");
             if (isConversationalPrompt(prompt) && !isLocalAgent) {
-                await handleHostedConversation(taskId, prompt, model, provider, message.messages, socket, controller.signal);
+                await handleHostedConversation(taskId, prompt, model, provider, message.messages, socket, controller.signal, message.conversationId);
                 return;
             }
             const backendModelId = (0, backends_1.modelIdForBackend)(model || "", provider || "");

package/dist/overlay.js

@@ -19679,6 +19679,63 @@
       return null;
     }
   }
+  function getStorageProjectKey() {
+    const proj = state.collab?.projectId || state.collabProjectId || "default";
+    return `lasso:sessions:${proj}`;
+  }
+  function saveLocalSession() {
+    try {
+      const projKey = getStorageProjectKey();
+      if (!activeConversationId) {
+        activeConversationId = `local-session-${Date.now()}`;
+      }
+      const sessionData = {
+        id: activeConversationId,
+        messages: commandMessages,
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        title: commandMessages.find((m) => m.role === "user")?.content?.slice(0, 80) || "Untitled Session"
+      };
+      localStorage.setItem(`lasso:session:${activeConversationId}`, JSON.stringify(sessionData));
+      const listRaw = localStorage.getItem(projKey);
+      let list2 = listRaw ? JSON.parse(listRaw) : [];
+      list2 = list2.filter((item) => item.id !== activeConversationId);
+      list2.unshift({
+        id: activeConversationId,
+        title: sessionData.title,
+        updatedAt: sessionData.updatedAt
+      });
+      localStorage.setItem(projKey, JSON.stringify(list2.slice(0, 30)));
+    } catch (err) {
+    }
+  }
+  function loadLocalSession(convId) {
+    try {
+      const raw = localStorage.getItem(`lasso:session:${convId}`);
+      if (!raw) return false;
+      const session = JSON.parse(raw);
+      if (session && Array.isArray(session.messages)) {
+        commandMessages = session.messages;
+        activeConversationId = convId;
+        renderMessages();
+        scrollToBottom();
+        return true;
+      }
+    } catch {
+    }
+    return false;
+  }
+  function restoreLatestSession() {
+    try {
+      const projKey = getStorageProjectKey();
+      const listRaw = localStorage.getItem(projKey);
+      if (!listRaw) return;
+      const list2 = JSON.parse(listRaw);
+      if (list2 && list2.length > 0 && !activeConversationId) {
+        loadLocalSession(list2[0].id);
+      }
+    } catch {
+    }
+  }
   async function createServerConversation(scope2 = "private") {
     const projectId = state.collab?.projectId || state.collabProjectId;
     if (!projectId) return null;
@@ -19690,10 +19747,29 @@
   }
   async function loadConversationList() {
     const projectId = state.collab?.projectId || state.collabProjectId;
+    try {
+      const projKey = getStorageProjectKey();
+      const listRaw = localStorage.getItem(projKey);
+      if (listRaw) {
+        const localList = JSON.parse(listRaw);
+        conversationList = localList.map((item) => ({
+          id: item.id,
+          title: item.title,
+          scope: "local",
+          updatedAt: item.updatedAt
+        }));
+      }
+    } catch {
+    }
     if (!projectId) return;
     const data6 = await apiFetch(`/agent/conversations?projectId=${encodeURIComponent(projectId)}`);
-    if (data6?.conversations) {
-      conversationList = data6.conversations;
+    if (data6?.conversations && Array.isArray(data6.conversations)) {
+      const serverIds = new Set(data6.conversations.map((c) => c.id));
+      const merged = [
+        ...data6.conversations,
+        ...conversationList.filter((local) => !serverIds.has(local.id))
+      ];
+      conversationList = merged;
     }
   }
   function formatDateAgo(dateStr) {
@@ -19745,6 +19821,9 @@
     activeConversationId = convId;
     if (commandHistoryPopover) commandHistoryPopover.hidden = true;
     commandHistoryBtn?.classList.remove("active");
+    if (loadLocalSession(convId)) {
+      return;
+    }
     const data6 = await apiFetch(`/agent/conversations/${convId}`);
     if (data6?.conversation?.messages && Array.isArray(data6.conversation.messages)) {
       commandMessages = data6.conversation.messages.map((m, idx) => ({
@@ -19762,6 +19841,7 @@
         changesApplied: m.changesApplied,
         error: m.error
       }));
+      saveLocalSession();
     } else {
       commandMessages = [];
     }
@@ -20214,6 +20294,36 @@
         }
         return;
       }
+      const fileCheck = target.closest(".lasso-command-file-check");
+      if (fileCheck) {
+        const msgId = fileCheck.closest(".lasso-command-msg")?.dataset.msgId;
+        const filePath = fileCheck.dataset.filePath;
+        const msg = commandMessages.find((m) => m.id === msgId);
+        if (msg && filePath) {
+          msg.rejectedFilePaths = msg.rejectedFilePaths || [];
+          if (fileCheck.checked) {
+            msg.rejectedFilePaths = msg.rejectedFilePaths.filter((p) => p !== filePath);
+          } else {
+            if (!msg.rejectedFilePaths.includes(filePath)) {
+              msg.rejectedFilePaths.push(filePath);
+            }
+          }
+          renderMessages();
+        }
+        return;
+      }
+      const viewFileDiffBtn = target.closest(".lasso-command-view-file-diff-btn");
+      if (viewFileDiffBtn) {
+        const msgId = viewFileDiffBtn.closest(".lasso-command-msg")?.dataset.msgId;
+        const filePath = viewFileDiffBtn.dataset.filePath;
+        const msg = commandMessages.find((m) => m.id === msgId);
+        if (msg && filePath) {
+          msg.activeDiffFile = filePath;
+          msg.showDiff = true;
+          renderMessages();
+        }
+        return;
+      }
       const diffToggle = target.closest(".lasso-command-toggle-diff");
       if (diffToggle) {
         const msgId = diffToggle.closest(".lasso-command-msg")?.dataset.msgId;
@@ -20229,6 +20339,12 @@
         const msgId = applyBtn.closest(".lasso-command-msg")?.dataset.msgId;
         const msg = commandMessages.find((m) => m.id === msgId);
         if (msg && msg.changes?.length && state.bridgeSocket?.readyState === WebSocket.OPEN) {
+          const rejected = new Set(msg.rejectedFilePaths || []);
+          const approvedChanges = msg.changes.filter((c) => !rejected.has(c.filePath));
+          if (approvedChanges.length === 0) {
+            alert("Please select at least one file to keep.");
+            return;
+          }
           applyBtn.disabled = true;
           applyBtn.textContent = "Applying\u2026";
           state.runtimeErrors = [];
@@ -20236,7 +20352,7 @@
             JSON.stringify({
               type: "apply",
               taskId: msg.id,
-              changes: msg.changes
+              changes: approvedChanges
             })
           );
         }
@@ -20258,6 +20374,12 @@
         }
         return;
       }
+      const continueBtn = target.closest(".lasso-command-continue-btn");
+      if (continueBtn) {
+        const msgId = continueBtn.closest(".lasso-command-msg")?.dataset.msgId;
+        continueWithThoughts(msgId);
+        return;
+      }
       const retryBtn = target.closest(".lasso-command-retry-btn");
       if (retryBtn) {
         const msgId = retryBtn.closest(".lasso-command-msg")?.dataset.msgId;
@@ -20289,6 +20411,9 @@
     updateEmptyStateUserName();
     renderSuggestions();
     populateModelMenu();
+    if (commandMessages.length === 0) {
+      restoreLatestSession();
+    }
     renderMessages();
     loadConversationList();
   }
@@ -20359,6 +20484,24 @@
     commandMessages.splice(failedIndex, 1);
     void runPrompt(promptToRetry, true);
   }
+  function continueWithThoughts(msgId) {
+    if (activeTaskId) return;
+    const targetMsg = msgId ? commandMessages.find((m) => m.id === msgId) : [...commandMessages].reverse().find((m) => m.role === "assistant");
+    if (!targetMsg) return;
+    const targetIndex = commandMessages.indexOf(targetMsg);
+    const precedingUserMsg = [...commandMessages].slice(0, targetIndex).reverse().find((m) => m.role === "user");
+    const originalPrompt = precedingUserMsg?.content || "";
+    const thoughtSummary = (targetMsg.thinking?.steps || []).map((s) => `- ${s.title}${s.detail ? `: ${s.detail}` : ""}`).join("\n");
+    const continuationPrompt = thoughtSummary ? `Continue executing the previous task: "${originalPrompt}".
+
+Here is your prior analysis and plan:
+${thoughtSummary}
+
+Please proceed directly with the implementation and code changes from this point.` : originalPrompt;
+    targetMsg.error = void 0;
+    saveLocalSession();
+    void runPrompt(continuationPrompt);
+  }
   async function handleSubmit() {
     if (!commandInput) return;
     if (activeTaskId) {
@@ -20539,26 +20682,22 @@
       }
       const hasChanges = Array.isArray(message.changes) && message.changes.length > 0;
       if (targetMsg.thinking) {
-        if (!hasChanges) {
-          targetMsg.thinking = void 0;
+        for (const step of targetMsg.thinking.steps) {
+          step.status = "completed";
+        }
+        targetMsg.thinking.completed = true;
+        targetMsg.thinking.expanded = false;
+        if (message.totalThinkingTimeMs) {
+          targetMsg.thinking.durationSeconds = Math.max(1, Math.round(message.totalThinkingTimeMs / 1e3));
         } else {
-          for (const step of targetMsg.thinking.steps) {
-            step.status = "completed";
-          }
-          targetMsg.thinking.completed = true;
-          targetMsg.thinking.expanded = false;
-          if (message.totalThinkingTimeMs) {
-            targetMsg.thinking.durationSeconds = Math.max(1, Math.round(message.totalThinkingTimeMs / 1e3));
-          } else {
-            targetMsg.thinking.durationSeconds = Math.max(1, Math.round((Date.now() - activeStartTime) / 1e3));
-          }
-          if (Array.isArray(message.thinking) && message.thinking.length) {
-            targetMsg.thinking.steps = message.thinking.map((s) => ({
-              title: s.title || "Completed step",
-              detail: s.detail,
-              status: "completed"
-            }));
-          }
+          targetMsg.thinking.durationSeconds = Math.max(1, Math.round((Date.now() - activeStartTime) / 1e3));
+        }
+        if (Array.isArray(message.thinking) && message.thinking.length) {
+          targetMsg.thinking.steps = message.thinking.map((s) => ({
+            title: s.title || "Completed step",
+            detail: s.detail,
+            status: "completed"
+          }));
         }
       }
       targetMsg.content = message.message || "";
@@ -20590,6 +20729,7 @@
           });
         }
       }
+      saveLocalSession();
       renderMessages();
       scrollToBottom();
     } else if (message.status === "error" || message.status === "stopped") {
@@ -20610,6 +20750,7 @@
         sessionId: state.collabProjectId,
         status: "idle"
       });
+      saveLocalSession();
       renderMessages();
       scrollToBottom();
     }
@@ -20639,7 +20780,13 @@
       clearInterval(activeThinkingInterval);
       activeThinkingInterval = null;
     }
-    targetMsg.thinking = void 0;
+    if (targetMsg.thinking) {
+      for (const step of targetMsg.thinking.steps) {
+        step.status = "completed";
+      }
+      targetMsg.thinking.completed = true;
+      targetMsg.thinking.expanded = false;
+    }
     const question = message.prompt?.question || message.message || "";
     targetMsg.content = question;
     targetMsg.isStreaming = false;
@@ -20688,10 +20835,18 @@
               <svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="10"/><line x1="12" y1="8" x2="12" y2="12"/><line x1="12" y1="16" x2="12.01" y2="16"/></svg>
               ${escapeHtml4(msg.error)}
             </div>
-            <button class="lasso-command-retry-btn" type="button" title="Retry with current model">
-              <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8"/><path d="M3 3v5h5"/></svg>
-              Retry
-            </button>
+            <div class="lasso-command-error-actions" style="display: flex; gap: 8px; margin-top: 6px; flex-wrap: wrap;">
+              ${msg.thinking && msg.thinking.steps.length > 0 ? `
+                <button class="lasso-command-continue-btn" type="button" title="Continue execution using the thoughts and analysis generated so far" style="display: inline-flex; align-items: center; gap: 5px; padding: 5px 10px; font-size: 12px; font-weight: 500; border-radius: 6px; background: rgba(59, 130, 246, 0.15); border: 1px solid rgba(59, 130, 246, 0.3); color: #93c5fd; cursor: pointer;">
+                  <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"><polygon points="5 3 19 12 5 21 5 3"/></svg>
+                  Continue with thoughts so far
+                </button>
+              ` : ""}
+              <button class="lasso-command-retry-btn" type="button" title="Retry from start" style="display: inline-flex; align-items: center; gap: 5px; padding: 5px 10px; font-size: 12px; font-weight: 500; border-radius: 6px; background: rgba(255, 255, 255, 0.08); border: 1px solid rgba(255, 255, 255, 0.15); color: #e2e8f0; cursor: pointer;">
+                <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8"/><path d="M3 3v5h5"/></svg>
+                Retry
+              </button>
+            </div>
           ` : ""}
         </div>
       `;
@@ -20766,7 +20921,9 @@
     const changes = msg.changes;
     const isApplied = msg.changesApplied;
     const isUndone = msg.changesUndone;
-    const showDiff = msg.showDiff;
+    const showDiff = msg.showDiff !== false;
+    const rejected = new Set(msg.rejectedFilePaths || []);
+    const activeFile = msg.activeDiffFile || changes[0]?.filePath;
     const scopeHtml = msg.todo && msg.todo.length ? `
     <div class="lasso-command-scope-list">
       ${msg.todo.map((item) => `
@@ -20778,34 +20935,43 @@
       `).join("")}
     </div>
   ` : "";
+    const approvedCount = changes.length - rejected.size;
     return `
     <div class="lasso-command-changes-card">
       <div class="lasso-command-changes-header">
         <div class="lasso-command-changes-title">
-          <svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+          <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
             <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/>
             <polyline points="14 2 14 8 20 8"/>
           </svg>
-          <span>${changes.length} file${changes.length === 1 ? "" : "s"} modified</span>
+          <span>Proposed changes (${approvedCount}/${changes.length} files selected)</span>
         </div>
         <button class="lasso-command-toggle-diff" type="button">
-          ${showDiff ? "Hide diff" : "View diff"}
+          ${showDiff ? "Hide diffs" : "Inspect diffs"}
         </button>
       </div>
       ${scopeHtml}
 
       <div class="lasso-command-files-list">
-        ${changes.map(
-      (c) => `
-          <div class="lasso-command-file-row">
+        ${changes.map((c) => {
+      const isExcluded = rejected.has(c.filePath);
+      const isSelected = activeFile === c.filePath;
+      return `
+          <div class="lasso-command-file-row ${isSelected ? "selected" : ""} ${isExcluded ? "excluded" : ""}" data-file-path="${escapeHtml4(c.filePath)}">
+            <label class="lasso-command-file-checkbox-label" title="${isExcluded ? "Click to include file" : "Click to exclude file"}">
+              <input type="checkbox" class="lasso-command-file-check" ${isExcluded ? "" : "checked"} data-file-path="${escapeHtml4(c.filePath)}" />
+            </label>
             <span class="lasso-command-file-badge ${c.oldString ? "modified" : "added"}">${c.oldString ? "M" : "+"}</span>
             <span class="lasso-command-file-name" title="${c.filePath}">${escapeHtml4(c.filePath)}</span>
+            <button class="lasso-command-view-file-diff-btn" type="button" data-file-path="${escapeHtml4(c.filePath)}" title="View diff for this file">
+              ${isSelected ? "Active" : "Inspect"}
+            </button>
           </div>
-        `
-    ).join("")}
+        `;
+    }).join("")}
       </div>
 
-      ${showDiff ? renderDiffPreview(changes) : ""}
+      ${showDiff ? renderDiffPreview(changes, activeFile, rejected) : ""}
 
       <div class="lasso-command-changes-footer">
         ${isApplied ? `
@@ -20821,7 +20987,7 @@
           <button class="lasso-command-apply-btn primary" type="button">Re-apply</button>
         ` : `
           <button class="lasso-command-apply-btn primary" type="button">
-            <span>Keep Changes</span>
+            <span>Keep Selected (${approvedCount})</span>
             <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5"><polyline points="20 6 9 17 4 12"/></svg>
           </button>
           <button class="lasso-command-undo-btn secondary" type="button">Discard</button>
@@ -20830,16 +20996,21 @@
     </div>
   `;
   }
-  function renderDiffPreview(changes) {
+  function renderDiffPreview(changes, activeFilePath, rejected) {
+    const filtered = activeFilePath ? changes.filter((c) => c.filePath === activeFilePath) : changes;
+    const listToRender = filtered.length > 0 ? filtered : changes;
     return `
     <div class="lasso-command-diff-container">
-      ${changes.map(
+      ${listToRender.map(
       (c) => `
-        <div class="lasso-command-diff-file">
-          <div class="lasso-command-diff-file-header">${escapeHtml4(c.filePath)}</div>
-          <pre class="lasso-command-diff-content">${c.operation === "deleted" || c.newString === "" && c.oldString !== "" ? `<span class="lasso-diff-del">- ${escapeHtml4(c.oldString.slice(0, 300))}</span>
-<span class="lasso-diff-del">(file deleted)</span>` : `${c.oldString ? `<span class="lasso-diff-del">- ${escapeHtml4(c.oldString.slice(0, 300))}</span>
-` : ""}${c.newString ? `<span class="lasso-diff-add">+ ${escapeHtml4(c.newString.slice(0, 300))}</span>` : ""}`}</pre>
+        <div class="lasso-command-diff-file ${rejected?.has(c.filePath) ? "excluded-diff" : ""}">
+          <div class="lasso-command-diff-file-header">
+            <span>${escapeHtml4(c.filePath)}</span>
+            ${rejected?.has(c.filePath) ? `<span style="color: #f87171; font-size: 11px; margin-left: 8px;">(Excluded from apply)</span>` : ""}
+          </div>
+          <pre class="lasso-command-diff-content">${c.operation === "deleted" || c.newString === "" && c.oldString !== "" ? `<span class="lasso-diff-del">- ${escapeHtml4(c.oldString.slice(0, 1e3))}</span>
+<span class="lasso-diff-del">(file deleted)</span>` : `${c.oldString ? `<span class="lasso-diff-del">- ${escapeHtml4(c.oldString.slice(0, 1e3))}</span>
+` : ""}${c.newString ? `<span class="lasso-diff-add">+ ${escapeHtml4(c.newString.slice(0, 1e3))}</span>` : ""}`}</pre>
         </div>
       `
     ).join("")}

package/package.json

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