@lasso-ai/cli 1.2.6 → 1.3.1

package/dist/cli/agent.js

@@ -14,12 +14,57 @@ exports.runLocalAgentPrompt = runLocalAgentPrompt;
 exports.proposeChanges = proposeChanges;
 exports.answerQuestion = answerQuestion;
 exports.generateCommitMessage = generateCommitMessage;
-const promises_1 = __importDefault(require("node:fs/promises"));
+const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_child_process_1 = require("node:child_process");
 const node_util_1 = require("node:util");
+const auth_1 = require("./auth");
 const execFileAsync = (0, node_util_1.promisify)(node_child_process_1.execFile);
 const execAsync = (0, node_util_1.promisify)(node_child_process_1.exec);
+function detectProjectStructure(cwd) {
+    const pkgPath = node_path_1.default.join(cwd, "package.json");
+    let framework = "unknown";
+    const directories = [];
+    const appDirs = [];
+    if (node_fs_1.default.existsSync(pkgPath)) {
+        try {
+            const pkg = JSON.parse(node_fs_1.default.readFileSync(pkgPath, "utf8"));
+            const deps = { ...pkg.dependencies, ...pkg.devDependencies };
+            if (deps.next)
+                framework = "Next.js";
+            else if (deps.vite)
+                framework = "Vite";
+            else if (deps.react)
+                framework = "React";
+        }
+        catch {
+            // Ignore errors
+        }
+    }
+    // Scan for important directories
+    const scanDirs = ["src", "app", "pages", "web", "lib", "components"];
+    for (const dir of scanDirs) {
+        if (node_fs_1.default.existsSync(node_path_1.default.join(cwd, dir))) {
+            directories.push(dir);
+            if (dir === "app")
+                appDirs.push(dir);
+            // Check for src/app structure
+            if (dir === "src" && node_fs_1.default.existsSync(node_path_1.default.join(cwd, "src", "app"))) {
+                directories.push("src/app");
+                appDirs.push("src/app");
+            }
+        }
+    }
+    // Determine source root
+    let sourceRoot = ".";
+    if (directories.includes("src/app"))
+        sourceRoot = "src";
+    else if (directories.includes("app"))
+        sourceRoot = ".";
+    else if (directories.includes("src"))
+        sourceRoot = "src";
+    return { framework, sourceRoot, directories, multipleAppDirs: appDirs };
+}
 async function installPackages(cwd, packages, onProgress) {
     const validPkgs = [...new Set(packages
             .map((p) => p.trim().replace(/^['"`]|['"`]$/g, ""))
@@ -30,7 +75,7 @@ async function installPackages(cwd, packages, onProgress) {
     let existingDeps = {};
     try {
         const pkgJsonPath = node_path_1.default.join(cwd, "package.json");
-        const raw = await promises_1.default.readFile(pkgJsonPath, "utf8");
+        const raw = node_fs_1.default.readFileSync(pkgJsonPath, "utf8");
         const parsed = JSON.parse(raw);
         existingDeps = { ...(parsed.dependencies || {}), ...(parsed.devDependencies || {}) };
     }
@@ -41,7 +86,7 @@ async function installPackages(cwd, packages, onProgress) {
     // Detect package manager
     let cmd = "npm install";
     try {
-        const rootFiles = await promises_1.default.readdir(cwd);
+        const rootFiles = node_fs_1.default.readdirSync(cwd);
         if (rootFiles.includes("bun.lockb") || rootFiles.includes("bun.lock"))
             cmd = "bun add";
         else if (rootFiles.includes("pnpm-lock.yaml"))
@@ -164,7 +209,7 @@ const ignored = new Set(["node_modules", ".git", ".next", "dist", "build", ".tur
 const sourceExtensions = /\.(tsx?|jsx?|vue|svelte|css|scss|html)$/i;
 const layoutFiles = /^(layout|_layout|_app|app|_document|document|template|_template)\.(tsx?|jsx?)$/i;
 const sourceFileCache = new Map();
-async function sourceFiles(directory, budget = { remaining: 25 }) {
+function sourceFiles(directory, budget = { remaining: 25 }) {
     if (budget.remaining <= 0)
         return [];
     const cached = sourceFileCache.get(directory);
@@ -173,7 +218,7 @@ async function sourceFiles(directory, budget = { remaining: 25 }) {
         budget.remaining -= files.length;
         return files;
     }
-    const entries = await promises_1.default.readdir(directory, { withFileTypes: true });
+    const entries = node_fs_1.default.readdirSync(directory, { withFileTypes: true });
     const files = [];
     const layoutFilesList = [];
     const otherFiles = [];
@@ -184,7 +229,7 @@ async function sourceFiles(directory, budget = { remaining: 25 }) {
         if (budget.remaining <= 0)
             break;
         if (entry.isDirectory()) {
-            const nested = await sourceFiles(fullPath, budget);
+            const nested = sourceFiles(fullPath, budget);
             files.push(...nested);
         }
         else if (sourceExtensions.test(entry.name)) {
@@ -202,10 +247,21 @@ async function sourceFiles(directory, budget = { remaining: 25 }) {
     sourceFileCache.set(directory, { expiresAt: Date.now() + 30000, files });
     return files;
 }
-async function contextFor(cwd, element) {
+function contextFor(cwd, element) {
     const needle = element.label.replace(/^[^.#]+[.#]?/, "");
     const hintedPath = element.sourceHint?.split(":")[0];
     const sourceFile = hintedPath ? node_path_1.default.basename(hintedPath) : "";
+    // Add project structure information at the top
+    const structure = detectProjectStructure(cwd);
+    let projectStructureInfo = `PROJECT STRUCTURE:
+- Framework: ${structure.framework}
+- Source root: ${structure.sourceRoot}
+- Directories found: ${structure.directories.join(", ") || "root"}
+- Multiple app directories: ${structure.multipleAppDirs.length > 0 ? structure.multipleAppDirs.join(", ") : "none"}
+- IMPORTANT: When creating files, use the existing directory structure. Do not create duplicate directories (e.g., if "src/app/" exists, use it instead of creating a new "app/").
+- Path aliases: Check tsconfig.json or jsconfig.json for path aliases like "@/components"
+
+`;
     // Extract unique class names and attributes from the element for better matching
     const classMatches = element.html?.match(/class="([^"]+)"/);
     const classNames = classMatches ? classMatches[1].split(/\s+/).filter((c) => c.length > 3) : [];
@@ -222,20 +278,20 @@ async function contextFor(cwd, element) {
             candidates.push(node_path_1.default.join(cwd, normalizedHint.slice(srcIndex + 1)));
         for (const candidate of candidates) {
             try {
-                const content = await promises_1.default.readFile(candidate, "utf8");
-                return `FILE: ${node_path_1.default.relative(cwd, candidate)}\n${content.slice(0, 16000)}`;
+                const content = node_fs_1.default.readFileSync(candidate, "utf8");
+                return `${projectStructureInfo}FILE: ${node_path_1.default.relative(cwd, candidate)}\n${content.slice(0, 16000)}`;
             }
             catch {
                 // The runtime source hint can point to a different checkout.
             }
         }
     }
-    const files = await sourceFiles(cwd);
+    const files = sourceFiles(cwd);
     const snippets = [];
     const scoredFiles = [];
-    const results = await Promise.all(files.map(async (file) => {
+    const results = files.map((file) => {
         try {
-            const content = await promises_1.default.readFile(file, "utf8");
+            const content = node_fs_1.default.readFileSync(file, "utf8");
             let score = 0;
             // Score files based on relevance
             if (sourceFile && file.endsWith(sourceFile))
@@ -263,7 +319,7 @@ async function contextFor(cwd, element) {
             // A file can disappear while a dev server is rebuilding; skip it.
         }
         return null;
-    }));
+    }).filter((r) => r !== null);
     // Sort by score and take top files
     const sortedResults = results.filter((r) => r !== null).sort((a, b) => b.score - a.score);
     for (const result of sortedResults) {
@@ -271,7 +327,7 @@ async function contextFor(cwd, element) {
             snippets.push(`FILE: ${node_path_1.default.relative(cwd, result.file)}\n${result.content.slice(0, 6000)}`);
         }
     }
-    return snippets.join("\n\n---\n\n");
+    return projectStructureInfo + snippets.join("\n\n---\n\n");
 }
 function jsonObjectCandidates(text) {
     const candidates = [];
@@ -307,8 +363,18 @@ function jsonObjectCandidates(text) {
     return candidates;
 }
 function jsonFrom(text) {
-    const fenced = text.match(/```(?:json)?\s*([\s\S]*?)```/i)?.[1];
-    const candidates = [...(fenced ? [fenced] : []), ...jsonObjectCandidates(text)];
+    // Remove common progress prefixes and tool output noise
+    const cleaned = text
+        .replace(/^(Thinking|Working|Planning|Analyzing|Executing|Searching|Scanning)\.\.\.?$/gm, '')
+        .replace(/^›/gm, '')
+        .replace(/^>/gm, '')
+        .replace(/^(grep|find|cat|ls|cd|npm|pnpm|yarn|git).*$/gm, '')
+        .replace(/^src\/.*:\d+:.*$/gm, '')
+        .replace(/^(The agent|Error|Warning|Info|Note):.*$/gm, '')
+        .replace(/^(Progress|Activity|Output|Result):.*$/gm, '')
+        .trim();
+    const fenced = cleaned.match(/```(?:json)?\s*([\s\S]*?)```/i)?.[1];
+    const candidates = [...(fenced ? [fenced] : []), ...jsonObjectCandidates(cleaned)];
     for (const candidate of candidates) {
         try {
             const parsed = JSON.parse(candidate.trim());
@@ -584,6 +650,18 @@ const AGENT_FAILURE_HINTS = [
         pattern: /failed to fetch models\.dev/i,
         message: "The local agent could not reach models.dev to refresh its model list. Check the network or proxy it uses, then retry.",
     },
+    {
+        pattern: /quota exceeded|quota limit|out of quota|no quota|quota.*limit|usage.*quota|plan.*limit|plan.*exhausted|credit.*exhausted|billing.*quota|rate.*limit|429|too many requests|request.*limit|insufficient.*credits|no.*credits|credits.*exhausted/i,
+        message: "Your plan quota has been exhausted. Please upgrade your plan or add credits to continue using this service.",
+    },
+    {
+        pattern: /payment.*required|subscription.*required|upgrade.*required|upgrade.*plan|billing.*required/i,
+        message: "Your subscription or plan requires an upgrade. Please check your billing settings and upgrade to continue.",
+    },
+    {
+        pattern: /api.*key.*invalid|api.*key.*expired|invalid.*api.*key|expired.*api.*key|authentication.*failed|unauthorized|forbidden|401|403/i,
+        message: "Authentication failed. Check your API key or sign in to your account, then retry.",
+    },
 ];
 function agentFailureHint(line) {
     return AGENT_FAILURE_HINTS.find((hint) => hint.pattern.test(line))?.message;
@@ -732,6 +810,10 @@ function localAgentError(command, stderr, exitCode) {
     if (command === "codex" && output.includes("mcp.canva.com") && output.includes("invalid_token")) {
         return "Codex started, but the Canva MCP connection has an expired OAuth token. Re-authenticate or remove the Canva MCP server from Codex, then retry.";
     }
+    // Check for quota/plan exhaustion in the output
+    if (/quota exceeded|quota limit|out of quota|no quota|plan.*limit|plan.*exhausted|credit.*exhausted|billing.*quota|rate.*limit|429|too many requests|request.*limit|insufficient.*credits|no.*credits|credits.*exhausted/i.test(output)) {
+        return `${command === "opencode" ? "OpenCode" : command === "cursor" ? "Cursor" : command} request failed: Your plan quota has been exhausted. Please upgrade your plan or add credits to continue using this service.`;
+    }
     return `${command} exited with code ${exitCode}${output ? `: ${output.slice(0, 500)}` : ""}`;
 }
 function localModel(provider, model) {
@@ -849,7 +931,14 @@ function runLocalCommand(cwd, command, args, provider, signal, onProgress, taskI
                 activeAgentInputs.delete(taskId);
             signal?.removeEventListener("abort", abort);
             if (timedOut) {
-                reject(new Error(`${label} did not finish within 5 minutes. Check its login or approval prompt, then retry.`));
+                const stderrTail = pendingStderr.trim();
+                // Check if timeout was due to quota exhaustion
+                if (/quota exceeded|quota limit|out of quota|no quota|plan.*limit|plan.*exhausted|credit.*exhausted|billing.*quota|rate.*limit|429|too many requests|request.*limit|insufficient.*credits|no.*credits|credits.*exhausted/i.test(stderrTail)) {
+                    reject(new Error(`${label} did not finish within 5 minutes: Your plan quota has been exhausted. Please upgrade your plan or add credits to continue using this service.`));
+                }
+                else {
+                    reject(new Error(`${label} did not finish within 5 minutes. Check its login or approval prompt, then retry.`));
+                }
                 return;
             }
             const stdoutTail = pendingStdout.trim();
@@ -900,7 +989,7 @@ async function runLocalAgentPrompt(cwd, config, prompt, signal, onProgress, task
     return extractLocalAgentText(result.stdout, provider);
 }
 async function proposeChanges(cwd, input, config, signal, onProgress, onPrompt) {
-    const context = await contextFor(cwd, input.element);
+    const context = contextFor(cwd, input.element);
     const runtimeErrors = input.context?.runtimeErrors || [];
     const visualContext = input.context ? { ...input.context, screenshots: undefined, runtimeErrors: undefined } : undefined;
     const history = input.messages?.map((message) => `${message.role}: ${message.content}`).join("\n") || input.instruction;
@@ -911,6 +1000,8 @@ async function proposeChanges(cwd, input, config, signal, onProgress, onPrompt)
     const runtimeErrorHint = runtimeErrors.length
         ? `\n\nLIVE CONSOLE/RUNTIME ERRORS (reported by the user's browser — the page is currently broken by these):\n${runtimeErrors.map((error) => `! ${error}`).join("\n")}`
         : "";
+    // Detect project structure for instruction
+    const structure = detectProjectStructure(cwd);
     const instruction = `Selection context:
 ${JSON.stringify(input.element, null, 2)}
 ${JSON.stringify(visualContext, null, 2)}
@@ -928,6 +1019,8 @@ Relevant source context:
 ${context || "No matching source context was found. Ask for a more specific selection rather than inventing a file."}${dragHint}${runtimeErrorHint}
 
 CRITICAL INSTRUCTIONS:
+0. PROJECT STRUCTURE AWARENESS: This project has specific directory structure. Before creating or moving files, verify the actual structure. Do not assume standard locations.
+${structure.multipleAppDirs.length > 0 ? `   WARNING: Multiple app directories detected: ${structure.multipleAppDirs.join(", ")}. Use the correct one for this project.\n` : ""}
 1. You are an autonomous agent with the ability to install npm packages and edit source code.
 2. If the user's request requires or asks for third-party libraries, icon packs, animation tools, or utility packages (e.g. icon libraries, motion, charts, UI primitives, etc.), determine the best npm package for this project and declare them in the "packages" array (e.g. ["@iconify/react", "@hugeicons/react"]).
 3. In the "changes" array, propose concrete, minimal edits to the source code to implement the request. You may freely import and use the packages you specified in "packages".
@@ -948,6 +1041,9 @@ CRITICAL INSTRUCTIONS:
 }
 Do NOT return prose or markdown outside the JSON.`;
     const callServerGateway = async (gatewayKey) => {
+        // Use CLI auth key if available, otherwise use the provided gateway key
+        const cliCredentials = (0, auth_1.loadCredentials)();
+        const apiKeyToUse = cliCredentials?.apiKey || gatewayKey;
         let serverUrl = config.serverUrl || process.env.LASSO_SERVER_URL || process.env.NEXT_PUBLIC_LASSO_SERVER_URL || "https://api.lasso.byorello.space";
         if (serverUrl.includes("collab.lasso.byorello.space")) {
             serverUrl = serverUrl.replace("collab.lasso.byorello.space", "api.lasso.byorello.space");
@@ -964,7 +1060,7 @@ Do NOT return prose or markdown outside the JSON.`;
         const response = await fetch(endpoint, {
             method: "POST",
             signal,
-            headers: { "content-type": "application/json", authorization: `Bearer ${gatewayKey}` },
+            headers: { "content-type": "application/json", authorization: `Bearer ${apiKeyToUse}` },
             body: JSON.stringify({
                 sessionId: input.taskId,
                 prompt: instruction,
@@ -974,7 +1070,12 @@ Do NOT return prose or markdown outside the JSON.`;
         });
         if (!response.ok) {
             const errData = await response.json().catch(() => ({}));
-            throw new Error(errData.error || `Lasso Agent Gateway request failed (${response.status}).`);
+            const errorMessage = errData.error || `Lasso Agent Gateway request failed (${response.status})`;
+            // Check for quota/plan exhaustion
+            if (/quota exceeded|quota limit|out of quota|no quota|plan.*limit|plan.*exhausted|credit.*exhausted|billing.*quota|rate.*limit|429|too many requests|request.*limit|insufficient.*credits|no.*credits|credits.*exhausted|payment.*required|subscription.*required|upgrade.*required|upgrade.*plan|billing.*required/i.test(errorMessage)) {
+                throw new Error("Your plan quota has been exhausted. Please upgrade your plan or add credits to continue using this service.");
+            }
+            throw new Error(errorMessage);
         }
         const data = await response.json();
         // If the server-side agent reported failure, surface it as a thrown error so the
@@ -1007,7 +1108,12 @@ Do NOT return prose or markdown outside the JSON.`;
         });
         if (!response.ok) {
             const errData = await response.json().catch(() => ({}));
-            throw new Error(errData.error || `Lasso Gateway generate failed (${response.status}).`);
+            const errorMessage = errData.error || `Lasso Gateway generate failed (${response.status})`;
+            // Check for quota/plan exhaustion
+            if (/quota exceeded|quota limit|out of quota|no quota|plan.*limit|plan.*exhausted|credit.*exhausted|billing.*quota|rate.*limit|429|too many requests|request.*limit|insufficient.*credits|no.*credits|credits.*exhausted|payment.*required|subscription.*required|upgrade.*required|upgrade.*plan|billing.*required/i.test(errorMessage)) {
+                throw new Error("Your plan quota has been exhausted. Please upgrade your plan or add credits to continue using this service.");
+            }
+            throw new Error(errorMessage);
         }
         const data = await response.json();
         if (!data.text?.trim())
@@ -1018,7 +1124,9 @@ Do NOT return prose or markdown outside the JSON.`;
         proposal = await proposeWithLocalAgent(cwd, instruction, context, config, signal, onProgress, input.taskId, onPrompt);
     }
     else {
-        const isLassoKey = config.apiKey?.startsWith("lss_live_") || config.apiKey?.startsWith("lss_");
+        // Check if using Lasso platform key (from CLI auth or env)
+        const cliCredentials = (0, auth_1.loadCredentials)();
+        const isLassoKey = cliCredentials?.apiKey || config.apiKey?.startsWith("lss_live_") || config.apiKey?.startsWith("lss_");
         const system = `You are Lasso, an autonomous agentic AI coding assistant.
 You have the ability to run inspection commands, search the live web for documentation or libraries, ask the user for input or single/multi-selection choices, install npm packages, and edit source code.
 
@@ -1051,8 +1159,17 @@ RULES:
 - If you already have sufficient context to fulfill the user's request immediately, return "propose_changes" (or standard {"summary": "...", "packages": [...], "changes": [...]}) directly!
 - If live console/runtime errors are provided, resolving them is part of the task. Use run_command to verify package exports and file contents before proposing changes instead of guessing.
 - Each oldString must match the existing file context exactly.
-- Return ONLY valid JSON with no markdown formatting or prose outside the JSON.`;
-        const model = config.model || (config.provider === "google" ? "gemini-2.5-flash" : config.provider === "openai" ? "gpt-4.1-mini" : config.provider === "ollama" ? "llama3.2" : config.provider === "nvidia" ? "meta/llama-3.2-11b-vision-instruct" : "claude-sonnet-4-20250514");
+- CRITICAL: Return ONLY valid JSON with no markdown formatting, no code blocks, no prose, no thinking tags, and no progress output. Just the JSON object.
+- Do NOT include phrases like "Thinking...", "Working...", or any progress indicators in your response.
+- Do NOT wrap the JSON in code blocks. Return raw JSON only.`;
+        const model = config.model;
+        if (!model) {
+            return {
+                summary: "No model selected. Please select a model in settings.",
+                changes: [],
+                packages: [],
+            };
+        }
         const image = input.context?.screenshots?.element || input.context?.screenshots?.full;
         const imageData = image?.replace(/^data:image\/[^;]+;base64,/, "");
         const imageMime = image?.match(/^data:(image\/[^;]+);base64,/)?.[1] || "image/jpeg";
@@ -1068,7 +1185,8 @@ RULES:
                 // If using a Lasso platform key, route this turn through the /generate endpoint
                 // (full agentic loop via Lasso gateway instead of one-shot session endpoint)
                 if (isLassoKey && config.provider !== "ollama") {
-                    rawText = await callGatewayGenerate(config.apiKey, system, currentPrompt);
+                    const apiKeyToUse = cliCredentials?.apiKey || config.apiKey;
+                    rawText = await callGatewayGenerate(apiKeyToUse, system, currentPrompt);
                 }
                 else {
                     // Provider-direct inference path
@@ -1106,6 +1224,10 @@ RULES:
                         });
                     }
                     if (!response.ok) {
+                        // Check for quota/plan exhaustion before fallback
+                        if (response.status === 429 || response.status === 402 || response.status === 403) {
+                            throw new Error("Your plan quota has been exhausted. Please upgrade your plan or add credits to continue using this service.");
+                        }
                         if (config.lassoKey && (response.status === 429 || response.status === 401)) {
                             onProgress?.("Local provider key limit reached; routing via Lasso Gateway…", undefined, "working");
                             proposal = await callServerGateway(config.lassoKey);
@@ -1125,6 +1247,10 @@ RULES:
                 }
             }
             catch (err) {
+                // Check for quota/plan exhaustion before fallback
+                if (err.message?.includes("429") || err.message?.includes("402") || err.message?.includes("403")) {
+                    throw new Error("Your plan quota has been exhausted. Please upgrade your plan or add credits to continue using this service.");
+                }
                 if (!isLassoKey && config.lassoKey && (err.message?.includes("429") || err.message?.includes("401"))) {
                     onProgress?.("Local provider key limit reached; routing via Lasso Gateway…", undefined, "working");
                     proposal = await callServerGateway(config.lassoKey);
@@ -1189,13 +1315,16 @@ RULES:
     return finalProposal;
 }
 async function answerQuestion(cwd, input, config, signal, onProgress, onPrompt) {
-    const context = await contextFor(cwd, input.element);
+    const context = contextFor(cwd, input.element);
     const history = input.messages?.map((message) => `${message.role}: ${message.content}`).join("\n") || "None";
     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" || config.provider === "cursor") {
         return (await runLocalAgentPrompt(cwd, config, prompt, signal, onProgress, input.taskId, onPrompt)).trim();
     }
     const callServerGatewayAnswer = async (gatewayKey) => {
+        // Use CLI auth key if available, otherwise use the provided gateway key
+        const cliCredentials = (0, auth_1.loadCredentials)();
+        const apiKeyToUse = cliCredentials?.apiKey || gatewayKey;
         let serverUrl = config.serverUrl || process.env.LASSO_SERVER_URL || process.env.NEXT_PUBLIC_LASSO_SERVER_URL || "https://api.lasso.byorello.space";
         if (serverUrl.includes("collab.lasso.byorello.space")) {
             serverUrl = serverUrl.replace("collab.lasso.byorello.space", "api.lasso.byorello.space");
@@ -1204,7 +1333,7 @@ async function answerQuestion(cwd, input, config, signal, onProgress, onPrompt)
         const response = await fetch(endpoint, {
             method: "POST",
             signal,
-            headers: { "content-type": "application/json", authorization: `Bearer ${gatewayKey}` },
+            headers: { "content-type": "application/json", authorization: `Bearer ${apiKeyToUse}` },
             body: JSON.stringify({
                 provider: config.provider,
                 model: config.model,
@@ -1214,18 +1343,29 @@ async function answerQuestion(cwd, input, config, signal, onProgress, onPrompt)
         });
         if (!response.ok) {
             const errData = await response.json().catch(() => ({}));
-            throw new Error(errData.error || `Lasso Agent Gateway request failed (${response.status}).`);
+            const errorMessage = errData.error || `Lasso Agent Gateway request failed (${response.status})`;
+            // Check for quota/plan exhaustion
+            if (/quota exceeded|quota limit|out of quota|no quota|plan.*limit|plan.*exhausted|credit.*exhausted|billing.*quota|rate.*limit|429|too many requests|request.*limit|insufficient.*credits|no.*credits|credits.*exhausted|payment.*required|subscription.*required|upgrade.*required|upgrade.*plan|billing.*required/i.test(errorMessage)) {
+                throw new Error("Your plan quota has been exhausted. Please upgrade your plan or add credits to continue using this service.");
+            }
+            throw new Error(errorMessage);
         }
         const data = await response.json();
         if (!data.text?.trim())
             throw new Error("The agent returned an empty answer.");
         return data.text.trim();
     };
-    const isLassoKey = config.apiKey?.startsWith("lss_live_") || config.apiKey?.startsWith("lss_");
+    // Check if using Lasso platform key (from CLI auth or env)
+    const cliCredentials = (0, auth_1.loadCredentials)();
+    const isLassoKey = cliCredentials?.apiKey || config.apiKey?.startsWith("lss_live_") || config.apiKey?.startsWith("lss_");
     if (isLassoKey && config.provider !== "ollama") {
-        return await callServerGatewayAnswer(config.apiKey);
+        const apiKeyToUse = cliCredentials?.apiKey || config.apiKey;
+        return await callServerGatewayAnswer(apiKeyToUse);
+    }
+    const model = config.model;
+    if (!model) {
+        return "No model selected. Please select a model in settings.";
     }
-    const model = config.model || (config.provider === "google" ? "gemini-2.5-flash" : config.provider === "openai" ? "gpt-4.1-mini" : config.provider === "ollama" ? "llama3.2" : config.provider === "nvidia" ? "meta/llama-3.2-11b-vision-instruct" : "claude-sonnet-4-20250514");
     let response;
     try {
         if (config.provider === "openai" || config.provider === "ollama" || config.provider === "nvidia") {
@@ -1248,6 +1388,10 @@ async function answerQuestion(cwd, input, config, signal, onProgress, onPrompt)
             });
         }
         if (!response.ok) {
+            // Check for quota/plan exhaustion before fallback
+            if (response.status === 429 || response.status === 402 || response.status === 403) {
+                throw new Error("Your plan quota has been exhausted. Please upgrade your plan or add credits to continue using this service.");
+            }
             if (config.lassoKey && (response.status === 429 || response.status === 401)) {
                 onProgress?.("Local provider key limit reached; routing via Lasso Gateway…", undefined, "working");
                 return await callServerGatewayAnswer(config.lassoKey);

package/dist/cli/bridge.d.ts

@@ -148,6 +148,8 @@ type ModelOption = {
     id: string;
     label: string;
     provider: "anthropic" | "openai" | "google" | "ollama" | "nvidia" | "cli";
+    locked?: boolean;
+    lockedReason?: string;
 };
 type PageEntry = {
     name: string;
@@ -217,6 +219,11 @@ export type ServerBridgeMessage = {
     type: "applied";
     taskId?: string;
     message: string;
+    validation?: {
+        passed: boolean;
+        errors: string[];
+        command: string;
+    };
 } | {
     type: "undone";
     taskId?: string;
@@ -233,8 +240,8 @@ export declare function restartBridge(port?: number): Promise<{
     ok: boolean;
     error?: string;
 }>;
-export declare function startBridge(cwd?: string, collabConfig?: CollabConfig | null, bridgePort?: number): {
+export declare function startBridge(cwd?: string, collabConfig?: CollabConfig | null, bridgePort?: number): Promise<{
     send: (msg: ServerBridgeMessage) => void;
     close(): void;
-};
+}>;
 export {};