@lasso-ai/cli 1.0.23 → 1.0.24

package/dist/cli/agent.js

@@ -355,55 +355,108 @@ function localCommand(provider, model, prompt) {
     }
     return { command: "codex", args: ["exec", "--json", "--sandbox", "read-only", "--skip-git-repo-check", ...(selectedModel ? ["--model", selectedModel] : []), prompt || ""] };
 }
+function runLocalCommand(cwd, command, args, provider, signal, onProgress) {
+    return new Promise((resolve, reject) => {
+        const child = (0, node_child_process_1.spawn)(command, args, { cwd, stdio: ["ignore", "pipe", "pipe"] });
+        const label = provider === "opencode" ? "OpenCode" : provider === "codex" ? "Codex" : "Claude Code";
+        let stdout = "";
+        let stderr = "";
+        let pendingStdout = "";
+        let pendingStderr = "";
+        let settled = false;
+        let timedOut = false;
+        const timeout = setTimeout(() => {
+            timedOut = true;
+            onProgress?.(`${label} did not respond; stopping this task…`);
+            child.kill("SIGTERM");
+            setTimeout(() => child.kill("SIGKILL"), 3000).unref();
+        }, 5 * 60 * 1000);
+        timeout.unref();
+        const consume = (chunk, stream) => {
+            const value = String(chunk);
+            if (stream === "stdout") {
+                stdout += value;
+                pendingStdout += value;
+            }
+            else {
+                stderr += value;
+                pendingStderr += value;
+            }
+            const pending = stream === "stdout" ? pendingStdout : pendingStderr;
+            const lines = pending.split(/\r?\n/);
+            const remainder = lines.pop() || "";
+            if (stream === "stdout")
+                pendingStdout = remainder;
+            else
+                pendingStderr = remainder;
+            for (const line of lines) {
+                const progress = progressFromLine(line, provider);
+                if (progress)
+                    onProgress?.(progress.message, progress.detail);
+                else if (stream === "stderr" && line.trim())
+                    onProgress?.(`${label} · ${snippet(line, 110)}`);
+            }
+        };
+        child.stdout.on("data", (chunk) => consume(chunk, "stdout"));
+        child.stderr.on("data", (chunk) => consume(chunk, "stderr"));
+        child.once("spawn", () => onProgress?.(`${label} process started${child.pid ? ` · PID ${child.pid}` : ""}`));
+        const heartbeat = setInterval(() => {
+            if (!signal?.aborted)
+                onProgress?.(`${label} is still running${child.pid ? ` · PID ${child.pid}` : ""}…`);
+        }, 15000);
+        heartbeat.unref();
+        const abort = () => child.kill("SIGTERM");
+        if (signal?.aborted)
+            abort();
+        else
+            signal?.addEventListener("abort", abort, { once: true });
+        child.once("error", (error) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timeout);
+            clearInterval(heartbeat);
+            signal?.removeEventListener("abort", abort);
+            reject(error);
+        });
+        child.once("close", (code) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timeout);
+            clearInterval(heartbeat);
+            signal?.removeEventListener("abort", abort);
+            if (timedOut) {
+                reject(new Error(`${label} did not finish within 5 minutes. Check its login or approval prompt, then retry.`));
+                return;
+            }
+            const stdoutTail = pendingStdout.trim();
+            const stderrTail = pendingStderr.trim();
+            if (stdoutTail) {
+                stdout += pendingStdout;
+                const progress = progressFromLine(stdoutTail, provider);
+                if (progress)
+                    onProgress?.(progress.message, progress.detail);
+            }
+            if (stderrTail) {
+                const progress = progressFromLine(stderrTail, provider);
+                if (progress)
+                    onProgress?.(progress.message, progress.detail);
+            }
+            resolve({ stdout, stderr, exitCode: code ?? 1 });
+        });
+    });
+}
 async function proposeWithLocalAgent(cwd, instruction, context, config, signal, onProgress) {
     const outputContract = `Return ONLY valid JSON in this exact shape: {"summary":"short explanation","changes":[{"filePath":"relative/path","oldString":"exact existing text","newString":"replacement text"}]}. Treat the supplied source context as read-only. Before returning, verify every oldString against that context. Use project-relative paths only. Do not edit files, run write commands, commit, or produce markdown fences.`;
     const prompt = `${instruction}\n\n${outputContract}\n\nLasso has already assembled this source context:\n${context || "No matching source context was found."}`;
     const local = localCommand(config.provider, config.model, prompt);
     const command = local.command;
     const args = local.args;
-    const child = (0, node_child_process_1.spawn)(command, args, { cwd, stdio: ["ignore", "pipe", "pipe"] });
-    let stdout = "";
-    let stderr = "";
-    let pending = "";
-    const consume = (chunk) => {
-        pending += String(chunk);
-        const lines = pending.split(/\r?\n/);
-        pending = lines.pop() || "";
-        for (const line of lines) {
-            stdout += `${line}\n`;
-            const progress = progressFromLine(line, config.provider);
-            if (progress)
-                onProgress?.(progress.message, progress.detail);
-        }
-    };
-    child.stdout.on("data", consume);
-    child.stderr.on("data", (chunk) => {
-        const text = String(chunk);
-        stderr += text;
-        for (const line of text.split(/\r?\n/)) {
-            const progress = progressFromLine(line, config.provider);
-            if (progress)
-                onProgress?.(progress.message, progress.detail);
-        }
-    });
-    if (signal) {
-        if (signal.aborted)
-            child.kill("SIGTERM");
-        signal.addEventListener("abort", () => child.kill("SIGTERM"), { once: true });
-    }
-    const exitCode = await new Promise((resolve, reject) => {
-        child.once("error", reject);
-        child.once("close", (code) => resolve(code ?? 1));
-    });
-    if (pending.trim()) {
-        stdout += pending;
-        const progress = progressFromLine(pending, config.provider);
-        if (progress)
-            onProgress?.(progress.message, progress.detail);
-    }
-    if (exitCode !== 0)
-        throw new Error(localAgentError(command, stderr, exitCode));
-    return extractLocalAgentProposal(stdout, config.provider);
+    const result = await runLocalCommand(cwd, command, args, config.provider, signal, onProgress);
+    if (result.exitCode !== 0)
+        throw new Error(localAgentError(command, result.stderr, result.exitCode));
+    return extractLocalAgentProposal(result.stdout, config.provider);
 }
 async function proposeChanges(cwd, input, config, signal, onProgress) {
     onProgress?.("Reading source context…");
@@ -474,40 +527,10 @@ async function answerQuestion(cwd, input, config, signal, onProgress) {
     const prompt = `Answer the user's question conversationally and directly. Do not propose file changes and do not return JSON. If the question is about the selected UI, use the selection and source context below.\n\nUser question:\n${input.question}\n\nSelected element:\n${JSON.stringify(input.element, null, 2)}\n\nVisual context:\n${JSON.stringify({ ...input.context, screenshots: undefined }, null, 2)}\n\nConversation:\n${history}\n\nRelevant source context:\n${context || "No matching source context was found."}`;
     if (config.provider === "claude-code" || config.provider === "codex" || config.provider === "opencode") {
         const local = localCommand(config.provider, config.model, prompt);
-        const command = local.command;
-        const args = local.args;
-        const child = (0, node_child_process_1.spawn)(command, args, { cwd, stdio: ["ignore", "pipe", "pipe"] });
-        let output = "";
-        let pending = "";
-        let stderr = "";
-        const consume = (chunk) => {
-            pending += String(chunk);
-            const lines = pending.split(/\r?\n/);
-            pending = lines.pop() || "";
-            for (const line of lines) {
-                output += `${line}\n`;
-                const progress = progressFromLine(line, config.provider);
-                if (progress)
-                    onProgress?.(progress.message, progress.detail);
-            }
-        };
-        child.stdout.on("data", consume);
-        child.stderr.on("data", (chunk) => { stderr += String(chunk); });
-        if (signal)
-            signal.addEventListener("abort", () => child.kill("SIGTERM"), { once: true });
-        const code = await new Promise((resolve, reject) => {
-            child.once("error", reject);
-            child.once("close", (status) => resolve(status ?? 1));
-        });
-        if (pending.trim()) {
-            output += pending;
-            const progress = progressFromLine(pending, config.provider);
-            if (progress)
-                onProgress?.(progress.message, progress.detail);
-        }
-        if (code !== 0)
-            throw new Error(localAgentError(command, stderr, code));
-        return extractLocalAgentText(output, config.provider).trim();
+        const result = await runLocalCommand(cwd, local.command, local.args, config.provider, signal, onProgress);
+        if (result.exitCode !== 0)
+            throw new Error(localAgentError(local.command, result.stderr, result.exitCode));
+        return extractLocalAgentText(result.stdout, config.provider).trim();
     }
     const model = config.model || (config.provider === "google" ? "gemini-2.5-flash" : config.provider === "openai" ? "gpt-4.1-mini" : config.provider === "ollama" ? "llama3.2" : "claude-sonnet-4-20250514");
     let response;

package/package.json

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