@lasso-ai/cli 1.0.19 → 1.0.21

package/dist/cli/bridge.d.ts

@@ -134,6 +134,9 @@ export type ServerBridgeMessage = {
     type: "git_result";
     message?: string;
     error?: string;
+} | {
+    type: "git_progress";
+    message: string;
 } | {
     type: "git_commit_message";
     message?: string;

package/dist/cli/bridge.js

@@ -277,8 +277,8 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
             taskControllers.get(request.taskId)?.abort();
             const controller = new AbortController();
             taskControllers.set(request.taskId, controller);
-            if (statusMessage && socket.readyState === socket.OPEN) {
-                socket.send(JSON.stringify({ type: "agent_status", taskId: request.taskId, status: "working", message: statusMessage }));
+            if (socket.readyState === socket.OPEN) {
+                socket.send(JSON.stringify({ type: "agent_status", taskId: request.taskId, status: "working", message: statusMessage || "Starting agent…" }));
             }
             void (0, agent_1.proposeChanges)(cwd, request, config, controller.signal, (message, detail) => {
                 if (!controller.signal.aborted && socket.readyState === socket.OPEN) {
@@ -336,6 +336,7 @@ 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 };
+                socket.send(JSON.stringify({ type: "agent_status", taskId: msg.taskId, status: "working", message: "Starting agent…" }));
                 void (0, agent_1.answerQuestion)(cwd, { question: msg.question, context: msg.context, element: msg.element, messages: msg.messages }, selectedConfig, controller.signal, (message, detail) => {
                     if (!controller.signal.aborted && socket.readyState === socket.OPEN)
                         socket.send(JSON.stringify({ type: "agent_status", taskId: msg.taskId, status: "working", message, detail }));
@@ -396,10 +397,10 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
                 const controller = new AbortController();
                 activeAgentController?.abort();
                 activeAgentController = controller;
-                socket.send(JSON.stringify({ type: "agent_status", status: "thinking", message: "Generating a commit message…" }));
+                socket.send(JSON.stringify({ type: "git_progress", message: "Generating a commit message…" }));
                 void getGitState(cwd).then((git) => (0, agent_1.generateCommitMessage)(cwd, git.status || [], selectedConfig, controller.signal, (message, detail) => {
                     if (!controller.signal.aborted && socket.readyState === socket.OPEN)
-                        socket.send(JSON.stringify({ type: "agent_status", status: "working", message, detail }));
+                        socket.send(JSON.stringify({ type: "git_progress", message: detail ? `${message} · ${detail}` : message }));
                 })).then((message) => {
                     if (!controller.signal.aborted)
                         socket.send(JSON.stringify({ type: "git_commit_message", message }));
@@ -518,7 +519,7 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
                         runEditReview(editRequest, editConfig, "The source changed. Refreshing the review against the current file…");
                     }
                     else {
-                        socket.send(JSON.stringify({ type: "agent_status", status: "error", message }));
+                        socket.send(JSON.stringify({ type: "agent_status", taskId: msg.taskId, status: "error", message }));
                     }
                 }
             }

package/dist/overlay.js

@@ -7880,6 +7880,7 @@
     pendingChanges = [];
     agentTasks = [];
     activeTaskId = null;
+    promptTaskId = null;
     runtimeErrors = [];
     screenshotPromise = Promise.resolve({});
     // Agent State
@@ -7904,7 +7905,7 @@
     myUser = null;
     presenceUsers = /* @__PURE__ */ new Map();
     lockMap = /* @__PURE__ */ new Map();
-    heldLockElement = "";
+    heldLockElements = /* @__PURE__ */ new Set();
     spotlightUserId = null;
     // Comments
     commentThreads = /* @__PURE__ */ new Map();
@@ -10933,6 +10934,7 @@
     .lasso-task-detail-status { color: var(--lo-primary); font-size: 11px; font-weight: 600; }
     .lasso-task-prompt { margin: 0 0 10px; font-size: 13px; line-height: 1.45; }
     .lasso-task-message { margin: 0 0 12px; line-height: 1.45; }
+    .lasso-task-activity { display: flex; flex-direction: column; gap: 4px; max-height: 130px; margin: 0 0 12px; padding: 8px; overflow: auto; border-radius: var(--lo-radius-md); background: var(--lo-surface-2); color: var(--lo-text-3); font-size: 10.5px; line-height: 1.35; }
     .lasso-task-changes { margin-bottom: 10px; color: var(--lo-text-2); font-size: 11px; }
     .lasso-task-apply { padding: 7px 11px; border: 0; border-radius: var(--lo-radius-full); background: var(--lo-primary); color: #111214; font: inherit; font-size: 11px; font-weight: 600; cursor: pointer; }
 
@@ -12125,6 +12127,7 @@
   var list = null;
   var detail = null;
   var badge = null;
+  var selectionListeners = /* @__PURE__ */ new Set();
   var statusLabel = {
     queued: "Queued",
     thinking: "Thinking",
@@ -12137,9 +12140,36 @@
   function taskId() {
     return `task-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 7)}`;
   }
-  function createAgentTask(instruction) {
+  function sameChangeList(left, right) {
+    return left.length === right.length && left.every((change, index) => {
+      const other = right[index];
+      return Boolean(other) && change.filePath === other.filePath && change.oldString === other.oldString && change.newString === other.newString;
+    });
+  }
+  function onAgentTaskSelected(listener) {
+    selectionListeners.add(listener);
+    return () => selectionListeners.delete(listener);
+  }
+  function notifyTaskSelection(task) {
+    for (const listener of selectionListeners) listener(task);
+  }
+  function createAgentTask(instruction, messages = state.chatHistory, changesHistory = state.changesHistory, element = state.selected, selectionId = state.selectionId) {
     const now = (/* @__PURE__ */ new Date()).toISOString();
-    const task = { id: taskId(), instruction, status: "queued", message: "Queued", createdAt: now, updatedAt: now };
+    const task = {
+      id: taskId(),
+      instruction,
+      status: "queued",
+      message: "Queued",
+      pendingChanges: [],
+      messages: messages.map((message) => ({ ...message })),
+      changesHistory: changesHistory.map((entry) => ({ ...entry, changes: entry.changes.map((change) => ({ ...change })) })),
+      activity: ["Queued"],
+      lastInstruction: instruction,
+      selectionId,
+      element: element || void 0,
+      createdAt: now,
+      updatedAt: now
+    };
     state.agentTasks.unshift(task);
     state.activeTaskId = task.id;
     renderTasks();
@@ -12155,9 +12185,41 @@
     Object.assign(task, patch, { updatedAt: (/* @__PURE__ */ new Date()).toISOString() });
     renderTasks();
   }
+  function recordTaskActivity(id, text) {
+    const task = getAgentTask(id);
+    const value2 = text.trim();
+    if (!task || !value2 || task.activity[task.activity.length - 1] === value2) return;
+    updateAgentTask(id, { activity: [...task.activity, value2].slice(-200) });
+  }
+  function recordTaskChangeHistory(id, summary, changes) {
+    const task = getAgentTask(id);
+    if (!task) return;
+    const previous = task.changesHistory[task.changesHistory.length - 1];
+    if (previous?.summary === summary && sameChangeList(previous.changes, changes)) return;
+    updateAgentTask(id, {
+      changesHistory: [...task.changesHistory, { summary, changes: changes.map((change) => ({ ...change })), createdAt: (/* @__PURE__ */ new Date()).toISOString() }]
+    });
+  }
+  function appendTaskMessage(id, role, text) {
+    const task = getAgentTask(id);
+    const content = text.trim();
+    if (!task || !content) return;
+    const previous = task.messages[task.messages.length - 1];
+    if (previous?.role === role && previous.content === content) return;
+    const message = {
+      role,
+      content,
+      createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+      contextId: task.selectionId || void 0
+    };
+    updateAgentTask(task.id, { messages: [...task.messages, message] });
+    return message;
+  }
   function selectAgentTask(id) {
-    if (!getAgentTask(id)) return;
-    state.activeTaskId = id;
+    const task = getAgentTask(id);
+    state.activeTaskId = task?.id || null;
+    state.promptTaskId = task?.id || null;
+    notifyTaskSelection(task || null);
     renderTasks();
   }
   function toggleTaskPanel(force) {
@@ -12194,9 +12256,11 @@
   }
   function renderTasks() {
     if (!list || !detail || !badge) return;
-    const running = state.agentTasks.filter((task) => task.status === "thinking" || task.status === "working").length;
+    const activeCount = state.agentTasks.filter((task) => task.status !== "complete" && task.status !== "error" && task.status !== "stopped").length;
     badge.hidden = state.agentTasks.length === 0;
-    badge.textContent = String(running || state.agentTasks.length);
+    badge.textContent = String(activeCount || state.agentTasks.length);
+    const navBadge = getDOM().shadow.querySelector(".lasso-agent-tasks-badge");
+    if (navBadge) navBadge.hidden = activeCount === 0;
     list.replaceChildren();
     if (!state.agentTasks.length) {
       list.innerHTML = `<div class="lasso-task-empty">Prompt an element to start a task.</div>`;
@@ -12221,10 +12285,7 @@
     const heading = document.createElement("div");
     heading.className = "lasso-task-detail-heading";
     heading.innerHTML = `<span class="lasso-task-detail-status ${selected.status}">${statusLabel[selected.status]}</span><button type="button" class="lasso-task-back">All tasks</button>`;
-    heading.querySelector("button").addEventListener("click", () => {
-      state.activeTaskId = null;
-      renderTasks();
-    });
+    heading.querySelector("button").addEventListener("click", () => selectAgentTask(null));
     const prompt = document.createElement("p");
     prompt.className = "lasso-task-prompt";
     prompt.textContent = selected.instruction;
@@ -12232,10 +12293,21 @@
     activity.className = "lasso-task-message";
     activity.textContent = selected.response || selected.message;
     detail.append(heading, prompt, activity);
-    if (selected.changes?.length) {
+    if (selected.activity.length) {
+      const activityList = document.createElement("div");
+      activityList.className = "lasso-task-activity";
+      for (const entry of selected.activity.slice(-8)) {
+        const line = document.createElement("div");
+        line.textContent = entry;
+        activityList.appendChild(line);
+      }
+      detail.appendChild(activityList);
+    }
+    const pendingChanges = selected.pendingChanges.length ? selected.pendingChanges : selected.changes || [];
+    if (pendingChanges.length) {
       const changes = document.createElement("div");
       changes.className = "lasso-task-changes";
-      changes.textContent = `${selected.changes.length} proposed file change${selected.changes.length === 1 ? "" : "s"}`;
+      changes.textContent = `${pendingChanges.length} proposed file change${pendingChanges.length === 1 ? "" : "s"}`;
       detail.appendChild(changes);
       if (selected.status === "review") {
         const apply = document.createElement("button");
@@ -12244,8 +12316,8 @@
         apply.textContent = "Apply changes";
         apply.addEventListener("click", () => {
           if (state.bridgeSocket?.readyState !== WebSocket.OPEN) return;
-          state.bridgeSocket.send(JSON.stringify({ type: "apply", taskId: selected.id, changes: selected.changes }));
-          updateAgentTask(selected.id, { message: "Applying changes\u2026" });
+          state.bridgeSocket.send(JSON.stringify({ type: "apply", taskId: selected.id, changes: pendingChanges }));
+          updateAgentTask(selected.id, { status: "working", message: "Applying changes\u2026", activity: [...selected.activity, "Applying changes\u2026"] });
         });
         detail.appendChild(apply);
       }
@@ -18236,10 +18308,10 @@
         state: "online",
         selection: currentSelectionPayload()
       });
-      if (state.heldLockElement) {
+      for (const elementId of state.heldLockElements) {
         collabEmit("lock:extend", {
           sessionId: state.collabProjectId,
-          elementId: state.heldLockElement
+          elementId
         });
       }
     }, 3e4);
@@ -18292,7 +18364,7 @@
     }
     const key = elementKey(state.selected);
     const lock = state.lockMap.get(key);
-    const mine = state.heldLockElement === key;
+    const mine = state.heldLockElements.has(key);
     if (lock) {
       dom.heldLockChip.hidden = false;
       dom.heldLockChip.classList.toggle("held", mine);
@@ -18327,7 +18399,7 @@
         },
         (res) => {
           if (res.ok && res.lock) {
-            state.heldLockElement = key;
+            state.heldLockElements.add(key);
             state.lockMap.set(key, res.lock);
             updateLockChip();
             resolve(true);
@@ -18346,14 +18418,16 @@
       );
     });
   }
-  function releaseHeldLock() {
-    if (!state.heldLockElement) return;
-    const elementId = state.heldLockElement;
-    state.heldLockElement = "";
-    updateLockChip();
-    if (state.collabSocket?.connected && state.collabJoined) {
-      collabEmit("lock:release", { sessionId: state.collabProjectId, elementId });
+  function releaseHeldLock(elementId) {
+    const elementIds = elementId ? [elementId] : Array.from(state.heldLockElements);
+    for (const id of elementIds) {
+      if (!state.heldLockElements.delete(id)) continue;
+      state.lockMap.delete(id);
+      if (state.collabSocket?.connected && state.collabJoined) {
+        collabEmit("lock:release", { sessionId: state.collabProjectId, elementId: id });
+      }
     }
+    updateLockChip();
   }
 
   // src/overlay/icons/lasso.ts
@@ -18522,6 +18596,10 @@
   `;
     dom.shadow.appendChild(rev);
     reviewPanel = rev;
+    onAgentTaskSelected((task) => {
+      if (task) restoreTaskPrompt(task);
+      else resetPromptSession();
+    });
     const promptTop = el.querySelector(".lasso-prompt-top");
     let dragState = null;
     promptTop.addEventListener("pointerdown", (event) => {
@@ -18583,10 +18661,19 @@
     stopButton.addEventListener("click", (event) => {
       event.preventDefault();
       event.stopPropagation();
+      const taskId2 = state.promptTaskId || void 0;
+      const task = taskId2 ? getAgentTask(taskId2) : void 0;
       if (state.bridgeSocket?.readyState === WebSocket.OPEN) {
-        state.bridgeSocket.send(JSON.stringify({ type: "stop", taskId: state.activeTaskId || void 0 }));
+        state.bridgeSocket.send(JSON.stringify({ type: "stop", taskId: taskId2 }));
+      }
+      if (taskId2) {
+        appendChat("assistant", "Agent stopped.", taskId2);
+        if (task) {
+          updateAgentTask(task.id, { status: "stopped", message: "Agent stopped." });
+          recordTaskActivity(task.id, "Agent stopped.");
+        }
       }
-      appendChat("assistant", "Agent stopped.");
+      if (task?.element) releaseHeldLock(elementKey(task.element));
       resetAgentState();
     });
     const voiceBtn = el.querySelector(".lasso-prompt-voice");
@@ -18643,20 +18730,22 @@
     });
     rev.querySelector(".lasso-review-close").addEventListener("click", closeReview);
     rev.querySelector(".lasso-review-undo").addEventListener("click", () => {
+      const taskId2 = state.promptTaskId || void 0;
       if (state.pendingChanges.length && rev.querySelector(".lasso-review-apply").hidden) {
         if (state.bridgeSocket?.readyState === WebSocket.OPEN) {
-          state.bridgeSocket.send(JSON.stringify({ type: "undo", taskId: state.activeTaskId || void 0 }));
+          state.bridgeSocket.send(JSON.stringify({ type: "undo", taskId: taskId2 }));
         }
         return;
       }
       closeReview();
-      appendChat("assistant", "Kept as a proposal. Nothing was changed.");
+      appendChat("assistant", "Kept as a proposal. Nothing was changed.", taskId2);
     });
     rev.querySelector(".lasso-review-apply").addEventListener("click", () => {
-      if (!state.bridgeSocket || state.bridgeSocket.readyState !== WebSocket.OPEN || !state.pendingChanges.length) return;
+      const taskId2 = state.promptTaskId;
+      if (!taskId2 || !state.bridgeSocket || state.bridgeSocket.readyState !== WebSocket.OPEN || !state.pendingChanges.length) return;
       requestAgentNotificationPermission();
-      state.bridgeSocket.send(JSON.stringify({ type: "apply", taskId: state.activeTaskId || "", changes: state.pendingChanges }));
-      appendChat("assistant", "Applying the reviewed change\u2026");
+      state.bridgeSocket.send(JSON.stringify({ type: "apply", taskId: taskId2, changes: state.pendingChanges }));
+      appendChat("assistant", "Applying the reviewed change\u2026", taskId2);
     });
     return { prompt: el, review: rev };
   }
@@ -18825,29 +18914,50 @@
       text.textContent = value2;
       line.append(prefix, text);
       agentLogElement.append(line);
-      if (agentLogExpanded) agentLogElement.scrollTop = agentLogElement.scrollHeight;
+      agentLogElement.scrollTop = agentLogElement.scrollHeight;
     }
     if (agentLogToggle) agentLogToggle.hidden = false;
   }
-  function appendChat(role, text) {
+  function loadAgentLog(lines) {
+    clearAgentLog();
+    for (const line of lines) appendAgentLog(line);
+  }
+  function renderChatThread() {
     const thread = promptEl?.querySelector(".lasso-chat-thread");
-    if (!thread || !text.trim()) return;
-    const previous = thread.lastElementChild;
-    if (previous?.classList.contains(role) && previous.dataset.rawText === text) return;
-    state.chatHistory.push({
-      role,
-      content: text,
-      createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-      contextId: state.selectionId || void 0
-    });
-    const item = document.createElement("div");
-    item.className = `lasso-chat-message ${role}`;
-    item.dataset.rawText = text;
-    renderChatText(item, text);
-    thread.appendChild(item);
-    while (thread.children.length > 6) thread.firstElementChild?.remove();
+    if (!thread) return;
+    thread.replaceChildren();
+    for (const message of state.chatHistory.slice(-6)) {
+      const item = document.createElement("div");
+      item.className = `lasso-chat-message ${message.role}`;
+      item.dataset.rawText = message.content;
+      renderChatText(item, message.content);
+      thread.appendChild(item);
+    }
     thread.scrollTop = thread.scrollHeight;
   }
+  function appendChat(role, text, taskId2 = state.promptTaskId) {
+    const content = text.trim();
+    if (!content) return;
+    const task = taskId2 ? getAgentTask(taskId2) : void 0;
+    if (taskId2 && !task) return;
+    if (task) {
+      const previous = task.messages[task.messages.length - 1];
+      if (previous?.role === role && previous.content === content) return;
+      const message = appendTaskMessage(task.id, role, content);
+      if (!message || state.promptTaskId !== task.id) return;
+      state.chatHistory = [...task.messages];
+    } else {
+      const previous = state.chatHistory[state.chatHistory.length - 1];
+      if (previous?.role === role && previous.content === content) return;
+      state.chatHistory.push({
+        role,
+        content,
+        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+        contextId: state.selectionId || void 0
+      });
+    }
+    renderChatThread();
+  }
   function renderChatText(container, text) {
     const codePattern = /(`+)([\s\S]*?)\1/g;
     let lastIndex = 0;
@@ -18865,33 +18975,35 @@
       container.append(document.createTextNode(text.slice(lastIndex)));
     }
   }
-  function setAgentStatus(status, message, detail2) {
+  function setAgentStatus(status, message, detail2, taskId2 = state.promptTaskId, appendMessage = true) {
     if (!agentStatusElement || !agentStatusMessage || !sendButton) return;
     const logMessage = detail2?.trim() || message.trim();
     const lastLog = agentLogLines[agentLogLines.length - 1];
-    if (agentStatusElement.dataset.status === status && agentStatusMessage.textContent === message && (status === "thinking" || status === "working") && (!logMessage || lastLog === logMessage)) return;
+    if (agentStatusElement.dataset.status === status && agentStatusMessage.textContent === message && (!logMessage || lastLog === logMessage)) return;
     appendAgentLog(logMessage);
+    if (taskId2) recordTaskActivity(taskId2, logMessage);
+    const running = status === "thinking" || status === "working";
     agentStatusElement.hidden = status === "review";
     agentStatusElement.dataset.status = status;
     agentStatusMessage.textContent = message;
     const badgeEl = agentStatusElement.querySelector(".lasso-agent-status-badge");
     if (badgeEl) {
-      badgeEl.textContent = status === "thinking" ? "thinking" : status === "working" ? "executing" : status;
+      badgeEl.textContent = status === "thinking" ? "thinking" : status === "working" ? "executing" : status === "complete" ? "done" : status;
       badgeEl.className = `lasso-agent-status-badge ${status}`;
     }
-    state.agentRunning = status === "thinking" || status === "working";
-    sendButton.classList.toggle("loading", state.agentRunning);
-    if (stopButton) stopButton.hidden = !state.agentRunning;
+    state.agentRunning = running;
+    sendButton.classList.toggle("loading", running);
+    if (stopButton) stopButton.hidden = !running;
     if (promptInput) promptInput.disabled = false;
     const label = sendButton.querySelector("span");
     if (label) {
-      label.textContent = status === "review" ? "Review" : status === "error" ? "Retry" : state.agentRunning ? "" : "Send";
+      label.textContent = status === "review" ? "Review" : status === "error" ? "Retry" : running ? "" : "Send";
     }
-    sendButton.setAttribute("aria-label", state.agentRunning ? "Agent is working" : status === "error" ? "Retry request" : "Send request");
-    sendButton.dataset.state = status === "error" ? "retry" : state.agentRunning ? "working" : status;
+    sendButton.setAttribute("aria-label", running ? "Agent is working" : status === "error" ? "Retry request" : "Send request");
+    sendButton.dataset.state = status === "error" ? "retry" : running ? "working" : status;
     syncSendButtonState();
-    if (status === "review" || status === "error" || status === "stopped") {
-      appendChat(status === "error" ? "error" : "assistant", message);
+    if (appendMessage && (status === "review" || status === "error" || status === "stopped")) {
+      appendChat(status === "error" ? "error" : "assistant", message, taskId2);
     }
   }
   function syncSendButtonState() {
@@ -18926,6 +19038,64 @@
     if (stopButton) stopButton.hidden = true;
     if (promptInput) promptInput.disabled = false;
   }
+  function hideReview() {
+    if (reviewPanel) reviewPanel.hidden = true;
+  }
+  function resetPromptSession() {
+    state.promptTaskId = null;
+    state.chatHistory = [];
+    state.changesHistory = [];
+    state.pendingChanges = [];
+    state.lastInstruction = "";
+    state.selectionId = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
+    state.screenshotPromise = Promise.resolve({});
+    hideReview();
+    clearAgentLog();
+    resetAgentState();
+    renderChatThread();
+    if (promptInput) {
+      promptInput.value = "";
+      syncSendButtonState();
+    }
+  }
+  function restoreTaskPrompt(task) {
+    state.activeTaskId = task.id;
+    state.promptTaskId = task.id;
+    state.chatHistory = [...task.messages];
+    state.changesHistory = task.changesHistory.map((entry) => ({ ...entry, changes: entry.changes.map((change) => ({ ...change })) }));
+    state.pendingChanges = [...task.pendingChanges];
+    state.lastInstruction = task.lastInstruction;
+    state.selectionId = task.selectionId;
+    state.screenshotPromise = Promise.resolve({});
+    hideReview();
+    clearAgentLog();
+    loadAgentLog(task.activity);
+    renderChatThread();
+    const dom = getDOM();
+    if (task.element?.isConnected) {
+      state.selected = task.element;
+      state.elementRegistry.set(elementKey(task.element), task.element);
+      updateSelectedVisual();
+      updateLockChip();
+      if (promptElement) promptElement.textContent = getElementLabel(task.element);
+      positionPrompt(task.element);
+    } else {
+      state.selected = null;
+      dom.selectedBox.style.display = "none";
+      dom.label.style.display = "none";
+      if (promptElement) promptElement.textContent = "Agent task";
+      if (promptEl) {
+        promptEl.style.left = `${Math.max(12, (window.innerWidth - 360) / 2)}px`;
+        promptEl.style.top = `${Math.max(12, (window.innerHeight - 200) / 2)}px`;
+      }
+      updateLockChip();
+    }
+    if (promptEl) promptEl.classList.add("visible");
+    setSelectMode(false);
+    if (task.status === "review" && state.pendingChanges.length) showReview(state.pendingChanges, task.message);
+    setAgentStatus(task.status, task.message, task.detail, task.id, false);
+    requestAnimationFrame(() => promptInput?.focus());
+  }
   function showReview(changes, summary) {
     if (!reviewPanel) return;
     const subtitle = reviewPanel.querySelector(".lasso-review-subtitle");
@@ -18959,7 +19129,7 @@
     reviewPanel.style.top = `${top}px`;
   }
   function closeReview() {
-    if (reviewPanel) reviewPanel.hidden = true;
+    hideReview();
     resetAgentState();
   }
   function positionPrompt(el) {
@@ -18990,11 +19160,10 @@
     promptEl.classList.remove("visible");
     if (promptInput) promptInput.value = "";
     sendPresenceUpdate({ selection: null });
-    if (state.heldLockElement) releaseHeldLock();
-    updateLockChip();
     renderRemoteBoxes();
     renderComments();
     state.selected = null;
+    updateLockChip();
     getDOM().selectedBox.style.display = "none";
     getDOM().label.style.display = "none";
     if (reenter) {
@@ -19004,18 +19173,19 @@
   async function handleSend(event) {
     event.preventDefault();
     event.stopPropagation();
-    if (!state.selected || !promptInput || !sendButton) return;
+    const selectedElement = state.selected;
+    if (!selectedElement || !promptInput || !sendButton) return;
     const instruction = promptInput.value.trim() || (sendButton.dataset.state === "retry" ? state.lastInstruction : "");
     if (!instruction) {
       promptInput.focus();
       return;
     }
-    clearAgentLog();
     requestAgentNotificationPermission();
     const isQuestion = /^(hi|hello|hey|thanks|thank you|what|why|how|when|where|who|which|is|are|does|do|can|could|would|should|tell me|explain|describe)\b/i.test(instruction) || /\?$/.test(instruction);
     const isExplicitEdit = /\b(change|edit|update|make|add|remove|delete|fix|replace|turn|convert|style|restyle|move|rename|implement|build|create|increase|decrease|hide|show|align|resize|set|enable|disable)\b/i.test(instruction);
     const wantsAnswer = isQuestion && !/\b(can|could|would|please)\s+you\s+(change|edit|update|add|fix|make)\b/i.test(instruction) || !isExplicitEdit && !isQuestion;
-    if (!state.bridgeSocket || state.bridgeSocket.readyState !== WebSocket.OPEN) {
+    const bridgeSocket = state.bridgeSocket;
+    if (!bridgeSocket || bridgeSocket.readyState !== WebSocket.OPEN) {
       setAgentStatus(
         "error",
         "The Lasso agent bridge is not connected. Start Lasso with your dev server and try again."
@@ -19023,41 +19193,54 @@
       return;
     }
     if (!wantsAnswer) {
-      const ownershipGranted = await acquireOwnership(state.selected);
+      const ownershipGranted = await acquireOwnership(selectedElement);
       if (!ownershipGranted) return;
     }
     if (!wantsAnswer && state.collabSocket?.connected && state.collabJoined) {
       collabEmit("collab:action", {
         sessionId: state.collabProjectId,
         status: "preparing",
-        elementId: elementKey(state.selected),
+        elementId: elementKey(selectedElement),
         summary: `Edits for ${instruction.slice(0, 80)}`
       });
     }
+    const selectionId = state.selectionId;
+    const model = state.selectedModel;
+    const screenshotPromise = state.screenshotPromise;
     appendChat("user", instruction);
-    const task = createAgentTask(instruction);
-    setAgentStatus("thinking", "Thinking\u2026");
+    const messages = state.chatHistory.map((message) => ({ ...message }));
+    const changesHistory = state.changesHistory.map((entry) => ({ ...entry, changes: entry.changes.map((change) => ({ ...change })) }));
+    const task = createAgentTask(instruction, messages, changesHistory, selectedElement, selectionId);
+    updateAgentTask(task.id, { status: "thinking", message: "Thinking\u2026", activity: [...task.activity, "Thinking\u2026"] });
+    resetPromptSession();
+    state.promptTaskId = task.id;
     state.lastInstruction = instruction;
-    promptInput.value = "";
-    const rect = state.selected.getBoundingClientRect();
-    const computed = getComputedStyle(state.selected);
+    const rect = selectedElement.getBoundingClientRect();
+    const computed = getComputedStyle(selectedElement);
     const attributes = Object.fromEntries(
-      Array.from(state.selected.attributes).map((attr) => [attr.name, attr.value])
+      Array.from(selectedElement.attributes).map((attr) => [attr.name, attr.value])
     );
     const needsVisualContext = /\b(look|visual|appearance|color|colour|background|image|icon|spacing|layout|position|align|responsive|style|restyle|font|size)\b/i.test(instruction);
-    const screenshots = needsVisualContext && state.selected ? await captureElementScreenshot(state.selected) : await state.screenshotPromise;
-    state.bridgeSocket.send(
+    const screenshots = needsVisualContext ? await captureElementScreenshot(selectedElement) : await screenshotPromise;
+    if (bridgeSocket.readyState !== WebSocket.OPEN) {
+      const message = "The Lasso agent bridge disconnected before the task could start.";
+      updateAgentTask(task.id, { status: "error", message });
+      appendChat("error", message, task.id);
+      if (!wantsAnswer) releaseHeldLock(elementKey(selectedElement));
+      return;
+    }
+    bridgeSocket.send(
       JSON.stringify({
         type: wantsAnswer ? "ask" : "edit",
         taskId: task.id,
         question: wantsAnswer ? instruction : void 0,
         instruction,
-        messages: state.chatHistory,
-        changesHistory: state.changesHistory,
-        model: state.selectedModel.id,
-        provider: state.selectedModel.provider,
+        messages,
+        changesHistory,
+        model: model.id,
+        provider: model.provider,
         context: {
-          selectionId: state.selectionId,
+          selectionId,
           position: {
             top: rect.top,
             left: rect.left,
@@ -19088,18 +19271,18 @@
           screenshots
         },
         element: {
-          tag: state.selected.tagName.toLowerCase(),
-          group: getElementGroup(state.selected),
-          label: getElementLabel(state.selected),
-          html: state.selected.outerHTML.slice(0, 6e3),
-          sourceHint: state.selected.getAttribute("data-source") || state.selected.getAttribute("data-lasso-source") || getSourceHint(state.selected)
+          tag: selectedElement.tagName.toLowerCase(),
+          group: getElementGroup(selectedElement),
+          label: getElementLabel(selectedElement),
+          html: selectedElement.outerHTML.slice(0, 6e3),
+          sourceHint: selectedElement.getAttribute("data-source") || selectedElement.getAttribute("data-lasso-source") || getSourceHint(selectedElement)
         }
       })
     );
   }
   function openPromptForSelected(selected) {
     if (!promptEl || !promptElement) return;
-    clearAgentLog();
+    resetPromptSession();
     promptElement.textContent = getElementLabel(selected);
     positionPrompt(selected);
     promptEl.classList.add("visible");
@@ -19838,7 +20021,7 @@
     state.hovered = el;
     updateHoverVisual(state.hovered);
   }
-  function updateSelectedVisual2() {
+  function updateSelectedVisual() {
     const dom = getDOM();
     if (!state.selected) {
       dom.selectedBox.style.display = "none";
@@ -20559,47 +20742,85 @@
           if (message.type === "git_commit_message") {
             setGeneratedCommitMessage(message.message || "", message.error);
           }
+          if (message.type === "git_progress" && message.message) {
+            setGitMessage(message.message);
+          }
           if (message.type === "agent_status" && message.status && message.message) {
+            const taskId2 = message.taskId;
+            const task = taskId2 ? getAgentTask(taskId2) : void 0;
             const taskStatus = message.status === "error" ? "error" : message.status === "stopped" ? "stopped" : message.status;
-            updateAgentTask(message.taskId, { status: taskStatus, message: message.message, detail: message.detail, changes: message.changes });
-            if (message.taskId && message.taskId !== state.activeTaskId) return;
-            setAgentStatus(message.status, message.message, message.detail);
+            if (task) {
+              const patch = {
+                status: taskStatus,
+                message: message.message,
+                detail: message.detail
+              };
+              if (message.status === "review" && message.changes) {
+                patch.changes = message.changes;
+                patch.pendingChanges = message.changes;
+                recordTaskChangeHistory(task.id, message.message, message.changes);
+              }
+              updateAgentTask(task.id, patch);
+              recordTaskActivity(task.id, message.detail || message.message);
+            }
+            if (message.status === "review") {
+              appendChat("assistant", message.message, taskId2);
+              if (message.changes?.length) void notifyAgent("Review requested", message.message);
+            } else if (message.status === "error" || message.status === "stopped") {
+              appendChat(message.status === "error" ? "error" : "assistant", message.message, taskId2);
+              if (task?.element) releaseHeldLock(elementKey(task.element));
+              void notifyAgent(message.status === "error" ? "Agent error" : "Agent stopped", message.message);
+            }
+            if (taskId2 && taskId2 !== state.promptTaskId) return;
+            setAgentStatus(message.status, message.message, message.detail, taskId2, false);
             setDragCardStatus(message.status, message.message);
             if (message.status === "review" && message.changes?.length) {
-              void notifyAgent("Review requested", message.message);
-              state.pendingChanges = message.changes;
-              state.changesHistory.push({
-                summary: message.message,
-                changes: message.changes,
-                createdAt: (/* @__PURE__ */ new Date()).toISOString()
-              });
+              if (task) state.changesHistory = task.changesHistory.map((entry) => ({ ...entry, changes: entry.changes.map((change) => ({ ...change })) }));
+              state.pendingChanges = [...message.changes];
               showReview(message.changes, message.message);
             }
           }
           if (message.type === "assistant_message" && message.message) {
-            updateAgentTask(message.taskId, { status: "complete", message: "Complete", response: message.message });
-            if (message.taskId && message.taskId !== state.activeTaskId) return;
+            const taskId2 = message.taskId;
+            const task = taskId2 ? getAgentTask(taskId2) : void 0;
+            if (task) {
+              updateAgentTask(task.id, { status: "complete", message: "Complete", response: message.message });
+              recordTaskActivity(task.id, "Agent complete");
+            }
+            appendChat("assistant", message.message, taskId2);
+            if (taskId2 && taskId2 !== state.promptTaskId) {
+              void notifyAgent("Agent complete", message.message);
+              return;
+            }
             void notifyAgent("Agent complete", message.message);
-            appendChat("assistant", message.message);
             resetAgentState();
           }
           if (message.type === "applied" || message.type === "undone") {
-            updateAgentTask(message.taskId, { status: "complete", message: message.message || "Done." });
-            if (message.taskId && message.taskId !== state.activeTaskId) return;
-            void notifyAgent(message.type === "applied" ? "Changes applied" : "Change undone", message.message || "Done.");
-            appendChat("assistant", message.message || "Done.");
-            releaseHeldLock();
+            const taskId2 = message.taskId;
+            const task = taskId2 ? getAgentTask(taskId2) : void 0;
+            if (task) {
+              updateAgentTask(task.id, { status: "complete", message: message.message || "Done.", changes: [], pendingChanges: [] });
+              recordTaskActivity(task.id, message.message || "Done.");
+            }
+            const isPromptTask = !taskId2 || taskId2 === state.promptTaskId;
+            const result = message.message || "Done.";
+            void notifyAgent(message.type === "applied" ? "Changes applied" : "Change undone", result);
+            appendChat("assistant", result, taskId2);
+            if (task?.element) releaseHeldLock(elementKey(task.element));
+            else if (isPromptTask && state.selected) releaseHeldLock(elementKey(state.selected));
             if (state.collabSocket?.connected && state.collabJoined) {
               collabEmit("collab:action", {
                 sessionId: state.collabProjectId,
                 status: "idle",
-                elementId: state.selected ? elementKey(state.selected) : void 0,
-                summary: message.message || (message.type === "undone" ? "Undid the last change" : "Applied the change")
+                elementId: task?.element ? elementKey(task.element) : state.selected ? elementKey(state.selected) : void 0,
+                summary: result || (message.type === "undone" ? "Undid the last change" : "Applied the change")
               });
             }
-            closeReview();
-            resetDrag(false);
-            state.pendingChanges = [];
+            if (isPromptTask) {
+              closeReview();
+              resetDrag(false);
+              state.pendingChanges = [];
+            }
           }
         } catch {
           console.warn("[lasso] Invalid bridge message");
@@ -20641,7 +20862,7 @@
         renderCommentPins();
       }
       if (state.selected) {
-        updateSelectedVisual2();
+        updateSelectedVisual();
         if (!state.promptDragged) {
           positionPrompt(state.selected);
         }
@@ -20683,13 +20904,8 @@
         updateLockChip();
         sendPresenceUpdate({});
         state.promptDragged = false;
-        state.lastInstruction = "";
-        state.selectionId = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
-        state.chatHistory = [];
-        state.changesHistory = [];
-        state.screenshotPromise = Promise.resolve({});
         dom.hoverBox.style.display = "none";
-        updateSelectedVisual2();
+        updateSelectedVisual();
         openPromptForSelected(target);
       },
       true

package/package.json

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