@lasso-ai/cli 2.1.12 → 2.1.14

package/dist/cli/bridge.js

@@ -22,6 +22,19 @@ const backends_1 = require("./backends");
 const local_runtime_1 = require("./local-runtime");
 exports.DEFAULT_BRIDGE_PORT = 3056;
 const execFileAsync = (0, node_util_1.promisify)(node_child_process_1.execFile);
+/** Map overlay chat history to the runtime conversation shape. */
+function toRuntimeConversation(messages) {
+    if (!Array.isArray(messages) || messages.length === 0)
+        return undefined;
+    const turns = messages
+        .filter((m) => typeof m?.content === "string" && m.content.trim())
+        .map((m) => ({
+        role: (m.role === "user" ? "user" : m.role === "assistant" ? "assistant" : "system"),
+        content: m.content,
+        timestamp: m.createdAt ? Date.parse(m.createdAt) || Date.now() : Date.now(),
+    }));
+    return turns.length > 0 ? turns : undefined;
+}
 function isConversationalPrompt(prompt) {
     const p = prompt.trim().toLowerCase().replace(/[!?.,;:]+$/, "");
     // 1. Direct greetings and conversational niceties
@@ -626,6 +639,7 @@ async function startBridge(cwd = process.cwd(), collabConfig = null, bridgePort
             const backendModelId = (0, backends_1.modelIdForBackend)(model || "", provider || "");
             const sessionInput = {
                 userPrompt: instruction,
+                conversation: toRuntimeConversation(messages),
                 project: {
                     projectId,
                     framework,

package/dist/cli/local-runtime.js

@@ -17,6 +17,24 @@ exports.LocalRuntime = void 0;
 exports.getLocalRuntime = getLocalRuntime;
 const node_crypto_1 = __importDefault(require("node:crypto"));
 const index_js_1 = require("../runtime/index.js");
+/**
+ * Seed a session's conversation from the caller's history plus the current
+ * user prompt. Skipping the history makes every follow-up a blank-slate run
+ * ("try again" becomes a literal search instead of a retry).
+ */
+function seedConversation(input, timestamp) {
+    const history = (input.conversation || []).map((msg) => ({
+        id: node_crypto_1.default.randomUUID(),
+        role: msg.role,
+        content: msg.content,
+        timestamp: msg.timestamp || timestamp,
+    }));
+    const last = history[history.length - 1];
+    if (!last || last.role !== "user" || last.content !== input.userPrompt) {
+        history.push({ id: node_crypto_1.default.randomUUID(), role: "user", content: input.userPrompt, timestamp });
+    }
+    return history;
+}
 class LocalRuntime {
     sessions = new Map();
     abortControllers = new Map();
@@ -37,9 +55,7 @@ class LocalRuntime {
             iteration: 0,
             userPrompt: input.userPrompt,
             mode: input.mode || "task",
-            conversation: [
-                { id: node_crypto_1.default.randomUUID(), role: "user", content: input.userPrompt, timestamp: now.getTime() },
-            ],
+            conversation: seedConversation(input, now.getTime()),
             observations: [],
             actions: [],
             completedActions: [],
@@ -117,7 +133,9 @@ class LocalRuntime {
                     content: msg.content,
                     timestamp: msg.timestamp,
                 })),
-                previousObservations: [],
+                // Carry prior observations so the agent knows what was already
+                // searched/read instead of re-exploring the project every turn.
+                previousObservations: record.observations,
                 previousErrors,
                 currentPhase: "execute",
                 constraints: { safetyLevel: "standard" },

package/dist/cli/oneshot.js

@@ -82,6 +82,11 @@ async function runOneShotAgent(cwd, prompt, scope, config, signal, onProgress, o
         onProgress("thinking", "Creating runtime session...", `Model: ${config.model || "claude-3-5-sonnet-20241022"}`);
         const sessionInput = {
             userPrompt: prompt,
+            conversation: Array.isArray(messages) && messages.length > 0
+                ? messages
+                    .filter((m) => typeof m?.content === "string" && m.content.trim())
+                    .map((m) => ({ role: m.role, content: m.content }))
+                : undefined,
             project: {
                 projectId: "", // TODO: Get from workspace config
                 framework,

package/dist/cli/runtime-client.d.ts

@@ -45,6 +45,16 @@ export interface RuntimeSessionInput {
         screenshot?: string;
     };
     conversationUid?: string;
+    /**
+     * Prior turns of the same conversation. Follow-up prompts must carry
+     * history here — a session created with only userPrompt gives the agent
+     * no idea what was asked or done before.
+     */
+    conversation?: Array<{
+        role: "user" | "assistant" | "system";
+        content: string;
+        timestamp?: number;
+    }>;
     backendConfig?: {
         type: "hosted_model" | "local_agent";
         provider: "claude_code" | "opencode" | "codex_cli" | "cursor";

package/dist/cli/runtime-client.js

@@ -88,9 +88,13 @@ class RuntimeClient {
         }
         const executor = new index_js_1.ActionExecutor(projectPath, opts?.browserContextProvider);
         const verifier = new index_js_1.VerificationEngine(projectPath);
+        // Idempotent: called on agent_completed AND on stream failure, so the
+        // diff is always cached before the safety-net restore wipes the edits.
+        let finalized = false;
         const finalizeGuard = async () => {
-            if (!guard)
+            if (!guard || finalized)
                 return;
+            finalized = true;
             try {
                 const changes = guard.diff();
                 const applyable = changes.filter((c) => !c.binary);
@@ -174,10 +178,11 @@ class RuntimeClient {
         }
         finally {
             reader.releaseLock();
-            // Safety net: if the stream died mid-run, still restore the workspace.
-            if (guard) {
-                guard.restore().catch(() => { });
-            }
+            // Stream died before agent_completed (network cut, server crash, model
+            // error surfaced as an error event): cache the diff first so the user's
+            // changes are recoverable, then restore the workspace. On the normal
+            // path finalizeGuard already ran and this is a no-op.
+            await finalizeGuard();
         }
     }
     /** Execute a tool_call request locally against the real project. */

package/dist/runtime/adapters/local-agent-adapter.js

@@ -311,6 +311,20 @@ class LocalAgentAdapter {
         lines.push("2. All file changes will be captured as a diff, reviewed by the user, and only applied if approved.");
         lines.push("3. Do not commit, push, or perform operations outside this project directory.");
         lines.push("");
+        // Retry/continuation replies ("try again", "continue", …) must resume
+        // the previous request instead of being treated as a literal task —
+        // otherwise the agent greps for words like "again".
+        const normalizedPrompt = context.userPrompt.trim().replace(/[.!]+$/, "").toLowerCase();
+        const isContinuation = /^(continue|proceed|go on|go ahead|keep going|yes|yep|yup|sure|ok|okay|alright|do it|carry on|resume|next|try again|again|retry|re-try|do it again|run again|run it again|one more time|same again)$/.test(normalizedPrompt) ||
+            /^(try|do|run|go)\s+(it\s+|that\s+)?again$|^one more time$|^retry(\s+it)?$/i.test(normalizedPrompt);
+        if (isContinuation) {
+            const priorUserMessages = context.conversation.filter((m) => m.role === "user" && m.content.trim() && m.content.trim() !== context.userPrompt.trim());
+            const prior = priorUserMessages[priorUserMessages.length - 1];
+            if (prior) {
+                lines.push(`The user is continuing/retrying. Resume this previous request: ${prior.content}`);
+                lines.push("");
+            }
+        }
         lines.push(`User request: ${context.userPrompt}`);
         lines.push("");
         lines.push("Project context:");

package/package.json

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