@lasso-ai/cli 1.0.18 → 1.0.20

package/dist/cli/bridge.d.ts

@@ -14,6 +14,7 @@ export type BridgeMessage = {
     from: "overlay" | "cli";
 } | {
     type: "edit";
+    taskId: string;
     instruction: string;
     model: string;
     provider?: "anthropic" | "openai" | "google" | "ollama" | "cli";
@@ -48,6 +49,7 @@ export type BridgeMessage = {
     };
 } | {
     type: "ask";
+    taskId: string;
     question: string;
     model: string;
     provider?: "anthropic" | "openai" | "google" | "ollama" | "cli";
@@ -81,11 +83,14 @@ export type BridgeMessage = {
     details: string;
 } | {
     type: "apply";
+    taskId: string;
     changes: SourceChange[];
 } | {
     type: "undo";
+    taskId?: string;
 } | {
     type: "stop";
+    taskId?: string;
 } | {
     type: "git_status";
 } | {
@@ -101,6 +106,7 @@ export type BridgeMessage = {
     type: "git_push";
 } | {
     type: "agent_status";
+    taskId?: string;
     status: "thinking" | "working" | "review" | "error" | "stopped";
     message: string;
 } | {
@@ -134,18 +140,22 @@ export type ServerBridgeMessage = {
     error?: string;
 } | {
     type: "agent_status";
+    taskId?: string;
     status: "thinking" | "working" | "review" | "error" | "stopped";
     message: string;
     detail?: string;
     changes?: SourceChange[];
 } | {
     type: "assistant_message";
+    taskId?: string;
     message: string;
 } | {
     type: "applied";
+    taskId?: string;
     message: string;
 } | {
     type: "undone";
+    taskId?: string;
     message: string;
 } | {
     type: "transcribe_result";

package/dist/cli/bridge.js

@@ -147,10 +147,10 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
     const bridgeServer = node_http_1.default.createServer(); // dedicated, empty HTTP server
     const wss = new ws_1.WebSocketServer({ server: bridgeServer });
     let overlaySocket = null;
-    let lastSnapshot = [];
-    let lastEditRequest = null;
-    let lastEditConfig = null;
-    let reviewRefreshAttempts = 0;
+    const taskSnapshots = new Map();
+    const editRequests = new Map();
+    const editConfigs = new Map();
+    const reviewRefreshAttempts = new Map();
     const envRoots = [cwd, node_path_1.default.join(cwd, "web"), node_path_1.default.join(cwd, "server")];
     const fileEnv = envRoots.reduce((values, root) => ({
         ...values,
@@ -179,11 +179,15 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
         };
     })();
     let activeAgentController = null;
+    const taskControllers = new Map();
     let localAgents = new Set();
     bridgeServer.on("request", (req, res) => {
         if (req.method !== "POST" || req.url?.split("?", 1)[0] !== "/__lasso/bridge/restart")
             return;
         activeAgentController?.abort();
+        for (const controller of taskControllers.values())
+            controller.abort();
+        taskControllers.clear();
         activeAgentController = null;
         for (const socket of wss.clients)
             socket.close(1000, "Bridge restarted by the CLI");
@@ -270,40 +274,41 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
                 socket.send(JSON.stringify({ type: "git_state", git }));
         });
         const runEditReview = (request, config, statusMessage) => {
-            activeAgentController?.abort();
+            taskControllers.get(request.taskId)?.abort();
             const controller = new AbortController();
-            activeAgentController = controller;
+            taskControllers.set(request.taskId, controller);
             if (statusMessage && socket.readyState === socket.OPEN) {
-                socket.send(JSON.stringify({ type: "agent_status", status: "working", message: statusMessage }));
+                socket.send(JSON.stringify({ type: "agent_status", taskId: request.taskId, status: "working", message: statusMessage }));
             }
             void (0, agent_1.proposeChanges)(cwd, request, config, controller.signal, (message, detail) => {
                 if (!controller.signal.aborted && socket.readyState === socket.OPEN) {
-                    socket.send(JSON.stringify({ type: "agent_status", status: "working", message, detail }));
+                    socket.send(JSON.stringify({ type: "agent_status", taskId: request.taskId, status: "working", message, detail }));
                 }
             })
                 .then((proposal) => {
                 if (controller.signal.aborted || socket.readyState !== socket.OPEN)
                     return;
                 if (!proposalMatchesCurrentSource(cwd, proposal.changes)) {
-                    if (reviewRefreshAttempts < 1) {
-                        reviewRefreshAttempts += 1;
+                    const refreshAttempts = reviewRefreshAttempts.get(request.taskId) || 0;
+                    if (refreshAttempts < 1) {
+                        reviewRefreshAttempts.set(request.taskId, refreshAttempts + 1);
                         runEditReview(request, config, "The source changed while the proposal was being prepared. Refreshing the review…");
                     }
                     else {
-                        socket.send(JSON.stringify({ type: "agent_status", status: "error", message: "The source is still changing. Stop the dev-server edit or try the request again." }));
+                        socket.send(JSON.stringify({ type: "agent_status", taskId: request.taskId, status: "error", message: "The source is still changing. Stop the dev-server edit or try the request again." }));
                     }
                     return;
                 }
-                socket.send(JSON.stringify({ type: "agent_status", status: "review", message: proposal.summary, changes: proposal.changes }));
+                socket.send(JSON.stringify({ type: "agent_status", taskId: request.taskId, status: "review", message: proposal.summary, changes: proposal.changes }));
             })
                 .catch((error) => {
                 if (!controller.signal.aborted && socket.readyState === socket.OPEN) {
-                    socket.send(JSON.stringify({ type: "agent_status", status: "error", message: error instanceof Error ? error.message : "The agent could not prepare a change." }));
+                    socket.send(JSON.stringify({ type: "agent_status", taskId: request.taskId, status: "error", message: error instanceof Error ? error.message : "The agent could not prepare a change." }));
                 }
             })
                 .finally(() => {
-                if (activeAgentController === controller)
-                    activeAgentController = null;
+                if (taskControllers.get(request.taskId) === controller)
+                    taskControllers.delete(request.taskId);
             });
         };
         socket.on("message", async (raw) => {
@@ -318,56 +323,59 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
                 const localProvider = msg.provider === "cli";
                 const cliProvider = msg.model.startsWith("claude-code:") ? "claude-code" : msg.model.startsWith("opencode:") ? "opencode" : "codex";
                 if (!lassoKeyConfigured && !localProvider) {
-                    socket.send(JSON.stringify({ type: "agent_status", status: "error", message: "Set your Lasso API key before asking the hosted agent a question." }));
+                    socket.send(JSON.stringify({ type: "agent_status", taskId: msg.taskId, status: "error", message: "Set your Lasso API key before asking the hosted agent a question." }));
                     return;
                 }
                 if (!agentConfig && !localProvider) {
-                    socket.send(JSON.stringify({ type: "agent_status", status: "error", message: "No hosted agent is configured. Select Claude Code/Codex or add a provider key." }));
+                    socket.send(JSON.stringify({ type: "agent_status", taskId: msg.taskId, status: "error", message: "No hosted agent is configured. Select Claude Code/Codex or add a provider key." }));
                     return;
                 }
-                activeAgentController?.abort();
+                taskControllers.get(msg.taskId)?.abort();
                 const controller = new AbortController();
-                activeAgentController = controller;
+                taskControllers.set(msg.taskId, controller);
                 const selectedConfig = localProvider
                     ? { provider: cliProvider, model: msg.model }
                     : { ...agentConfig, provider: (msg.provider || agentConfig.provider), model: msg.model };
                 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", status: "working", message, detail }));
+                        socket.send(JSON.stringify({ type: "agent_status", taskId: msg.taskId, status: "working", message, detail }));
                 }).then((answer) => {
                     if (!controller.signal.aborted)
-                        socket.send(JSON.stringify({ type: "assistant_message", message: answer }));
+                        socket.send(JSON.stringify({ type: "assistant_message", taskId: msg.taskId, message: answer }));
                 }).catch((error) => {
                     if (!controller.signal.aborted)
-                        socket.send(JSON.stringify({ type: "agent_status", status: "error", message: error instanceof Error ? error.message : "The agent could not answer." }));
+                        socket.send(JSON.stringify({ type: "agent_status", taskId: msg.taskId, status: "error", message: error instanceof Error ? error.message : "The agent could not answer." }));
                 }).finally(() => {
-                    if (activeAgentController === controller)
-                        activeAgentController = null;
+                    if (taskControllers.get(msg.taskId) === controller)
+                        taskControllers.delete(msg.taskId);
                 });
             }
             else if (msg.type === "edit") {
                 const localProvider = msg.provider === "cli";
                 const cliProvider = msg.model.startsWith("claude-code:") ? "claude-code" : msg.model.startsWith("opencode:") ? "opencode" : "codex";
                 if (!lassoKeyConfigured && !localProvider) {
-                    socket.send(JSON.stringify({ type: "agent_status", status: "error", message: "Set VITE_LASSO_API_KEY or NEXT_LASSO_API_KEY in your app environment before sending an edit." }));
+                    socket.send(JSON.stringify({ type: "agent_status", taskId: msg.taskId, status: "error", message: "Set VITE_LASSO_API_KEY or NEXT_LASSO_API_KEY in your app environment before sending an edit." }));
                     return;
                 }
                 if (!agentConfig && !localProvider) {
-                    socket.send(JSON.stringify({ type: "agent_status", status: "error", message: "Add a supported agent key: GOOGLE_GENERATIVE_AI_API_KEY, OPENAI_API_KEY, or ANTHROPIC_API_KEY." }));
+                    socket.send(JSON.stringify({ type: "agent_status", taskId: msg.taskId, status: "error", message: "Add a supported agent key: GOOGLE_GENERATIVE_AI_API_KEY, OPENAI_API_KEY, or ANTHROPIC_API_KEY." }));
                     return;
                 }
                 const selectedConfig = localProvider
                     ? { provider: cliProvider, model: msg.model }
                     : { ...agentConfig, provider: (msg.provider || agentConfig.provider), model: msg.model };
-                lastEditRequest = msg;
-                lastEditConfig = selectedConfig;
-                reviewRefreshAttempts = 0;
+                editRequests.set(msg.taskId, msg);
+                editConfigs.set(msg.taskId, selectedConfig);
+                reviewRefreshAttempts.set(msg.taskId, 0);
                 runEditReview(msg, selectedConfig);
             }
             else if (msg.type === "stop") {
-                activeAgentController?.abort();
-                activeAgentController = null;
-                socket.send(JSON.stringify({ type: "agent_status", status: "stopped", message: "Agent stopped." }));
+                if (msg.taskId)
+                    taskControllers.get(msg.taskId)?.abort();
+                else
+                    for (const controller of taskControllers.values())
+                        controller.abort();
+                socket.send(JSON.stringify({ type: "agent_status", taskId: msg.taskId, status: "stopped", message: "Agent stopped." }));
             }
             else if (msg.type === "runtime_error") {
                 socket.send(JSON.stringify({ type: "agent_status", status: "error", message: `Runtime error detected${msg.selectionId ? ` for selection ${msg.selectionId}` : ""}: ${msg.details}` }));
@@ -468,7 +476,7 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
             }
             else if (msg.type === "apply") {
                 try {
-                    lastSnapshot = [];
+                    const snapshots = [];
                     const planned = new Map();
                     for (const change of msg.changes) {
                         const filePath = resolveProposedFile(cwd, change.filePath);
@@ -483,36 +491,43 @@ function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort = expo
                     }
                     // Validate every change before writing any file, then apply each
                     // file's replacements from the end toward the beginning.
+                    taskSnapshots.set(msg.taskId, snapshots);
                     for (const [filePath, changes] of planned) {
                         const content = changes[0].content;
-                        lastSnapshot.push({ filePath, content });
+                        snapshots.push({ filePath, content });
                         const nextContent = [...changes]
                             .sort((a, b) => b.start - a.start)
                             .reduce((value, change) => value.slice(0, change.start) + change.newString + value.slice(change.end), content);
                         node_fs_1.default.writeFileSync(filePath, nextContent);
                     }
-                    socket.send(JSON.stringify({ type: "applied", message: `${msg.changes.length} file${msg.changes.length === 1 ? "" : "s"} updated. Your dev server will reload.` }));
+                    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.` }));
                 }
                 catch (error) {
-                    for (const snapshot of lastSnapshot)
+                    // Validation happens before writes, but restore this task's snapshot
+                    // if a filesystem error occurs during the write phase.
+                    for (const snapshot of taskSnapshots.get(msg.taskId) || [])
                         node_fs_1.default.writeFileSync(snapshot.filePath, snapshot.content);
-                    lastSnapshot = [];
+                    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");
-                    if (sourceChanged && lastEditRequest && lastEditConfig && reviewRefreshAttempts < 1) {
-                        runEditReview(lastEditRequest, lastEditConfig, "The source changed. Refreshing the review against the current file…");
+                    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);
+                        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 }));
                     }
                 }
             }
             else if (msg.type === "undo") {
-                for (const snapshot of lastSnapshot)
+                const snapshots = taskSnapshots.get(msg.taskId || "") || [];
+                for (const snapshot of snapshots)
                     node_fs_1.default.writeFileSync(snapshot.filePath, snapshot.content);
-                const count = lastSnapshot.length;
-                lastSnapshot = [];
-                socket.send(JSON.stringify({ type: "undone", message: count ? "The accepted change was reverted." : "There is no accepted change to undo." }));
+                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." }));
             }
         });
         socket.on("close", () => {