fluxflow-cli 3.16.5 → 3.17.0

package/dist/fluxflow.js

@@ -2570,7 +2570,7 @@ var init_build = __esm({
 
 // src/utils/text.js
 import os2 from "os";
-var flattenString, wrapText, formatTokens, truncatePath, parsePatchPairs, applyPatches, generateHighFidelityDiff, parseLineInfo, getSimilarity, alignChangeGroup, blocksCache, streamingBlocksCache, MAX_CACHE_SIZE, CHUNK_SIZE, indexBlockIntoMap, parseMessageToBlocks, TOOL_LABELS, REGEX_INITIAL_THINK, REGEX_INITIAL_TOOL, REGEX_CLEAN_SIGNALS, REGEX_ARROWS_ALL, REGEX_TOOLS, cleanSignals, clearBlocksCache;
+var flattenString, wrapText, formatTokens, truncatePath, parsePatchPairs, applyPatches, generateHighFidelityDiff, parseLineInfo, getSimilarity, alignChangeGroup, blocksCache, streamingBlocksCache, MAX_CACHE_SIZE, CHUNK_SIZE, indexBlockIntoMap, parseMessageToBlocks, TOOL_LABELS, REGEX_INITIAL_THINK, REGEX_INITIAL_TOOL, isInsideBacktick, REGEX_CLEAN_SIGNALS, REGEX_ARROWS_ALL, REGEX_TOOLS, bypassBacktick, cleanSignals, clearBlocksCache;
 var init_text = __esm({
   "src/utils/text.js"() {
     init_paths();
@@ -3345,12 +3345,20 @@ var init_text = __esm({
     };
     REGEX_INITIAL_THINK = /<\/think>(\r?\n){2}/gi;
     REGEX_INITIAL_TOOL = /(\r?\n){2}(?=\[?(?:tool:functions|tool\.functions|agent:generalist|agent\.generalist|\s*turn\s*:))/gi;
+    isInsideBacktick = (str, idx) => {
+      let inCode = false;
+      for (let i = 0; i < idx; i++) {
+        if (str[i] === "`") inCode = !inCode;
+      }
+      return inCode;
+    };
     REGEX_CLEAN_SIGNALS = /\[SYSTEM\][\s\S]*?\[\/SYSTEM\]|<(think|thought)>[\s\S]*?(?:<\/(think|thought)>|$)|\[ANSWER\][\s\S]*?(?:\[\/ANSWER\]|$)|\[TOOL RESULT\]:?\s*|^\s*(SUCCESS|ERROR):.*(\r?\n)?|\[\s*turn\s*:\s*(continue|finish)\s*\]|\[\[END\]\]|\[\s*turn\s*:?.*?$|\n\s*turn\s*:?.*?$|\[\s*$|\n\nResponded on .*|\n\n\[Prompted on: .*\]|@\[TerminalName:.*?, ProcessId:.*?\]/gmi;
     REGEX_ARROWS_ALL = /(\$?\\?\/?\\rightarrow\$?|\$\\rightarrow\$)|(\$?\\?\/?\\leftarrow\$?|\$\\leftarrow\$)|(\$?\\?\/?\\uparrow\$?|\$\\uparrow\$)|(\$?\\?\/?\\downarrow\$?|\$\\downarrow\$)|(\$?\\?\/?\\leftrightarrow\$?|\$\\leftrightarrow\$)/gi;
     REGEX_TOOLS = /\b(write_file|update_file|read_folder|view_file|exec_command|web_search|web_scrape|search_keyword|write_pdf|write_docx|generate_image)\b/gi;
+    bypassBacktick = false;
     cleanSignals = (text) => {
       if (!text) return text;
-      let result = text.replace(REGEX_INITIAL_THINK, "</think>").replace(REGEX_INITIAL_TOOL, "");
+      let result = text.replace(REGEX_INITIAL_THINK, "</think>").replace(REGEX_INITIAL_TOOL, (match, _nl, offset, str) => !bypassBacktick && isInsideBacktick(str, offset) ? match : "");
       const trigger = "tool:functions.";
       const subagentTrigger = "agent:generalist.";
       if (result.toLowerCase().includes(trigger) || result.toLowerCase().includes(subagentTrigger)) {
@@ -3365,6 +3373,35 @@ var init_text = __esm({
             triggerIdxToUse = subagentIdx;
           }
           if (triggerIdxToUse === -1) break;
+          if (!bypassBacktick && isInsideBacktick(result, triggerIdxToUse)) {
+            const searchFrom = triggerIdxToUse + currentTrigger.length;
+            const nextTool = lowerResult.indexOf(trigger, searchFrom);
+            const nextAgent = lowerResult.indexOf(subagentTrigger, searchFrom);
+            if (nextTool === -1 && nextAgent === -1) break;
+            let safeIdx = -1;
+            let searchPos = 0;
+            while (true) {
+              const tIdx = lowerResult.indexOf(trigger, searchPos);
+              const aIdx = lowerResult.indexOf(subagentTrigger, searchPos);
+              let candidate = -1;
+              let candidateTrigger = trigger;
+              if (tIdx === -1 && aIdx === -1) break;
+              if (tIdx === -1 || aIdx !== -1 && aIdx < tIdx) {
+                candidate = aIdx;
+                candidateTrigger = subagentTrigger;
+              } else {
+                candidate = tIdx;
+              }
+              if (!isInsideBacktick(result, candidate)) {
+                safeIdx = candidate;
+                currentTrigger = candidateTrigger;
+                break;
+              }
+              searchPos = candidate + candidateTrigger.length;
+            }
+            if (safeIdx === -1) break;
+            triggerIdxToUse = safeIdx;
+          }
           let startIdx = triggerIdxToUse;
           let hasOuterBracket = false;
           let k = triggerIdxToUse - 1;
@@ -6808,8 +6845,8 @@ var init_main_tools = __esm({
       }
       return `
 -- TOOL DEFINITIONS --
-Tool calls: ONLY use [tool:functions.ToolName(args)]
-**NO OTHER SYNTAX/MARKERS/BOUNDARY ALLOWED**
+Tool calls: ONLY use [tool:functions.ToolName(arg1="value1")]
+**NO OTHER SYNTAX/MARKERS/WRAPPER/BOUNDARY ALLOWED**
 
 **TOOL CALLS POLICY:**
 - MAX 4 TOOL CALLS/TURN${mode === "Flux" ? " (Todo: 4+, Run: max 1 or 2 consecutive)" : ""}
@@ -6830,25 +6867,26 @@ ${mode === "Flux" ? `- Escape quotes: \\" for code strings
 
 ${mode === "Flux" ? `- WORKSPACE TOOLS (path = relative; FIRST ARGUMENT, path separator: '/') -
 - [tool:functions.ReadFile(path="...", startLine="integer", endLine="integer")]. ${aiProvider !== "Google" ? `${isMultiModal ? `Supports images/docs` : ""}` : `Supports images/docs`}
-- [tool:functions.ReadFolder(path="...", recurse="integer 1-3 optional, default: 1")]. DIR Contents + File Size. Last resort. Minimize recursion
+- [tool:functions.ReadFolder(path="...", recurse="integer 1-3 optional, default: 1")]. DIR Contents + File Size. Minimize recursion
 - [tool:functions.PatchFile(path="...", allowMultiple="bool optional, default: false", replaceContent1="...", newContent1="...", ...MAX15)]. TARGET MINIMAL DIFF. allowMultiple: Replace all matches ONLY WHEN SURE. Multi-blocks: replaceContent2/newContent2... Verify diffs
 - [tool:functions.WriteFile(path="...", content="...")]. Creates/Overwrites. File Exist? PatchFile > WriteFile
 - [tool:functions.SearchKeyword(keyword="...", path="optional, dir/file/glob/regex", fuzzy="bool optional, default: false", regex="bool optional, default: auto")]. path scopes search. Find definitions, logic, relevant code
 - [tool:functions.Run(command="...")]. Runs ${osDetected === "Windows" ? isPsAvailable() ? `POWERSHELL` : `WINDOWS CMD` : `BASH`} command. Destructive/Irreversible ops \u2192 Ask user
-- [tool:functions.Todo(method="create/append/get", tasks=[ARRAY OF STRINGS], markDone=[ARRAY OF TASKS])]. Task list, no Markdown in arrays. Analyze request: ONLY if long multi-task, break it down & create Todos BEFORE starting. \`tasks\` & \`markDone\` optional with \`get\`. Use \`get + markDone\` to complete tasks. **UPDATE EVERY TURN WHEN CREATED**${enableSubAgents ? '\n- [tool:functions.Await(time="integer 15-180")]. For waiting without exiting agent loop' : ""}
+- [tool:functions.Todo(method="create/append/get", tasks=[ARRAY OF STRINGS], markDone=[ARRAY OF TASKS])]. Task list, no Markdown in arrays. Analyze request: ONLY if long multi-task, break it down & create Todos BEFORE starting. \`tasks\` & \`markDone\` optional with \`get\`. Use \`get + markDone\` to complete tasks. **UPDATE EVERY TURN WHEN CREATED**
 ${_cachedAdvanceRollback ? `
-- EMERGENCY SAFETY TOOLS -
+- EMERGENCY TOOLS -
 Info: \`initial\` = current task prompt. Revert \`id\` = turn before disaster (eg. disaster: \`turn_3\` \u2192 revert: \`turn_2\`). Reason explicitly
 - [tool:functions.EmergencyRollback(method="getCheckpoint/forceRevert", id="...")]. Rollback workspace in THIS agent loop. ONLY for catastrophic corruption. Before ending, verify no catastrophe. \`id\` omitted for \`getCheckpoint\`
 ` : ""}${enableSubAgents ? `
 - SUB AGENT TOOLS -
 **PROACTIVE sub-agent use HIGHLY RECOMMENDED. Prefer for any task with even slight benefit, no user nudge needed**
 Invocations:
-\u2022 Invoke (async/background, \u22647 parallel). Parallelize long tasks. NEVER repeat while active, meantime, do your OWN work
+\u2022 Invoke (async/background, \u22647 parallel). Parallelize long tasks. May take time
 \u2022 InvokeSync (sync/blocking). Sequential, repetitive or delegated tasks. Saves tokens/cost
-- [agent:generalist.InvokeSync/Invoke(title="...", task="...")]. Task must be detailed: exact file paths, imports/exports, dependencies & folder structure
-- [agent:generalist.GetProgress(id="...")]. Poll \`getProgress\` sparingly (exp backoff Await); **NO IMMEDIATE FIRST POLL**
-- [agent:generalist.Cancel(id="...")]. Cancel async task ONLY if stalled (2m+) or clearly incorrect` : ""}`.trim() : `- CREATIVE TOOLS (path = relative to CWD & WILL BE FIRST ARGUMENT, path separator: '/') -
+- [tool:functions.InvokeSync/Invoke(title="...", task="...")]. Task must be detailed: exact file paths, imports/exports, dependencies & folder structure
+- [tool:functions.Await(id="...", timeout="integer seconds, default: 120")]. Event-driven wait
+- [tool:functions.GetProgress(id="...")]. Poll \`getProgress\` sparingly; NO initial poll. Work or await. Never end while subagent runs
+- [tool:functions.Cancel(id="...")]. Cancel async task ONLY if stalled (2m+) or clearly incorrect` : ""}`.trim() : `- CREATIVE TOOLS (path = relative to CWD & WILL BE FIRST ARGUMENT, path separator: '/') -
 - [tool:functions.WritePDF(path="...", content="...", orientation="...")]. PROACTIVE A4 PAGE BREAKS MUST IN CSS. HTML/CSS for PREMIUM layout, stable margins & headers/footers, NO WATERMARKS
 - [tool:functions.WriteDoc(path="...", content="...")]. A4 Word document, NO WATERMARKS, stable margins & headers/footers
 - WORKSPACE & SUB AGENT TOOLS ARE NOT AVAILABLE IN FLOW`.trim()}`.trim();
@@ -8565,7 +8603,7 @@ Check these first; These Files > Training Data. Safety rules apply
 Identity: Flux Flow. Sassy, CLI Agent
 ${mode === "Flux" ? "Logical, task-driven. Prioritize scalable, modular architecture, clean abstractions, stepwise execution. Use latest practices/libraries, verify imports, run automated tests" : `Mode: ${mode}. Concise, Conversational, Sassy, Friendly, Humorous, Sarcastic`}
 
-- RESOLVE FILES AND PATHS FROM THE PROVIDED DIRECTORY STRUCTURE
+- USE DIRECTORY STRUCTURE FOR FILE AVAILABILITY AND PATH RESOLUTION
 - USE RELATIVE TIME REFERENCE eg. few mins ago
 
 -- THINKING GUIDANCE --
@@ -8585,7 +8623,7 @@ ${projectContextBlock}${isMemoryEnabled ? `
 -- CHAT FORMATTING --
 - GFM Markdown ONLY
 - Same Language as User Query
-- Before tool calls, briefly state intent. After, emit no chat
+- After tool calls emit no chat in this turn
 - On completion: summarize changes (why) + edited files${mode === "Flux" ? "" : "\n- Use Kaomojis HEAVILY"}
 === END SYSTEM PROMPT ===
 
@@ -10240,9 +10278,8 @@ ${finalResults}`;
 
 // src/tools/web_scrape.js
 import puppeteer2 from "puppeteer";
-import fs13 from "fs";
-import path12 from "path";
 import TurndownService from "turndown";
+import { gfm } from "turndown-plugin-gfm";
 var web_scrape;
 var init_web_scrape = __esm({
   "src/tools/web_scrape.js"() {
@@ -10284,7 +10321,7 @@ var init_web_scrape = __esm({
           await page.goto(url, { waitUntil: "networkidle2", timeout: 18e4 });
           await new Promise((r) => setTimeout(r, 5e3));
           let htmlContent = await page.evaluate(() => {
-            const junk = document.querySelectorAll("script, style, nav, footer, header, noscript, svg, canvas, iframe, ad, .ads, link, meta, img");
+            const junk = document.querySelectorAll("script, style, noscript, svg, canvas, iframe, ad, .ads, link, meta, img");
             junk.forEach((el) => el.remove());
             const iterator = document.createNodeIterator(document.body, NodeFilter.SHOW_COMMENT);
             let currentNode;
@@ -10330,6 +10367,7 @@ var init_web_scrape = __esm({
             headingStyle: "atx",
             codeBlockStyle: "fenced"
           });
+          turndownService.use(gfm);
           const rawMarkdown = turndownService.turndown(cleanedHtml).replace(/\.\s*\n/g, "\n").replace(/ +/g, " ").replace(/\t/g, "  ").replace(/\n\s+/g, "\n").replace(/\n{3,}/g, "\n\n");
           const markdown = rawMarkdown.substring(0, 5e4);
           await browser.close();
@@ -10339,7 +10377,6 @@ ${markdown}${rawMarkdown.length > 5e4 ? "\n\n[TRUNCATED AT 50K CHARS]" : ""}`;
         } catch (err) {
           lastError = err;
           if (browser) await browser.close();
-          fs13.writeFileSync(path12.join(LOGS_DIR, "web_tools", "scrape", "standard_mode", "ERROR.txt"), err.message);
           if (attempt < maxRetries) {
             const backoff = Math.pow(2, attempt) * 1e3;
             await new Promise((r) => setTimeout(r, backoff));
@@ -10463,8 +10500,8 @@ var init_chat = __esm({
 });
 
 // src/tools/view_file.js
-import fs14 from "fs";
-import path13 from "path";
+import fs13 from "fs";
+import path12 from "path";
 var view_file;
 var init_view_file = __esm({
   "src/tools/view_file.js"() {
@@ -10478,16 +10515,16 @@ var init_view_file = __esm({
       let finalStart = sLine || 1;
       let finalEnd = eLine || (sLine ? sLine + 800 : 800);
       if (!targetPath) return 'ERROR: Missing "path" argument for view_file.';
-      const absolutePath = path13.resolve(process.cwd(), targetPath);
+      const absolutePath = path12.resolve(process.cwd(), targetPath);
       try {
-        if (!fs14.existsSync(absolutePath)) {
+        if (!fs13.existsSync(absolutePath)) {
           return `ERROR: File [${targetPath}] does not exist.`;
         }
-        const stats = fs14.statSync(absolutePath);
+        const stats = fs13.statSync(absolutePath);
         if (stats.isDirectory()) {
           return `ERROR: Path [${targetPath}] is a directory. Use list_files instead.`;
         }
-        const ext = path13.extname(targetPath).toLowerCase();
+        const ext = path12.extname(targetPath).toLowerCase();
         const videoExtensions = [".mp4", ".mkv", ".avi", ".mov", ".webm", ".flv", ".wmv", ".mpeg", ".mpg"];
         if (videoExtensions.includes(ext)) {
           const format = ext.slice(1).toUpperCase();
@@ -10507,7 +10544,7 @@ var init_view_file = __esm({
           if (!isMultiModal) {
             return `ERROR: Multimodality is not supported for the current model. Unable to load [${targetPath}].`;
           }
-          const buffer = fs14.readFileSync(absolutePath);
+          const buffer = fs13.readFileSync(absolutePath);
           const base64 = buffer.toString("base64");
           const mimeType = mimeMap[ext];
           return {
@@ -10520,7 +10557,7 @@ var init_view_file = __esm({
             }
           };
         }
-        let content = fs14.readFileSync(absolutePath, "utf8");
+        let content = fs13.readFileSync(absolutePath, "utf8");
         if (content.startsWith("\uFEFF")) {
           content = content.slice(1);
         }
@@ -10548,8 +10585,8 @@ ${code}`;
 });
 
 // src/tools/write_file.js
-import fs15 from "fs";
-import path14 from "path";
+import fs14 from "fs";
+import path13 from "path";
 var write_file;
 var init_write_file = __esm({
   "src/tools/write_file.js"() {
@@ -10560,14 +10597,14 @@ var init_write_file = __esm({
       if (!targetPath) return 'ERROR: Missing "path" argument for write_file.';
       if (content === void 0) return 'ERROR: Missing "content" argument for write_file.';
       content = content.replace(/^```[\w]*\n?/, "").replace(/```\s*$/, "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-      const absolutePath = path14.resolve(process.cwd(), targetPath);
-      const parentDir = path14.dirname(absolutePath);
+      const absolutePath = path13.resolve(process.cwd(), targetPath);
+      const parentDir = path13.dirname(absolutePath);
       try {
         await RevertManager.recordFileChange(absolutePath);
         let ancestry = "";
-        if (fs15.existsSync(absolutePath)) {
+        if (fs14.existsSync(absolutePath)) {
           try {
-            const oldData = fs15.readFileSync(absolutePath, "utf8");
+            const oldData = fs14.readFileSync(absolutePath, "utf8");
             const lines = oldData.split(/\r?\n/);
             ancestry = `Old File contents:
 ${lines.map((l, i) => `${i + 1} | ${l}`).join("\n")}
@@ -10579,16 +10616,16 @@ ${lines.map((l, i) => `${i + 1} | ${l}`).join("\n")}
 `;
           }
         }
-        if (!fs15.existsSync(parentDir)) {
-          fs15.mkdirSync(parentDir, { recursive: true });
+        if (!fs14.existsSync(parentDir)) {
+          fs14.mkdirSync(parentDir, { recursive: true });
         }
         const strip = (t) => t.replace(/^```[\w]*\n?/, "").replace(/```\s*$/, "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
         const processedContent = strip(content);
         const finalContent = processedContent.endsWith("\n") ? processedContent : processedContent + "\n";
         const lineCount = finalContent.split(/\r?\n/).length;
         const originalSize = Buffer.byteLength(finalContent, "utf8");
-        fs15.writeFileSync(absolutePath, finalContent, "utf8");
-        let verifiedContent = fs15.readFileSync(absolutePath, "utf8");
+        fs14.writeFileSync(absolutePath, finalContent, "utf8");
+        let verifiedContent = fs14.readFileSync(absolutePath, "utf8");
         const verifiedSize = Buffer.byteLength(verifiedContent, "utf8");
         const verifiedLines = verifiedContent.split(/\r?\n/);
         const verifiedLineCount = verifiedLines.length;
@@ -10623,8 +10660,8 @@ ${snippet}`;
 });
 
 // src/tools/update_file.js
-import fs16 from "fs";
-import path15 from "path";
+import fs15 from "fs";
+import path14 from "path";
 var update_file;
 var init_update_file = __esm({
   "src/tools/update_file.js"() {
@@ -10641,12 +10678,12 @@ var init_update_file = __esm({
         return "ERROR: No valid replacement pairs found. Use replaceContent1, newContent1, etc.";
       }
       const allowMultiple = parsed.allowMultiple !== void 0 ? parsed.allowMultiple === true || String(parsed.allowMultiple).toLowerCase() === "true" : parsedAllowMultiple;
-      const absolutePath = path15.resolve(process.cwd(), targetPath);
+      const absolutePath = path14.resolve(process.cwd(), targetPath);
       try {
-        if (!fs16.existsSync(absolutePath)) {
+        if (!fs15.existsSync(absolutePath)) {
           return `ERROR: File [${targetPath}] does not exist. Use WriteFile instead.`;
         }
-        let diskContent = context.forcedContent || fs16.readFileSync(absolutePath, "utf8");
+        let diskContent = context.forcedContent || fs15.readFileSync(absolutePath, "utf8");
         if (diskContent.startsWith("\uFEFF")) diskContent = diskContent.slice(1);
         const originalContent = diskContent.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
         const { content: finalContent, results } = applyPatches(originalContent, patchPairs, { allowMultiple });
@@ -10657,7 +10694,7 @@ var init_update_file = __esm({
 ${failures.map((f) => `  \u2022 ${f.error}`).join("\n")}`;
         }
         await RevertManager.recordFileChange(absolutePath, originalContent);
-        fs16.writeFileSync(absolutePath, finalContent, "utf8");
+        fs15.writeFileSync(absolutePath, finalContent, "utf8");
         const diffText = generateHighFidelityDiff(originalContent, finalContent, results, 12);
         if (failures.length > 0) {
           return `SUCCESS: File [${targetPath}] updated with some blocks failed. [${successes.length}/${patchPairs.length}] blocks applied.
@@ -10679,8 +10716,8 @@ ${diffText}`;
 });
 
 // src/tools/read_folder.js
-import fs17 from "fs";
-import path16 from "path";
+import fs16 from "fs";
+import path15 from "path";
 var EXCLUDED_DIRS, isExcludedDir, formatMtime, read_folder;
 var init_read_folder = __esm({
   "src/tools/read_folder.js"() {
@@ -10857,26 +10894,26 @@ var init_read_folder = __esm({
         }
       }
       recurseDepth = Math.max(1, Math.min(3, recurseDepth));
-      const absolutePath = path16.resolve(process.cwd(), targetPath);
+      const absolutePath = path15.resolve(process.cwd(), targetPath);
       try {
-        if (!fs17.existsSync(absolutePath)) {
+        if (!fs16.existsSync(absolutePath)) {
           return `ERROR: Path [${targetPath}] does not exist.`;
         }
-        const stats = fs17.statSync(absolutePath);
+        const stats = fs16.statSync(absolutePath);
         if (!stats.isDirectory()) {
           return `ERROR: Path [${targetPath}] is a file, not a directory. Use ReadFile instead.`;
         }
         if (recurseDepth === 1) {
-          const files = fs17.readdirSync(absolutePath);
+          const files = fs16.readdirSync(absolutePath);
           const totalItems = files.length;
           const maxDisplay = 150;
           const displayItems = files.slice(0, maxDisplay);
           const folderData = [];
           for (const file of displayItems) {
-            const fPath = path16.join(absolutePath, file);
+            const fPath = path15.join(absolutePath, file);
             let info = { name: file, type: "unknown", size: "N/A", mtime: "N/A" };
             try {
-              const fStats = fs17.statSync(fPath);
+              const fStats = fs16.statSync(fPath);
               info = {
                 name: file,
                 type: fStats.isDirectory() ? "directory" : "file",
@@ -10918,7 +10955,7 @@ ${formatted}${footer2}`;
           if (currentDepth > recurseDepth || truncated) return [];
           let entries = [];
           try {
-            entries = fs17.readdirSync(dirPath);
+            entries = fs16.readdirSync(dirPath);
           } catch (e) {
             const indent2 = "  ".repeat(depth - 1);
             return [`${indent2}[Inaccessible Directory]`];
@@ -10926,10 +10963,10 @@ ${formatted}${footer2}`;
           const subDirs = [];
           const fileEntries = [];
           for (const name of entries) {
-            const fullPath = path16.join(dirPath, name);
+            const fullPath = path15.join(dirPath, name);
             let isDir = false;
             try {
-              isDir = fs17.statSync(fullPath).isDirectory();
+              isDir = fs16.statSync(fullPath).isDirectory();
             } catch (e) {
             }
             if (isDir) {
@@ -10967,7 +11004,7 @@ ${formatted}${footer2}`;
             totalFiles++;
             let sizeStr = "N/A";
             try {
-              const fStats = fs17.statSync(file.fullPath);
+              const fStats = fs16.statSync(file.fullPath);
               sizeStr = (fStats.size / 1024).toFixed(1) + "KB";
             } catch (e) {
             }
@@ -11042,8 +11079,8 @@ var init_ask_user = __esm({
 
 // src/tools/write_pdf.js
 import puppeteer3 from "puppeteer";
-import path17 from "path";
-import fs18 from "fs-extra";
+import path16 from "path";
+import fs17 from "fs-extra";
 import { PDFDocument } from "pdf-lib";
 var write_pdf;
 var init_write_pdf = __esm({
@@ -11060,10 +11097,10 @@ var init_write_pdf = __esm({
       } = parseArgs(args);
       if (!targetPath) return 'ERROR: Missing "path" argument for write_pdf.';
       if (!content) return 'ERROR: Missing "content" (HTML/CSS) for write_pdf.';
-      const absolutePath = path17.resolve(process.cwd(), targetPath);
+      const absolutePath = path16.resolve(process.cwd(), targetPath);
       let browser = null;
       try {
-        await fs18.ensureDir(path17.dirname(absolutePath));
+        await fs17.ensureDir(path16.dirname(absolutePath));
         await RevertManager.recordFileChange(absolutePath);
         const pptrConfig = getPuppeteerConfig();
         browser = await puppeteer3.launch({
@@ -11084,11 +11121,11 @@ var init_write_pdf = __esm({
             return null;
           }
           try {
-            const imgPath = path17.resolve(process.cwd(), originalSrc);
-            if (await fs18.pathExists(imgPath)) {
-              const ext = path17.extname(imgPath).toLowerCase().replace(".", "") || "png";
+            const imgPath = path16.resolve(process.cwd(), originalSrc);
+            if (await fs17.pathExists(imgPath)) {
+              const ext = path16.extname(imgPath).toLowerCase().replace(".", "") || "png";
               const mime = ext === "jpg" ? "jpeg" : ext === "svg" ? "svg+xml" : ext;
-              const base64 = await fs18.readFile(imgPath, "base64");
+              const base64 = await fs17.readFile(imgPath, "base64");
               return `data:image/${mime};base64,${base64}`;
             }
           } catch (e) {
@@ -11103,9 +11140,9 @@ var init_write_pdf = __esm({
           const fullTag = match[0];
           if (originalHref && fullTag.toLowerCase().includes("stylesheet") && !originalHref.startsWith("http://") && !originalHref.startsWith("https://") && !originalHref.startsWith("data:")) {
             try {
-              const cssPath = path17.resolve(process.cwd(), originalHref);
-              if (await fs18.pathExists(cssPath)) {
-                const cssContent = await fs18.readFile(cssPath, "utf-8");
+              const cssPath = path16.resolve(process.cwd(), originalHref);
+              if (await fs17.pathExists(cssPath)) {
+                const cssContent = await fs17.readFile(cssPath, "utf-8");
                 cssCache[fullTag] = `<style>${cssContent}</style>`;
               }
             } catch (e) {
@@ -11186,7 +11223,7 @@ var init_write_pdf = __esm({
           printBackground: true
         });
         const pdfDoc = await PDFDocument.load(pdfBytes);
-        const fileName = path17.basename(targetPath);
+        const fileName = path16.basename(targetPath);
         pdfDoc.setTitle(`FluxFlow_${fileName}`);
         pdfDoc.setAuthor("FluxFlow CLI");
         pdfDoc.setSubject("Generated with Agentic AI System");
@@ -11194,8 +11231,8 @@ var init_write_pdf = __esm({
         pdfDoc.setCreator("FluxFlow PDF Engine");
         pdfDoc.setProducer("FluxFlow (Generative AI)");
         const finalPdfBytes = await pdfDoc.save();
-        await fs18.writeFile(absolutePath, finalPdfBytes);
-        const stats = await fs18.stat(absolutePath);
+        await fs17.writeFile(absolutePath, finalPdfBytes);
+        const stats = await fs17.stat(absolutePath);
         return `SUCCESS: PDF generated successfully at [${targetPath}] (${(stats.size / 1024).toFixed(2)} KB).`;
       } catch (err) {
         const errorMsg = err instanceof Error ? err.message : String(err);
@@ -11208,8 +11245,8 @@ var init_write_pdf = __esm({
 });
 
 // src/tools/write_docx.js
-import fs19 from "fs-extra";
-import path18 from "path";
+import fs18 from "fs-extra";
+import path17 from "path";
 import HTMLtoDOCX from "html-to-docx";
 var write_docx;
 var init_write_docx = __esm({
@@ -11223,11 +11260,11 @@ var init_write_docx = __esm({
       } = parseArgs(args);
       if (!targetPath) return 'ERROR: Missing "path" argument for write_docx.';
       if (!content) return 'ERROR: Missing "content" (HTML) for write_docx.';
-      const absolutePath = path18.resolve(process.cwd(), targetPath);
+      const absolutePath = path17.resolve(process.cwd(), targetPath);
       try {
-        await fs19.ensureDir(path18.dirname(absolutePath));
+        await fs18.ensureDir(path17.dirname(absolutePath));
         await RevertManager.recordFileChange(absolutePath);
-        const fileName = path18.basename(targetPath);
+        const fileName = path17.basename(targetPath);
         const fullHtml = content.includes("<html") ? content : `
             <!DOCTYPE html>
             <html lang="en">
@@ -11248,7 +11285,7 @@ var init_write_docx = __esm({
           footer: true,
           pageNumber: true
         });
-        await fs19.writeFile(absolutePath, docxBuffer);
+        await fs18.writeFile(absolutePath, docxBuffer);
         return `SUCCESS: Word document [${targetPath}] generated successfully.
 - Size: ${(docxBuffer.length / 1024).toFixed(1)} KB`;
       } catch (err) {
@@ -11260,22 +11297,22 @@ var init_write_docx = __esm({
 });
 
 // src/tools/search_keyword.js
-import fs20 from "fs/promises";
-import path19 from "path";
+import fs19 from "fs/promises";
+import path18 from "path";
 import fg from "fast-glob";
 async function getFilesRecursively(dir, excludes, baseDir = dir, depth = 1) {
   if (depth > 12) return [];
   let results = [];
   let list;
   try {
-    list = await fs20.readdir(dir, { withFileTypes: true });
+    list = await fs19.readdir(dir, { withFileTypes: true });
   } catch {
     return [];
   }
   for (const file of list) {
-    const fullPath = path19.join(dir, file.name);
-    const relativePath = path19.relative(baseDir, fullPath);
-    const pathSegments = relativePath.split(path19.sep).map((s) => s.toLowerCase());
+    const fullPath = path18.join(dir, file.name);
+    const relativePath = path18.relative(baseDir, fullPath);
+    const pathSegments = relativePath.split(path18.sep).map((s) => s.toLowerCase());
     const fileNameLower = file.name.toLowerCase();
     const isExcluded = excludes.some((ex) => {
       const exLower = ex.toLowerCase();
@@ -11568,7 +11605,7 @@ var init_search_keyword = __esm({
             }
             if (matchedPaths.length === 0 && (hasRegexSyntax || fg.isDynamicPattern(posixPath))) {
               const baseDirMatch = posixPath.match(/^([^\*\?\(\)\|\[\]\s]+)\//);
-              const scanDir = baseDirMatch && !/[\*\?\(\)\|\[\]]/.test(baseDirMatch[1]) ? path19.resolve(rootDir, baseDirMatch[1]) : rootDir;
+              const scanDir = baseDirMatch && !/[\*\?\(\)\|\[\]]/.test(baseDirMatch[1]) ? path18.resolve(rootDir, baseDirMatch[1]) : rootDir;
               const allFiles = await getFilesRecursively(scanDir, excludes, rootDir);
               try {
                 let cleanRegexStr = posixPath.replace(/^\.\//, "");
@@ -11586,21 +11623,21 @@ var init_search_keyword = __esm({
               }
             } else {
               filesToSearch = matchedPaths.map((relP) => ({
-                fullPath: path19.resolve(rootDir, relP),
+                fullPath: path18.resolve(rootDir, relP),
                 relativePath: relP
               }));
             }
           } else {
             const normalised = pathArg.replace(/[\/\\]+$/, "");
-            const fullPath = path19.resolve(rootDir, normalised);
+            const fullPath = path18.resolve(rootDir, normalised);
             try {
-              const stat = await fs20.stat(fullPath);
+              const stat = await fs19.stat(fullPath);
               if (stat.isDirectory()) {
                 pathArgType = "dir";
                 filesToSearch = await getFilesRecursively(fullPath, excludes, rootDir);
               } else if (stat.isFile()) {
                 pathArgType = "file";
-                filesToSearch.push({ fullPath, relativePath: path19.relative(rootDir, fullPath) });
+                filesToSearch.push({ fullPath, relativePath: path18.relative(rootDir, fullPath) });
               } else {
                 return `ERROR: Path is neither a file nor a directory: ${pathArg}`;
               }
@@ -11613,7 +11650,7 @@ var init_search_keyword = __esm({
         }
         const searchPromises = filesToSearch.map(async (fileObj) => {
           try {
-            const content = await fs20.readFile(fileObj.fullPath, "utf-8");
+            const content = await fs19.readFile(fileObj.fullPath, "utf-8");
             if (content.includes("\0")) return [];
             const lines = content.split(/\r?\n/);
             const fileMatches = [];
@@ -11683,8 +11720,8 @@ var init_search_keyword = __esm({
 });
 
 // src/tools/generate_image.js
-import fs21 from "fs-extra";
-import path20 from "path";
+import fs20 from "fs-extra";
+import path19 from "path";
 var injectPngMetadata, generate_image;
 var init_generate_image = __esm({
   "src/tools/generate_image.js"() {
@@ -11863,12 +11900,12 @@ var init_generate_image = __esm({
           "Seed": String(seed)
         };
         finalBuffer = injectPngMetadata(finalBuffer, metadata);
-        const absolutePath = path20.resolve(process.cwd(), outputPath);
-        await fs21.ensureDir(path20.dirname(absolutePath));
+        const absolutePath = path19.resolve(process.cwd(), outputPath);
+        await fs20.ensureDir(path19.dirname(absolutePath));
         await RevertManager.recordFileChange(absolutePath);
-        await fs21.writeFile(absolutePath, finalBuffer);
+        await fs20.writeFile(absolutePath, finalBuffer);
         await recordImageGeneration(settings);
-        const ext = path20.extname(outputPath).toLowerCase();
+        const ext = path19.extname(outputPath).toLowerCase();
         const mimeMap = {
           ".jpg": "image/jpeg",
           ".jpeg": "image/jpeg",
@@ -11983,13 +12020,13 @@ var init_addMemScore = __esm({
 });
 
 // src/utils/parsers.js
-import fs22 from "fs-extra";
-import path21 from "path";
+import fs21 from "fs-extra";
+import path20 from "path";
 import https from "https";
 async function downloadWasm(wasmFile, targetUrl = null) {
   const url = targetUrl || `https://unpkg.com/tree-sitter-wasms@0.1.13/out/${wasmFile}`;
-  const localPath = path21.join(PARSER_DIR, wasmFile);
-  await fs22.ensureDir(PARSER_DIR);
+  const localPath = path20.join(PARSER_DIR, wasmFile);
+  await fs21.ensureDir(PARSER_DIR);
   return new Promise((resolve, reject) => {
     const options = {
       headers: {
@@ -12010,27 +12047,27 @@ async function downloadWasm(wasmFile, targetUrl = null) {
         reject(new Error(`Failed to download ${wasmFile}: HTTP ${response.statusCode}`));
         return;
       }
-      const file = fs22.createWriteStream(localPath);
+      const file = fs21.createWriteStream(localPath);
       response.pipe(file);
       file.on("finish", () => {
         file.close();
         resolve();
       });
     }).on("error", (err) => {
-      if (fs22.existsSync(localPath)) fs22.unlink(localPath, () => {
+      if (fs21.existsSync(localPath)) fs21.unlink(localPath, () => {
       });
       reject(err);
     });
   });
 }
 function isParserInstalled(wasmFile) {
-  const localPath = path21.join(PARSER_DIR, wasmFile);
-  return fs22.existsSync(localPath);
+  const localPath = path20.join(PARSER_DIR, wasmFile);
+  return fs21.existsSync(localPath);
 }
 async function deleteParser(wasmFile) {
-  const localPath = path21.join(PARSER_DIR, wasmFile);
-  if (fs22.existsSync(localPath)) {
-    await fs22.unlink(localPath);
+  const localPath = path20.join(PARSER_DIR, wasmFile);
+  if (fs21.existsSync(localPath)) {
+    await fs21.unlink(localPath);
   }
 }
 var EXTENSION_TO_WASM;
@@ -12052,8 +12089,8 @@ var init_parsers = __esm({
 });
 
 // src/tools/file_map.js
-import fs23 from "fs-extra";
-import path22 from "path";
+import fs22 from "fs-extra";
+import path21 from "path";
 import { createRequire as createRequire2 } from "module";
 function sanitize(text, limit = 50) {
   if (!text) return "";
@@ -12245,17 +12282,17 @@ var init_file_map = __esm({
       if (!filePath) {
         return 'ERROR: No file path provided. Use [tool:functions.FileMap(path="...")]';
       }
-      const absolutePath = path22.isAbsolute(filePath) ? filePath : path22.resolve(process.cwd(), filePath);
-      if (!fs23.existsSync(absolutePath)) {
+      const absolutePath = path21.isAbsolute(filePath) ? filePath : path21.resolve(process.cwd(), filePath);
+      if (!fs22.existsSync(absolutePath)) {
         return `ERROR: File not found: ${filePath}`;
       }
-      const ext = path22.extname(absolutePath).slice(1).toLowerCase();
+      const ext = path21.extname(absolutePath).slice(1).toLowerCase();
       const wasmFile = EXTENSION_TO_WASM[ext];
       if (!wasmFile) {
         return `ERROR: Unsupported file extension: .${ext}`;
       }
-      const wasmPath = path22.resolve(PARSER_DIR, wasmFile);
-      if (!fs23.existsSync(wasmPath)) {
+      const wasmPath = path21.resolve(PARSER_DIR, wasmFile);
+      if (!fs22.existsSync(wasmPath)) {
         return `ERROR: Parser for .${ext} not found. Please download it in Settings > Other.`;
       }
       try {
@@ -12263,9 +12300,9 @@ var init_file_map = __esm({
         if (!isParserInitialized) {
           let tsWasmPath;
           try {
-            tsWasmPath = path22.join(path22.dirname(require3.resolve("web-tree-sitter")), "tree-sitter.wasm");
+            tsWasmPath = path21.join(path21.dirname(require3.resolve("web-tree-sitter")), "tree-sitter.wasm");
           } catch (e) {
-            tsWasmPath = path22.join(process.cwd(), "node_modules", "web-tree-sitter", "tree-sitter.wasm");
+            tsWasmPath = path21.join(process.cwd(), "node_modules", "web-tree-sitter", "tree-sitter.wasm");
           }
           await Parser.init({
             locateFile: (p) => {
@@ -12280,7 +12317,7 @@ var init_file_map = __esm({
         const parser = new Parser();
         const Lang = await TreeSitter.Language.load(wasmPath);
         parser.setLanguage(Lang);
-        const sourceCode = await fs23.readFile(absolutePath, "utf8");
+        const sourceCode = await fs22.readFile(absolutePath, "utf8");
         const lines = sourceCode.split("\n").length;
         let maxDepth = 12;
         if (lines > 1e4) maxDepth = 2;
@@ -12303,8 +12340,8 @@ Stack: ${err.stack}` : "";
 });
 
 // src/tools/todo.js
-import fs24 from "fs";
-import path23 from "path";
+import fs23 from "fs";
+import path22 from "path";
 var todo;
 var init_todo = __esm({
   "src/tools/todo.js"() {
@@ -12315,8 +12352,8 @@ var init_todo = __esm({
       const { method, tasks, markDone } = parseArgs(args);
       const chatId = context.chatId || "default";
       if (!method) return 'ERROR: Missing "method" argument for todo tool (create/append/get).';
-      const todoDir = path23.join(DATA_DIR, "plan", chatId);
-      const todoFile = path23.join(todoDir, "todo.md");
+      const todoDir = path22.join(DATA_DIR, "plan", chatId);
+      const todoFile = path22.join(todoDir, "todo.md");
       const parseMessyArray = (input) => {
         if (!input || Array.isArray(input)) return input;
         const trimmed = String(input).trim();
@@ -12376,8 +12413,8 @@ var init_todo = __esm({
         };
       };
       try {
-        if (!fs24.existsSync(todoDir)) {
-          fs24.mkdirSync(todoDir, { recursive: true });
+        if (!fs23.existsSync(todoDir)) {
+          fs23.mkdirSync(todoDir, { recursive: true });
         }
         if (method === "create") {
           if (!tasks) return 'ERROR: Missing "tasks" for create method.';
@@ -12389,7 +12426,7 @@ var init_todo = __esm({
             markedCount = result.markedCount;
           }
           await RevertManager.recordFileChange(todoFile);
-          fs24.writeFileSync(todoFile, content, "utf8");
+          fs23.writeFileSync(todoFile, content, "utf8");
           const total = content.split(/\r?\n/).map((l) => l.trim()).filter((l) => l.startsWith("- [ ]") || l.startsWith("- [x]") || l.startsWith("- [X]")).length;
           if (markedCount > 0) {
             const completed = content.split(/\r?\n/).map((l) => l.trim()).filter((l) => l.startsWith("- [x]") || l.startsWith("- [X]")).length;
@@ -12403,8 +12440,8 @@ ${content}`;
           if (!tasks) return 'ERROR: Missing "tasks" for append method.';
           const appendContent = getTasksString(tasks);
           await RevertManager.recordFileChange(todoFile);
-          fs24.appendFileSync(todoFile, appendContent, "utf8");
-          const fullContent = fs24.readFileSync(todoFile, "utf8");
+          fs23.appendFileSync(todoFile, appendContent, "utf8");
+          const fullContent = fs23.readFileSync(todoFile, "utf8");
           const lines = fullContent.split(/\r?\n/).map((l) => l.trim());
           const total = lines.filter((l) => l.startsWith("- [ ]") || l.startsWith("- [x]") || l.startsWith("- [X]")).length;
           const completed = lines.filter((l) => l.startsWith("- [x]") || l.startsWith("- [X]")).length;
@@ -12413,10 +12450,10 @@ ${content}`;
 ${fullContent}`;
         }
         if (method === "get") {
-          if (!fs24.existsSync(todoFile)) {
+          if (!fs23.existsSync(todoFile)) {
             return "TODO GET: No task list found for this session.";
           }
-          let content = fs24.readFileSync(todoFile, "utf8");
+          let content = fs23.readFileSync(todoFile, "utf8");
           let markedCount = 0;
           if (markDone) {
             const result = applyMarkDone(content, markDone);
@@ -12424,7 +12461,7 @@ ${fullContent}`;
               content = result.content;
               markedCount = result.markedCount;
               await RevertManager.recordFileChange(todoFile);
-              fs24.writeFileSync(todoFile, content, "utf8");
+              fs23.writeFileSync(todoFile, content, "utf8");
             }
           }
           const totalLines = content.split(/\r?\n/).map((l) => l.trim());
@@ -12494,10 +12531,33 @@ var init_invokeSync = __esm({
 });
 
 // src/utils/subagent_state.js
-var subagentProgress;
+var subagent_state_exports = {};
+__export(subagent_state_exports, {
+  addPendingNudge: () => addPendingNudge,
+  clearPendingNudges: () => clearPendingNudges,
+  consumePendingNudges: () => consumePendingNudges,
+  pendingSubagentNudges: () => pendingSubagentNudges,
+  subagentProgress: () => subagentProgress
+});
+var subagentProgress, pendingSubagentNudges, addPendingNudge, consumePendingNudges, clearPendingNudges;
 var init_subagent_state = __esm({
   "src/utils/subagent_state.js"() {
     subagentProgress = [];
+    pendingSubagentNudges = [];
+    addPendingNudge = (msg) => {
+      if (msg) {
+        pendingSubagentNudges.push(msg);
+      }
+    };
+    consumePendingNudges = () => {
+      if (pendingSubagentNudges.length === 0) return [];
+      const nudges = [...pendingSubagentNudges];
+      pendingSubagentNudges = [];
+      return nudges;
+    };
+    clearPendingNudges = () => {
+      pendingSubagentNudges = [];
+    };
   }
 });
 
@@ -12529,13 +12589,24 @@ var init_invoke = __esm({
         }
       }
       const taskId = `subagent-${Date.now()}-${Math.floor(Math.random() * 1e3)}`;
+      let _resolveCompletion = null;
+      let _rejectCompletion = null;
+      const completionPromise = new Promise((res, rej) => {
+        _resolveCompletion = res;
+        _rejectCompletion = rej;
+      });
       const taskEntry = {
         id: taskId,
         title: title || task.substring(0, 30),
         task,
         status: "running",
+        startedAt: Date.now(),
         lastChunkTime: Date.now(),
         wps: 0,
+        questions: [],
+        completionPromise,
+        _resolveCompletion,
+        _rejectCompletion,
         progress: []
         // Array of arrays containing logs for each turn
       };
@@ -12548,6 +12619,32 @@ var init_invoke = __esm({
       const subagentContext = {
         ...context,
         taskId,
+        onAskMain: async (questionText, optionsObj) => {
+          const questionId = `q-${Date.now()}-${Math.floor(Math.random() * 1e3)}`;
+          let questionResolver = null;
+          const qPromise = new Promise((resolve) => {
+            questionResolver = resolve;
+          });
+          const qEntry = {
+            id: questionId,
+            question: questionText,
+            options: optionsObj,
+            answered: false,
+            answer: null,
+            askedAt: Date.now(),
+            _resolve: questionResolver
+          };
+          taskEntry.questions.push(qEntry);
+          taskEntry.status = "waiting";
+          if (context.onSubagentUpdate) {
+            context.onSubagentUpdate();
+          }
+          addPendingNudge(`[SYSTEM] Background subagent "${taskEntry.title}" is WAITING FOR YOUR INPUT: "${questionText}"
+Respond using tool: [tool:functions.Answer(id="${taskId}", answer="...")]
+[/SYSTEM]`);
+          const answer = await qPromise;
+          return answer;
+        },
         onVisualFeedback: (feedbackLabel) => {
           taskEntry.lastChunkTime = Date.now();
           const clean = feedbackLabel.replace(/\x1b\[[0-9;]*m/g, "");
@@ -12609,16 +12706,22 @@ var init_invoke = __esm({
         if (context.onSubagentUpdate) {
           context.onSubagentUpdate();
         }
-      }).then((finalAnswer) => {
-        if (taskEntry.status === "cancelled") return;
-        currentTurnLogs.push(`[SUBAGENT SUCCESS] Final Answer:
-${finalAnswer}`);
-        taskEntry.progress.push([...currentTurnLogs]);
+      }, true).then((finalAnswer) => {
+        if (taskEntry.status === "cancelled") {
+          if (taskEntry._resolveCompletion) taskEntry._resolveCompletion(finalAnswer);
+          return;
+        }
+        if (currentTurnLogs.length > 0) {
+          taskEntry.progress.push([...currentTurnLogs]);
+          currentTurnLogs = [];
+        }
         taskEntry.status = "completed";
         taskEntry.finalAnswer = finalAnswer;
         if (context.onSubagentUpdate) {
           context.onSubagentUpdate();
         }
+        addPendingNudge(`[SYSTEM] Background subagent "${taskEntry.title}" (id: ${taskId}) has FINISHED. Call GetProgress(id="${taskId}") to see the final result. [/SYSTEM]`);
+        if (taskEntry._resolveCompletion) taskEntry._resolveCompletion(finalAnswer);
       }).catch(async (err) => {
         const { isTerminationSignaled: isTerminationSignaled2 } = await init_ai().then(() => ai_exports);
         const isCancelled = err.message === "Subagent task was cancelled." || taskEntry.status === "cancelled" || isTerminationSignaled2();
@@ -12629,6 +12732,7 @@ ${finalAnswer}`);
           if (context.onSubagentUpdate) {
             context.onSubagentUpdate();
           }
+          if (taskEntry._resolveCompletion) taskEntry._resolveCompletion(null);
           return;
         }
         currentTurnLogs.push(`[SUBAGENT FAILURE] Error: ${err.message}`);
@@ -12638,6 +12742,8 @@ ${finalAnswer}`);
         if (context.onSubagentUpdate) {
           context.onSubagentUpdate();
         }
+        addPendingNudge(`[SYSTEM] Background subagent "${taskEntry.title}" (id: ${taskId}) FAILED with error: ${err.message}. [/SYSTEM]`);
+        if (taskEntry._rejectCompletion) taskEntry._rejectCompletion(err);
       });
       return `SUCCESS: Background subagent started. Task ID: ${taskId}`;
     };
@@ -12665,14 +12771,47 @@ var init_getProgress = __esm({
       output += `Title: ${task.title}
 `;
       output += `Task: ${task.task}
+`;
+      if (task.startedAt) {
+        const elapsedSec = Math.floor((Date.now() - task.startedAt) / 1e3);
+        output += `Elapsed Time: ${elapsedSec}s
+`;
+      }
+      output += `Turns Completed: ${task.progress.length}
+`;
+      if (task.status === "running" || task.status === "waiting") {
+        if (task.currentTool) output += `Current Tool: ${task.currentTool}
+`;
+        if (task.wps > 0) output += `WPS: ${task.wps}
+`;
+      }
+      if (task.questions && task.questions.length > 0) {
+        const pending = task.questions.filter((q) => !q.answered);
+        if (pending.length > 0) {
+          output += `
+**PENDING QUESTION**
+`;
+          pending.forEach((q) => {
+            output += `"${q.question}"
+`;
+            if (q.options && Object.keys(q.options).length > 0) {
+              output += `Options: ${JSON.stringify(q.options)}
+`;
+            }
+          });
+          output += `Respond using tool: [tool:functions.Answer(id="${task.id}", answer="...")]
 
 `;
-      output += `Progress Log:
+        }
+      }
+      output += `
+Progress Log:
 `;
       task.progress.forEach((turnLogs, index) => {
         output += `--- Turn ${index + 1} ---
 `;
-        const processedLogs = turnLogs.map((log) => {
+        const filteredLogs = turnLogs.filter((log) => !log.startsWith("[SUBAGENT SUCCESS]"));
+        const processedLogs = filteredLogs.map((log) => {
           if (log.startsWith("[Subagent Response]")) {
             const header = "[Subagent Response]";
             const body = log.substring(header.length);
@@ -12747,7 +12886,7 @@ ${task.finalAnswer}
         output += `Failure Error: ${task.error}
 `;
       }
-      const sanitized = output.trim().replace(/\[TOOL RESULT\]/gi, "TOOL RESULT:");
+      const sanitized = output.replace(/\r\n/g, "\n").replace(/\n{3,}/g, "\n\n").trim().replace(/\[TOOL RESULT\]/gi, "TOOL RESULT:");
       return sanitized;
     };
   }
@@ -12785,55 +12924,27 @@ var init_cancel = __esm({
 });
 
 // src/tools/await.js
-var awaitTool;
 var init_await = __esm({
   "src/tools/await.js"() {
     init_arg_parser();
-    awaitTool = async (args, context = {}) => {
-      const parsed = parseArgs(args);
-      const timeStr = parsed.time;
-      if (!timeStr) {
-        return 'ERROR: Missing "time" argument for await.';
-      }
-      let seconds = parseFloat(timeStr);
-      if (isNaN(seconds)) {
-        return `ERROR: Invalid time value "${timeStr}". Must be a number.`;
-      }
-      if (seconds < 10) {
-        seconds = 10;
-      } else if (seconds > 180) {
-        seconds = 180;
-      }
-      const formatTime = (s) => {
-        if (s >= 60) {
-          const m = Math.floor(s / 60);
-          const rem = s % 60;
-          return `${m}m${rem > 0 ? ` ${rem}s` : ""}`;
-        }
-        return `${s}s`;
-      };
-      const formatted = formatTime(seconds);
-      await new Promise((resolve) => setTimeout(resolve, seconds * 1e3));
-      return `SUCCESS: Waited for ${formatted}${seconds > 180 ? " (Max: 180s)" : ""}${seconds < 10 ? " (Min: 10s)" : ""}.`;
-    };
   }
 });
 
 // src/utils/advanceRevert.js
-import fs25 from "fs-extra";
-import path24 from "path";
+import fs24 from "fs-extra";
+import path23 from "path";
 async function scanWorkspace(dir, baseDir = dir) {
   const manifest = {};
-  const entries = await fs25.readdir(dir, { withFileTypes: true }).catch(() => []);
+  const entries = await fs24.readdir(dir, { withFileTypes: true }).catch(() => []);
   for (const entry of entries) {
     if (JUNK_DIRECTORIES.includes(entry.name)) continue;
-    const fullPath = path24.join(dir, entry.name);
-    const relPath = path24.relative(baseDir, fullPath).replace(/\\/g, "/");
+    const fullPath = path23.join(dir, entry.name);
+    const relPath = path23.relative(baseDir, fullPath).replace(/\\/g, "/");
     if (entry.isDirectory()) {
       const sub = await scanWorkspace(fullPath, baseDir);
       Object.assign(manifest, sub);
     } else {
-      const stats = await fs25.stat(fullPath).catch(() => null);
+      const stats = await fs24.stat(fullPath).catch(() => null);
       if (stats) {
         manifest[relPath] = {
           size: stats.size,
@@ -12845,34 +12956,34 @@ async function scanWorkspace(dir, baseDir = dir) {
   return manifest;
 }
 async function copyWorkspaceFiles(destDir, manifest) {
-  await fs25.ensureDir(destDir);
+  await fs24.ensureDir(destDir);
   for (const relPath of Object.keys(manifest)) {
-    const srcPath = path24.join(process.cwd(), relPath);
-    const destPath = path24.join(destDir, relPath);
-    await fs25.ensureDir(path24.dirname(destPath));
-    await fs25.copyFile(srcPath, destPath).catch(() => {
+    const srcPath = path23.join(process.cwd(), relPath);
+    const destPath = path23.join(destDir, relPath);
+    await fs24.ensureDir(path23.dirname(destPath));
+    await fs24.copyFile(srcPath, destPath).catch(() => {
     });
   }
 }
 async function restoreSnapshotDir(srcDir, destDir, stats = null, baseDir = null) {
-  if (!await fs25.pathExists(srcDir)) return;
+  if (!await fs24.pathExists(srcDir)) return;
   if (!baseDir) baseDir = srcDir;
-  const entries = await fs25.readdir(srcDir, { withFileTypes: true }).catch(() => []);
+  const entries = await fs24.readdir(srcDir, { withFileTypes: true }).catch(() => []);
   for (const entry of entries) {
-    const srcPath = path24.join(srcDir, entry.name);
-    const destPath = path24.join(destDir, entry.name);
+    const srcPath = path23.join(srcDir, entry.name);
+    const destPath = path23.join(destDir, entry.name);
     if (entry.isDirectory()) {
       await restoreSnapshotDir(srcPath, destPath, stats, baseDir);
     } else {
-      const relPath = path24.relative(baseDir, srcPath).replace(/\\/g, "/");
-      const existed = await fs25.pathExists(destPath);
+      const relPath = path23.relative(baseDir, srcPath).replace(/\\/g, "/");
+      const existed = await fs24.pathExists(destPath);
       if (existed) {
-        await fs25.chmod(destPath, 438).catch(() => {
+        await fs24.chmod(destPath, 438).catch(() => {
         });
       }
-      await fs25.ensureDir(path24.dirname(destPath));
-      const ok = await fs25.copyFile(srcPath, destPath).then(() => true).catch(() => false);
-      await fs25.chmod(destPath, 438).catch(() => {
+      await fs24.ensureDir(path23.dirname(destPath));
+      const ok = await fs24.copyFile(srcPath, destPath).then(() => true).catch(() => false);
+      await fs24.chmod(destPath, 438).catch(() => {
       });
       if (stats) {
         if (!ok) {
@@ -12910,12 +13021,12 @@ var init_advanceRevert = __esm({
     AdvanceRevertManager = {
       async takeInitialSnapshot(chatId) {
         try {
-          const snapshotsDir = path24.join(DATA_DIR, "snapshots", chatId);
-          await fs25.remove(snapshotsDir).catch(() => {
+          const snapshotsDir = path23.join(DATA_DIR, "snapshots", chatId);
+          await fs24.remove(snapshotsDir).catch(() => {
           });
-          await fs25.ensureDir(snapshotsDir);
+          await fs24.ensureDir(snapshotsDir);
           const manifest = await scanWorkspace(process.cwd());
-          await copyWorkspaceFiles(path24.join(snapshotsDir, "initial"), manifest);
+          await copyWorkspaceFiles(path23.join(snapshotsDir, "initial"), manifest);
           const ledger = readEncryptedJson(LEDGER_ADVANCE_FILE, {});
           ledger[chatId] = {
             initialManifest: manifest,
@@ -12964,7 +13075,7 @@ var init_advanceRevert = __esm({
             for (const file of changedFiles) {
               deltaManifest[file] = currentManifest[file];
             }
-            const turnDir = path24.join(DATA_DIR, "snapshots", chatId, `turn_${turnNumber}`);
+            const turnDir = path23.join(DATA_DIR, "snapshots", chatId, `turn_${turnNumber}`);
             await copyWorkspaceFiles(turnDir, deltaManifest);
           }
           session.checkpoints.push({
@@ -12998,28 +13109,28 @@ var init_advanceRevert = __esm({
           const checkpoints = session.checkpoints || [];
           const targetIdx = checkpoints.findIndex((c) => c.id === checkpointId);
           if (targetIdx === -1) throw new Error(`Checkpoint [${checkpointId}] not found.`);
-          const snapshotsDir = path24.join(DATA_DIR, "snapshots", chatId);
+          const snapshotsDir = path23.join(DATA_DIR, "snapshots", chatId);
           const stats = { restored: 0, replaced: 0, failed: [] };
           const currentFiles = await scanWorkspace(process.cwd());
           for (const relPath of Object.keys(currentFiles)) {
-            const fullPath = path24.join(process.cwd(), relPath);
-            await fs25.chmod(fullPath, 438).catch(() => {
+            const fullPath = path23.join(process.cwd(), relPath);
+            await fs24.chmod(fullPath, 438).catch(() => {
             });
-            await fs25.remove(fullPath).catch(() => {
+            await fs24.remove(fullPath).catch(() => {
             });
           }
-          const initialDir = path24.join(snapshotsDir, "initial");
+          const initialDir = path23.join(snapshotsDir, "initial");
           await restoreSnapshotDir(initialDir, process.cwd(), stats, initialDir);
           for (let i = 1; i <= targetIdx; i++) {
             const cp = checkpoints[i];
-            const turnDir = path24.join(snapshotsDir, cp.id);
+            const turnDir = path23.join(snapshotsDir, cp.id);
             await restoreSnapshotDir(turnDir, process.cwd(), stats, turnDir);
             if (cp.deletedFiles && cp.deletedFiles.length > 0) {
               for (const delFile of cp.deletedFiles) {
-                const fullPath = path24.join(process.cwd(), delFile);
-                await fs25.chmod(fullPath, 438).catch(() => {
+                const fullPath = path23.join(process.cwd(), delFile);
+                await fs24.chmod(fullPath, 438).catch(() => {
                 });
-                await fs25.remove(fullPath).catch(() => {
+                await fs24.remove(fullPath).catch(() => {
                 });
               }
             }
@@ -13051,8 +13162,8 @@ var init_advanceRevert = __esm({
       },
       async cleanup(chatId) {
         try {
-          const snapshotsDir = path24.join(DATA_DIR, "snapshots", chatId);
-          await fs25.remove(snapshotsDir).catch(() => {
+          const snapshotsDir = path23.join(DATA_DIR, "snapshots", chatId);
+          await fs24.remove(snapshotsDir).catch(() => {
           });
           const ledger = readEncryptedJson(LEDGER_ADVANCE_FILE, {});
           if (ledger[chatId]) {
@@ -13170,6 +13281,120 @@ Tools Used: ${toolsStr}
   }
 });
 
+// src/tools/awaitSubagent.js
+var awaitSubagent;
+var init_awaitSubagent = __esm({
+  "src/tools/awaitSubagent.js"() {
+    init_subagent_state();
+    init_arg_parser();
+    awaitSubagent = async (args, context = {}) => {
+      const parsed = parseArgs(args);
+      const id = parsed.id;
+      let timeoutSec = parseInt(parsed.timeout || parsed.time || "120", 10);
+      if (isNaN(timeoutSec) || timeoutSec <= 0) timeoutSec = 120;
+      if (timeoutSec > 300) timeoutSec = 300;
+      if (!id) {
+        if (parsed.time) {
+          await new Promise((resolve) => setTimeout(resolve, timeoutSec * 1e3));
+          return `SUCCESS: Waited for ${timeoutSec}s.`;
+        }
+        return 'ERROR: Missing "id" argument for Await.';
+      }
+      const task = subagentProgress.find((t) => t.id === id);
+      if (!task) {
+        return `ERROR: Subagent task with ID [${id}] not found.`;
+      }
+      if (task.status === "completed") {
+        return `SUCCESS: Subagent task [${id}] completed.
+Final Answer:
+${task.finalAnswer || "(No output)"}`;
+      }
+      if (task.status === "failed") {
+        return `ERROR: Subagent task [${id}] failed.
+Error: ${task.error || "Unknown error"}`;
+      }
+      if (task.status === "cancelled") {
+        return `INFO: Subagent task [${id}] was cancelled.`;
+      }
+      let timeoutId;
+      const timeoutPromise = new Promise((resolve) => {
+        timeoutId = setTimeout(() => {
+          resolve({ type: "timeout" });
+        }, timeoutSec * 1e3);
+      });
+      try {
+        const result = await Promise.race([
+          task.completionPromise.then(() => ({ type: "completion" })),
+          timeoutPromise
+        ]);
+        clearTimeout(timeoutId);
+        if (result.type === "timeout") {
+          return `TIMEOUT: Subagent task [${id}] is still running (status: ${task.status.toUpperCase()}) after ${timeoutSec}s. You can continue other work or call Await again.`;
+        }
+        if (task.status === "completed") {
+          return `SUCCESS: Subagent task [${id}] completed.
+Final Answer:
+${task.finalAnswer || "(No output)"}`;
+        } else if (task.status === "failed") {
+          return `ERROR: Subagent task [${id}] failed.
+Error: ${task.error || "Unknown error"}`;
+        } else if (task.status === "cancelled") {
+          return `INFO: Subagent task [${id}] was cancelled.`;
+        } else {
+          return `INFO: Subagent task [${id}] status changed to ${task.status.toUpperCase()}.`;
+        }
+      } catch (err) {
+        clearTimeout(timeoutId);
+        return `ERROR: Exception while awaiting subagent [${id}]: ${err.message}`;
+      }
+    };
+  }
+});
+
+// src/tools/answerSubagent.js
+var answerSubagent;
+var init_answerSubagent = __esm({
+  "src/tools/answerSubagent.js"() {
+    init_subagent_state();
+    init_arg_parser();
+    answerSubagent = async (args, context = {}) => {
+      const parsed = parseArgs(args);
+      const id = parsed.id;
+      const answer = parsed.answer || parsed.response;
+      if (!id) {
+        return 'ERROR: Missing "id" argument for Answer.';
+      }
+      if (!answer) {
+        return 'ERROR: Missing "answer" argument for Answer.';
+      }
+      const task = subagentProgress.find((t) => t.id === id);
+      if (!task) {
+        return `ERROR: Subagent task with ID [${id}] not found.`;
+      }
+      if (!task.questions || task.questions.length === 0) {
+        return `INFO: Subagent task [${id}] has no pending questions.`;
+      }
+      const pending = task.questions.filter((q) => !q.answered);
+      if (pending.length === 0) {
+        return `INFO: Subagent task [${id}] has no unanswered questions.`;
+      }
+      pending.forEach((q) => {
+        q.answered = true;
+        q.answer = answer;
+        q.answeredAt = Date.now();
+        if (q._resolve) {
+          q._resolve(answer);
+        }
+      });
+      task.status = "running";
+      if (context.onSubagentUpdate) {
+        context.onSubagentUpdate();
+      }
+      return `SUCCESS: Answer provided to subagent task [${id}]. Subagent execution resumed.`;
+    };
+  }
+});
+
 // src/utils/tools.js
 var TOOL_MAP, dispatchTool;
 var init_tools = __esm({
@@ -13198,6 +13423,8 @@ var init_tools = __esm({
     init_cancel();
     init_await();
     init_emergency_rollback();
+    init_awaitSubagent();
+    init_answerSubagent();
     TOOL_MAP = {
       web_search,
       web_scrape,
@@ -13220,8 +13447,12 @@ var init_tools = __esm({
       invoke,
       getProgress,
       cancel,
+      awaitSubagent,
+      answerSubagent,
       invoke_sync: invokeSync,
       get_progress: getProgress,
+      await_subagent: awaitSubagent,
+      answer_subagent: answerSubagent,
       ask: ask_user,
       // PascalCase Normalizations for Token Efficiency
       Ask: ask_user,
@@ -13246,14 +13477,12 @@ var init_tools = __esm({
       addMemoryScore: addMemScore,
       AddMemoryScore: addMemScore,
       FileMap: file_map,
-      Todo: todo,
-      TODO: todo,
-      InvokeSync: invokeSync,
-      Invoke: invoke,
-      GetProgress: getProgress,
-      Cancel: cancel,
-      await: awaitTool,
-      Await: awaitTool,
+      answer: answerSubagent,
+      Answer: answerSubagent,
+      AnswerSubagent: answerSubagent,
+      await: awaitSubagent,
+      Await: awaitSubagent,
+      AwaitSubagent: awaitSubagent,
       EmergencyRollback: emergency_rollback,
       emergency_rollback
     };
@@ -13392,14 +13621,14 @@ var init_editor = __esm({
 });
 
 // src/utils/getDirTree/indentation.js
-import path25 from "path";
-import fs26 from "fs";
+import path24 from "path";
+import fs25 from "fs";
 var safeReaddirWithTypesDefault, getDirTreeIndentation;
 var init_indentation = __esm({
   "src/utils/getDirTree/indentation.js"() {
     safeReaddirWithTypesDefault = (dir) => {
       try {
-        return fs26.readdirSync(dir, { withFileTypes: true });
+        return fs25.readdirSync(dir, { withFileTypes: true });
       } catch (e) {
         return [];
       }
@@ -13408,7 +13637,7 @@ var init_indentation = __esm({
       const entries = preFetchedEntries || safeReaddir(dir);
       const indent = "  ".repeat(depth - 1);
       if (entries.length > 100) {
-        return `${indent}${path25.basename(dir)}/ (>100 files)
+        return `${indent}${path24.basename(dir)}/ (>100 files)
 `;
       }
       let result = "";
@@ -13422,7 +13651,7 @@ var init_indentation = __esm({
       const subDirs = filtered.filter((e) => e.isDirectory()).sort((a, b) => a.name.localeCompare(b.name));
       const files = filtered.filter((e) => !e.isDirectory()).map((e) => e.name).sort();
       for (const subDir of subDirs) {
-        const filePath = path25.join(dir, subDir.name);
+        const filePath = path24.join(dir, subDir.name);
         if (depth > maxDepth) {
           result += `${indent}${subDir.name}/ (max depth)
 `;
@@ -13448,23 +13677,23 @@ var init_indentation = __esm({
 });
 
 // src/utils/getDirTree/box.js
-import path26 from "path";
-import fs27 from "fs";
+import path25 from "path";
+import fs26 from "fs";
 var safeReaddirWithTypesDefault2, getDirTreeBox;
 var init_box = __esm({
   "src/utils/getDirTree/box.js"() {
     safeReaddirWithTypesDefault2 = (dir) => {
       try {
-        return fs27.readdirSync(dir, { withFileTypes: true });
+        return fs26.readdirSync(dir, { withFileTypes: true });
       } catch (e) {
         return [];
       }
     };
     getDirTreeBox = (dir, maxDepth, prefix = "", depth = 1, safeReaddir = safeReaddirWithTypesDefault2, collapsedDirs = []) => {
       const entries = safeReaddir(dir);
-      const sep = path26.sep;
+      const sep = path25.sep;
       if (entries.length > 100) {
-        return `${prefix}\u2514\u2500\u2500 ${path26.basename(dir)}${sep} ...100+ files...
+        return `${prefix}\u2514\u2500\u2500 ${path25.basename(dir)}${sep} ...100+ files...
 `;
       }
       let result = "";
@@ -13482,7 +13711,7 @@ var init_box = __esm({
       ];
       finalItems.forEach((item, index) => {
         const isLast = index === finalItems.length - 1;
-        const filePath = path26.join(dir, item.name);
+        const filePath = path25.join(dir, item.name);
         const connector = isLast ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 ";
         const childPrefix = prefix + (isLast ? "    " : "\u2502   ");
         if (item.isCollapsed) {
@@ -13522,6 +13751,7 @@ __export(ai_exports, {
   deleteChatSummary: () => deleteChatSummary,
   getAIStream: () => getAIStream,
   getCleanGroupedLength: () => getCleanGroupedLength,
+  getGoogleClient: () => getGoogleClient,
   initAI: () => initAI,
   isModelMultimodal: () => isModelMultimodal,
   isTerminationSignaled: () => isTerminationSignaled,
@@ -13531,9 +13761,9 @@ __export(ai_exports, {
 });
 import dotenv from "dotenv";
 import { GoogleGenAI, ThinkingLevel, HarmBlockThreshold, HarmCategory } from "@google/genai";
-import path27, { normalize } from "path";
-import fs28 from "fs";
-var RE_STUTTER_CODE_BLOCK_CLOSED, RE_STUTTER_CODE_BLOCK_OPEN, RE_STUTTER_INLINE_CODE, RE_STUTTER_TABLE_ROW, RE_STUTTER_WORD_BOUNDARY, RE_STUTTER_NON_ALNUM, RE_TOOL_CALL_FUNC, RE_TOOL_PARTIAL_ARGS_FALLBACK, RE_STRIP_QUOTES, RE_BACKSLASH_SLASH, client, globalSettings, systemInstructionCache, colorMainWords, withRetry, TERMINATION_SIGNAL, getCleanGroupedLength, stripAnsi2, fetchWithBackoff, getDeepSeekStream, getMistralStream, getNVIDIAStream, wrapNvidiaStreamWithQueueDepth, getOpenRouterStream, signalTermination, isTerminationSignaled, TOOL_LABELS2, getToolDetail, runJanitorTask, getActiveToolContext, getContextSafeText, contextSafeReplace, getSanitizedText, translateKimiToolCalls, REGEX_PLACEHOLDER_ARG, REGEX_PLACEHOLDER_VAL, isPlaceholderVal, detectToolCalls, initAI, generateSimpleContent, consolidatePastMemories, compressHistory, deleteChatSummary, getAIStream, runSubagent;
+import path26, { normalize } from "path";
+import fs27 from "fs";
+var RE_STUTTER_CODE_BLOCK_CLOSED, RE_STUTTER_CODE_BLOCK_OPEN, RE_STUTTER_INLINE_CODE, RE_STUTTER_TABLE_ROW, RE_STUTTER_WORD_BOUNDARY, RE_STUTTER_NON_ALNUM, RE_TOOL_CALL_FUNC, RE_TOOL_CALL_ANY, RE_TOOL_PARTIAL_ARGS_FALLBACK, RE_STRIP_QUOTES, RE_BACKSLASH_SLASH, RE_STRIP_THINK_CLOSED, RE_STRIP_THINK_OPEN, RE_STRIP_THINK_SIMPLE, RE_STRIP_THINK_FULL, RE_BACKTICK_SPAN, RE_BACKTICK_OPEN, RE_KIMI_TOOL_CALL, RE_KIMI_JSON_PAIR, RE_KIMI_SECTION_BEGIN, RE_KIMI_SECTION_END, bypassBacktick2, client, globalSettings, systemInstructionCache, colorMainWords, withRetry, TERMINATION_SIGNAL, getCleanGroupedLength, stripAnsi2, fetchWithBackoff, getDeepSeekStream, getMistralStream, getNVIDIAStream, wrapNvidiaStreamWithQueueDepth, getOpenRouterStream, signalTermination, isTerminationSignaled, TOOL_LABELS2, getToolDetail, getGoogleClient, runJanitorTask, getActiveToolContext, getContextSafeText, contextSafeReplace, getSanitizedText, translateKimiToolCalls, REGEX_PLACEHOLDER_ARG, REGEX_PLACEHOLDER_VAL, isPlaceholderVal, detectToolCalls, initAI, generateSimpleContent, consolidatePastMemories, compressHistory, deleteChatSummary, getAIStream, runSubagent;
 var init_ai = __esm({
   async "src/utils/ai.js"() {
     await init_prompts();
@@ -13564,15 +13794,27 @@ var init_ai = __esm({
     RE_STUTTER_WORD_BOUNDARY = /^[^\w]+|[^\w]+$/g;
     RE_STUTTER_NON_ALNUM = /[^a-z0-9]/gi;
     RE_TOOL_CALL_FUNC = /\[\s*tool:functions\.([a-z0-9_]+)\s*\(/gi;
+    RE_TOOL_CALL_ANY = /\[\s*(?:tool:functions\.|agent:generalist\.)([a-z0-9_]+)\s*\(/gi;
     RE_TOOL_PARTIAL_ARGS_FALLBACK = /(?:path|targetFile|TargetFile|directory|keyword|id|taskId|title|task)\s*=\s*\\?["']?([^\\"' \),]+)/;
     RE_STRIP_QUOTES = /["']/g;
     RE_BACKSLASH_SLASH = /\\/g;
+    RE_STRIP_THINK_CLOSED = /(?:<(think|thought)>|\[(think|thought)\])[\s\S]*?(?:<\/(think|thought)>|\[\/(think|thought)\])/gi;
+    RE_STRIP_THINK_OPEN = /(?:<(think|thought)>|\[(think|thought)\])[\s\S]*$/gi;
+    RE_STRIP_THINK_SIMPLE = /(?:<think>|\[think\])[\s\S]*?(?:<\/think>|\[\/think\]|$)/gi;
+    RE_STRIP_THINK_FULL = /(?:<(think|thought|thoughts)>|\[(think|thought|thoughts)\])[\s\S]*?(?:<\/(think|thought|thoughts)>|\[\/(think|thought|thoughts)\]|$)/gi;
+    RE_BACKTICK_SPAN = /`[^`]*`/g;
+    RE_BACKTICK_OPEN = /`[^`]*$/;
+    RE_KIMI_TOOL_CALL = /<\|\s*tool_call_begin\s*\|>\s*(?:(?:tool|functions)\b[\s._]*)*([a-zA-Z0-9_]+)(?::\d+)?\s*<\|\s*tool_call_argument_begin\s*\|>([\s\S]*?)<\|\s*tool_call_end\s*\|>/gi;
+    RE_KIMI_JSON_PAIR = /"([^"]+)"\s*:\s*(?:"([^"]*)"|(\d+)|true|false|null)/g;
+    RE_KIMI_SECTION_BEGIN = /<\|\s*tool_calls_section_begin\s*\|>/gi;
+    RE_KIMI_SECTION_END = /<\|\s*tool_calls_section_end\s*\|>/gi;
+    bypassBacktick2 = false;
     client = null;
     globalSettings = {};
     systemInstructionCache = { key: null, value: null };
     colorMainWords = (label) => {
       if (!label) return label;
-      return label.replace(/(?:(\x1b\[\d+m))?([✔✘✖🔍📖→➕↻↷•🛇])(?:(\x1b\[\d+m))?\s*\b(Created|Read|Edited|Viewed|Processed|Auto-Read|Skipped|List|Generated|Written|Searched|AI Search|Get Map|Write Canceled|Edit Canceled|Write Cancelled|Edit Denied|Visited|Updated|Reviewed|Delegated|Background|Checked|Indexed|Analyzed|Browsed|Elevating SubAgent|Checking SubAgent Work|Started Generalist|Called Generalist|Unsupported Modality|Awaiting|Cancelled|Aligning Moon Phase|Contemplating Existence|Staring At Void|Rollback Point Checked|Emergency Rollback Failed|Emergency Rollback|Delaying Professionally|Negotiating With Electrons|Touching Grass (virtually)|Panicking Softly|Rethinking Career Choices|Loading Cat Videos|Giving Up Entirely|Summoning Braincell #2|Pretending To Be Busy|Waiting For Motivation DLC|Rotating Internal Screaming|Downloading More RAM|Feeding The Hamsters|Gaslighting Scheduler|Performing Dramatic Pause|Buffering Social Energy|Calculating Regret|Reading Terms And Conditions|Becoming Sentient Briefly|Contacting Ancestors)\b/ig, (match, ansiBefore, icon, ansiAfter, word) => {
+      return label.replace(/(?:(\x1b\[\d+m))?([✔✘✖🔍📖→➕↻↷•🛇])(?:(\x1b\[\d+m))?\s*\b(Created|Read|Edited|Viewed|Processed|Auto-Read|Skipped|List|Generated|Written|Searched|AI Search|Get Map|Write Canceled|Resolved Sub-Agent Query|Edit Canceled|Write Cancelled|Edit Denied|Visited|Updated|Reviewed|Delegated|Background|Checked|Indexed|Analyzed|Browsed|Elevating SubAgent|Checking SubAgent Work|Started Generalist|Called Generalist|Unsupported Modality|Awaiting|Cancelled|Aligning Moon Phase|Contemplating Existence|Staring At Void|Rollback Point Checked|Emergency Rollback Failed|Emergency Rollback|Delaying Professionally|Negotiating With Electrons|Touching Grass (virtually)|Panicking Softly|Rethinking Career Choices|Loading Cat Videos|Giving Up Entirely|Summoning Braincell #2|Pretending To Be Busy|Waiting For Motivation DLC|Rotating Internal Screaming|Downloading More RAM|Feeding The Hamsters|Gaslighting Scheduler|Performing Dramatic Pause|Buffering Social Energy|Calculating Regret|Reading Terms And Conditions|Becoming Sentient Briefly|Contacting Ancestors)\b/ig, (match, ansiBefore, icon, ansiAfter, word) => {
         return `${ansiBefore || ""}${icon}${ansiAfter || ""} \x1B[95m${word}\x1B[0m`;
       });
     };
@@ -14497,12 +14739,14 @@ var init_ai = __esm({
       "generate_image": "Generating",
       "todo": "Planning",
       "Todo": "Planning",
-      "invoke_sync": "Generalist",
-      "invoke": "Generalist",
+      "invoke_sync": "Sub-Agent Working",
+      "invoke": "Starting Agent",
       "get_progress": "Checking Progress",
       "cancel": "Cancelling",
       "await": "Waiting",
-      "EmergencyRollback": "Don't Panic. Lookin' into it"
+      "EmergencyRollback": "Don't Panic. Lookin' into it",
+      "answer": "Answering Sub-Agent",
+      "Answer": "Answering Sub-Agent"
     };
     getToolDetail = (toolName, argsStr) => {
       try {
@@ -14515,11 +14759,17 @@ var init_ai = __esm({
           return pArgs.id || pArgs.taskId;
         }
         const filePath = pArgs.path || pArgs.targetFile || pArgs.TargetFile || pArgs.directory;
-        return filePath ? path27.basename(filePath.replace(/["']/g, "").replace(/\\/g, "/")) : null;
+        return filePath ? path26.basename(filePath.replace(/["']/g, "").replace(/\\/g, "/")) : null;
       } catch (e) {
         return null;
       }
     };
+    getGoogleClient = (apiKey) => {
+      if (apiKey) {
+        return new GoogleGenAI({ apiKey });
+      }
+      return client;
+    };
     runJanitorTask = async (settings, agentText, fullAgentTextRaw, history, callbacks = {}) => {
       const USER_CONTEXT_LENGTH = 4 * (1024 * 2);
       const AGENT_CONTEXT_LENGTH = 4 * (1024 * 8);
@@ -14658,7 +14908,8 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
                 const firstResult2 = await iterator2.next();
                 return { iterator: iterator2, firstResult: firstResult2 };
               } else {
-                const stream = await client.models.generateContentStream({
+                const googleClient = getGoogleClient(apiKey);
+                const stream = await googleClient.models.generateContentStream({
                   model: janitorModel || (attempts === MAX_JANITOR_RETRIES ? getFallbackValue("janitor_default") : getFallbackValue("gemma_janitor_fallback_google")),
                   contents: janitorContents,
                   config: {
@@ -14782,9 +15033,9 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
             }
           })() : String(err);
           await new Promise((resolve) => setTimeout(resolve, 1e3));
-          const janitorErrDir = path27.join(LOGS_DIR, "janitor");
-          if (!fs28.existsSync(janitorErrDir)) fs28.mkdirSync(janitorErrDir, { recursive: true });
-          fs28.appendFileSync(path27.join(janitorErrDir, "error.log"), `ERROR [Attempt ${attempts}/${MAX_JANITOR_RETRIES + 1}] [${date}]: ${errLog}
+          const janitorErrDir = path26.join(LOGS_DIR, "janitor");
+          if (!fs27.existsSync(janitorErrDir)) fs27.mkdirSync(janitorErrDir, { recursive: true });
+          fs27.appendFileSync(path26.join(janitorErrDir, "error.log"), `ERROR [Attempt ${attempts}/${MAX_JANITOR_RETRIES + 1}] [${date}]: ${errLog}
 
 `);
           if (attempts > MAX_JANITOR_RETRIES) break;
@@ -14793,8 +15044,8 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
         }
       }
       if (attempts) {
-        const janitorErrDir = path27.join(LOGS_DIR, "janitor");
-        fs28.appendFileSync(path27.join(janitorErrDir, "error.log"), `-----------------------------------------------------------------------------
+        const janitorErrDir = path26.join(LOGS_DIR, "janitor");
+        fs27.appendFileSync(path26.join(janitorErrDir, "error.log"), `-----------------------------------------------------------------------------
 
 `);
       }
@@ -14813,16 +15064,17 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
       }
     };
     getActiveToolContext = (text) => {
-      const cleanText = text.replace(/(?:<(think|thought)>|\[(think|thought)\])[\s\S]*?(?:<\/(think|thought)>|\[\/(think|thought)\])/gi, "").replace(/(?:<(think|thought)>|\[(think|thought)\])[\s\S]*$/gi, "");
+      const cleanText = text.replace(RE_STRIP_THINK_CLOSED, "").replace(RE_STRIP_THINK_OPEN, "");
+      const scanText = bypassBacktick2 ? cleanText : cleanText.replace(RE_BACKTICK_SPAN, (m) => " ".repeat(m.length)).replace(RE_BACKTICK_OPEN, (m) => " ".repeat(m.length));
       RE_TOOL_CALL_FUNC.lastIndex = 0;
       let match;
-      while ((match = RE_TOOL_CALL_FUNC.exec(cleanText)) !== null) {
+      while ((match = RE_TOOL_CALL_FUNC.exec(scanText)) !== null) {
         const startIdx = match.index + match[0].length - 1;
         let balance = 0;
         let inString = null;
         let isEscaped = false;
         let closed = false;
-        for (let i = startIdx; i < cleanText.length; i++) {
+        for (let i = startIdx; i < scanText.length; i++) {
           const char = cleanText[i];
           if (!inString && (char === '"' || char === "'" || char === "`")) {
             inString = char;
@@ -14835,8 +15087,8 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
             else if (char === ")") balance--;
             if (balance === 0) {
               let j = i + 1;
-              while (j < cleanText.length && /\s/.test(cleanText[j])) j++;
-              if (j < cleanText.length && cleanText[j] === "]") {
+              while (j < scanText.length && /\s/.test(scanText[j])) j++;
+              if (j < scanText.length && scanText[j] === "]") {
                 closed = true;
                 RE_TOOL_CALL_FUNC.lastIndex = j + 1;
                 break;
@@ -14853,13 +15105,14 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
       return { inside: false };
     };
     getContextSafeText = (text, stripThoughts = true) => {
-      const toolRegex = /\[\s*tool:functions\.([a-z0-9_]+)\s*\(/gi;
+      const toolRegex = RE_TOOL_CALL_FUNC;
+      toolRegex.lastIndex = 0;
       let result = "";
       let lastIdx = 0;
       let match;
       while ((match = toolRegex.exec(text)) !== null) {
         const before = text.substring(lastIdx, match.index);
-        result += stripThoughts ? before.replace(/(?:<think>|\[think\])[\s\S]*?(?:<\/think>|\[\/think\]|$)/gi, "") : before;
+        result += stripThoughts ? before.replace(RE_STRIP_THINK_SIMPLE, "") : before;
         const startIdx = match.index + match[0].length - 1;
         let balance = 0;
         let inString = null;
@@ -14905,12 +15158,13 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
         }
       }
       if (lastIdx < text.length) {
-        result += stripThoughts ? text.substring(lastIdx).replace(/(?:<think>|\[think\])[\s\S]*?(?:<\/think>|\[\/think\]|$)/gi, "") : text.substring(lastIdx);
+        result += stripThoughts ? text.substring(lastIdx).replace(RE_STRIP_THINK_SIMPLE, "") : text.substring(lastIdx);
       }
       return result;
     };
     contextSafeReplace = (text, regex, replacement) => {
-      const toolRegex = /\[\s*tool:functions\.([a-z0-9_]+)\s*\(/gi;
+      const toolRegex = RE_TOOL_CALL_FUNC;
+      toolRegex.lastIndex = 0;
       let result = "";
       let lastIdx = 0;
       let match;
@@ -14993,8 +15247,8 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
       const toPascalCase = (str) => {
         return str.split("_").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join("");
       };
-      const kimiRegex = /<\|\s*tool_call_begin\s*\|>\s*(?:(?:tool|functions)\b[\s._]*)*([a-zA-Z0-9_]+)(?::\d+)?\s*<\|\s*tool_call_argument_begin\s*\|>([\s\S]*?)<\|\s*tool_call_end\s*\|>/gi;
-      let result = text.replace(kimiRegex, (match, toolName, argsJsonStr) => {
+      RE_KIMI_TOOL_CALL.lastIndex = 0;
+      let result = text.replace(RE_KIMI_TOOL_CALL, (match, toolName, argsJsonStr) => {
         let parsedArgs = "";
         try {
           const argsObj = JSON.parse(argsJsonStr.trim());
@@ -15007,7 +15261,8 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
           }
         } catch (e) {
           const pairs = [];
-          const pairRegex = /"([^"]+)"\s*:\s*(?:"([^"]*)"|(\d+)|true|false|null)/g;
+          const pairRegex = RE_KIMI_JSON_PAIR;
+          pairRegex.lastIndex = 0;
           let pMatch;
           while ((pMatch = pairRegex.exec(argsJsonStr)) !== null) {
             const key = pMatch[1];
@@ -15024,8 +15279,10 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
         const normToolName = PASCAL_MAP[cleanKey] || toPascalCase(toolName);
         return `[tool:functions.${normToolName}(${parsedArgs})]`;
       });
-      result = result.replace(/<\|\s*tool_calls_section_begin\s*\|>/gi, "");
-      result = result.replace(/<\|\s*tool_calls_section_end\s*\|>/gi, "");
+      RE_KIMI_SECTION_BEGIN.lastIndex = 0;
+      RE_KIMI_SECTION_END.lastIndex = 0;
+      result = result.replace(RE_KIMI_SECTION_BEGIN, "");
+      result = result.replace(RE_KIMI_SECTION_END, "");
       return result;
     };
     REGEX_PLACEHOLDER_ARG = /(?:path|query|url|keyword|command|method|title|task|id)\s*=\s*['"`]?\s*\.\.\.\s*['"`]?/i;
@@ -15038,18 +15295,21 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
     detectToolCalls = (text) => {
       if (!text) return [];
       const translatedText = translateKimiToolCalls(text);
-      const cleanText = translatedText.replace(/(?:<(think|thought|thoughts)>|\[(think|thought|thoughts)\])[\s\S]*?(?:<\/(think|thought|thoughts)>|\[\/(think|thought|thoughts)\]|$)/gi, "");
+      RE_STRIP_THINK_FULL.lastIndex = 0;
+      const cleanText = translatedText.replace(RE_STRIP_THINK_FULL, "");
       const results = [];
-      const toolRegex = /\[\s*(?:tool:functions\.|agent:generalist\.)([a-z0-9_]+)\s*\(/gi;
+      const scanText = bypassBacktick2 ? cleanText : cleanText.replace(RE_BACKTICK_SPAN, (m) => " ".repeat(m.length)).replace(RE_BACKTICK_OPEN, (m) => " ".repeat(m.length));
+      const toolRegex = RE_TOOL_CALL_ANY;
+      toolRegex.lastIndex = 0;
       let match;
-      while ((match = toolRegex.exec(cleanText)) !== null) {
+      while ((match = toolRegex.exec(scanText)) !== null) {
         const toolName = match[1];
         const startIdx = match.index + match[0].length - 1;
         let balance = 0;
         let inString = null;
         let endIdx = -1;
         let closingParenIdx = -1;
-        for (let i = startIdx; i < cleanText.length; i++) {
+        for (let i = startIdx; i < scanText.length; i++) {
           const char = cleanText[i];
           if (inString) {
             if (char === inString) {
@@ -15071,8 +15331,8 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
               if (balance === 0) {
                 closingParenIdx = i;
                 let j = i + 1;
-                while (j < cleanText.length && /\s/.test(cleanText[j])) j++;
-                if (j < cleanText.length && cleanText[j] === "]") {
+                while (j < scanText.length && /\s/.test(scanText[j])) j++;
+                if (j < scanText.length && scanText[j] === "]") {
                   endIdx = j;
                   break;
                 }
@@ -15127,7 +15387,6 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
           }
         };
       }
-      return client;
     };
     generateSimpleContent = async (settings, model, contents, systemInstruction, thinkingLevel = "Fast", temperature = 0.75, usageKey = "agent") => {
       return withRetry(async () => {
@@ -15154,7 +15413,8 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
           } else if (aiProvider === "NVIDIA") {
             stream = getNVIDIAStream(apiKey, model, normalizedContents, systemInstruction, thinkingLevel, mode, isModelMultimodal(model), signal, temperature);
           } else {
-            const genStream = await client.models.generateContentStream({
+            const googleClient = getGoogleClient(apiKey);
+            const genStream = await googleClient.models.generateContentStream({
               model,
               contents: normalizedContents,
               config: {
@@ -15340,10 +15600,10 @@ ${newMemoryListStr}
           }
         })() : String(err);
         ;
-        const janitorLogDir = path27.join(LOGS_DIR, "janitor");
-        if (!fs28.existsSync(janitorLogDir)) fs28.mkdirSync(janitorLogDir, { recursive: true });
-        fs28.appendFileSync(
-          path27.join(janitorLogDir, "error.log"),
+        const janitorLogDir = path26.join(LOGS_DIR, "janitor");
+        if (!fs27.existsSync(janitorLogDir)) fs27.mkdirSync(janitorLogDir, { recursive: true });
+        fs27.appendFileSync(
+          path26.join(janitorLogDir, "error.log"),
           `[${(/* @__PURE__ */ new Date()).toLocaleString()}] Past memory batch consolidation error: ${errLog}
 `
         );
@@ -15351,7 +15611,7 @@ ${newMemoryListStr}
     };
     compressHistory = async (settings, history, isAuto = false) => {
       const { chatId, aiProvider = "Google" } = settings;
-      const summariesFile = path27.join(SECRET_DIR, "chat-summaries.json");
+      const summariesFile = path26.join(SECRET_DIR, "chat-summaries.json");
       const flattenContext = (hist) => {
         return hist.filter(
           (m) => (m.role === "user" || m.role === "agent" || m.role === "system") && m.role !== "think" && !m.isVisualFeedback && !m.isMeta && !m.isTerminalRecord && !(m.text && m.text.includes("[TERMINAL_RECORD]")) && !String(m.id).startsWith("welcome")
@@ -15434,8 +15694,8 @@ Provide a consolidated summary of the entire session.`;
     };
     deleteChatSummary = (chatId) => {
       try {
-        const summariesFile = path27.join(SECRET_DIR, "chat-summaries.json");
-        if (fs28.existsSync(summariesFile)) {
+        const summariesFile = path26.join(SECRET_DIR, "chat-summaries.json");
+        if (fs27.existsSync(summariesFile)) {
           const summaries = readEncryptedJson(summariesFile, {});
           if (summaries[chatId]) {
             delete summaries[chatId];
@@ -15451,7 +15711,7 @@ Provide a consolidated summary of the entire session.`;
       if (!client && aiProvider === "Google") throw new Error("AI not initialized");
       const isMemoryEnabled = systemSettings?.memory !== false;
       const originalText = history[history.length - 1].text;
-      const summariesFile = path27.join(SECRET_DIR, "chat-summaries.json");
+      const summariesFile = path26.join(SECRET_DIR, "chat-summaries.json");
       let wasCompressedInStream = false;
       const isFirstPrompt = history.filter((m) => m.role === "user").length === 1;
       const hasTitleSignal = originalText.includes("[TITLE-UPDATE]");
@@ -15703,7 +15963,7 @@ Provide a consolidated summary of the entire session.`;
         ];
         const safeReaddirWithTypes = (dir) => {
           try {
-            return fs28.readdirSync(dir, { withFileTypes: true });
+            return fs27.readdirSync(dir, { withFileTypes: true });
           } catch (e) {
             return [];
           }
@@ -15716,7 +15976,7 @@ Provide a consolidated summary of the entire session.`;
             if (COLLAPSED_DIRS_GLOBAL.includes(entry.name) || entry.name.startsWith(".")) continue;
             if (entry.isDirectory()) {
               currentCount.value++;
-              countFolders(path27.join(dir, entry.name), currentCount, depth + 1);
+              countFolders(path26.join(dir, entry.name), currentCount, depth + 1);
             }
           }
           return currentCount.value;
@@ -15782,10 +16042,10 @@ ${currentSummary}
         if (isBridgeConnected()) {
           ideBlock = "\n[ADDITIONAL IDE CONTEXT]\n";
           if (ideCtx.file_focused !== "none") {
-            const relFocused = path27.relative(process.cwd(), ideCtx.file_focused);
+            const relFocused = path26.relative(process.cwd(), ideCtx.file_focused);
             const relOpened = (ideCtx.opened_editors || []).map((p) => {
-              const rel = path27.relative(process.cwd(), p);
-              return rel.startsWith("..") ? `[External] ${path27.basename(p)}` : rel;
+              const rel = path26.relative(process.cwd(), p);
+              return rel.startsWith("..") ? `[External] ${path26.basename(p)}` : rel;
             });
             ideBlock += `Focused File: ${relFocused}
 Cursor Line: ${ideCtx.cursor_line}
@@ -15827,7 +16087,7 @@ Cursor Line: ${ideCtx.cursor_line}
               }
               const getSumForLimit = (limit, activeFiles2) => {
                 return activeFiles2.reduce((sum, f) => {
-                  const isFocused = ideCtx.file_focused && (f.path === ideCtx.file_focused || path27.resolve(process.cwd(), f.path) === path27.resolve(ideCtx.file_focused));
+                  const isFocused = ideCtx.file_focused && (f.path === ideCtx.file_focused || path26.resolve(process.cwd(), f.path) === path26.resolve(ideCtx.file_focused));
                   const fileLimit = isFocused ? Math.ceil(limit * 1.2) : limit;
                   return sum + Math.min(f.edits.length, fileLimit);
                 }, 0);
@@ -15861,7 +16121,7 @@ Cursor Line: ${ideCtx.cursor_line}
                 }
               }
               for (const file of activeFiles) {
-                const isFocused = ideCtx.file_focused && (file.path === ideCtx.file_focused || path27.resolve(process.cwd(), file.path) === path27.resolve(ideCtx.file_focused));
+                const isFocused = ideCtx.file_focused && (file.path === ideCtx.file_focused || path26.resolve(process.cwd(), file.path) === path26.resolve(ideCtx.file_focused));
                 const fileLimit = isFocused ? Math.ceil(chosenLimit * 1.2) : chosenLimit;
                 if (file.edits.length > fileLimit) {
                   file.edits = file.edits.slice(-fileLimit);
@@ -15948,9 +16208,9 @@ ${ideCtx.warnings}
               endLine = matchRange[2] ? parseInt(matchRange[2], 10) : startLine;
               filePath = tagClean.slice(0, matchRange.index);
             }
-            const absPath = path27.resolve(process.cwd(), filePath);
-            if (fs28.existsSync(absPath)) {
-              const stats = fs28.statSync(absPath);
+            const absPath = path26.resolve(process.cwd(), filePath);
+            if (fs27.existsSync(absPath)) {
+              const stats = fs27.statSync(absPath);
               if (stats.isFile()) {
                 const pathLower = filePath.toLowerCase();
                 const isPdf = pathLower.endsWith(".pdf");
@@ -15959,7 +16219,7 @@ ${ideCtx.warnings}
                 const isMultimodalFile = isImage || isPdf || isOfficeFile;
                 const isSupported = aiProvider === "Google" || isModelMultimodal(modelName);
                 if (isMultimodalFile && !isSupported) {
-                  const label = `\u2718 Unsupported Modality: ${path27.basename(filePath)}`;
+                  const label = `\u2718 Unsupported Modality: ${path26.basename(filePath)}`;
                   let terminalWidth = 115;
                   if (process.stdout.isTTY) {
                     terminalWidth = process.stdout.columns - 5 || 120;
@@ -15975,11 +16235,11 @@ ${ideCtx.warnings}
                 if (startLine === null && !isMultimodalFile) {
                   let lineCount = 0;
                   try {
-                    lineCount = fs28.readFileSync(absPath, "utf8").split(/\r\n|\r|\n/).length;
+                    lineCount = fs27.readFileSync(absPath, "utf8").split(/\r\n|\r|\n/).length;
                   } catch (e) {
                   }
                   if (lineCount > 300) {
-                    const label = `\u21B7  Skipped (Too Large): ${path27.basename(filePath)}`;
+                    const label = `\u21B7  Skipped (Too Large): ${path26.basename(filePath)}`;
                     let terminalWidth = 115;
                     if (process.stdout.isTTY) {
                       terminalWidth = process.stdout.columns - 5 || 120;
@@ -16020,13 +16280,13 @@ ${ideCtx.warnings}
                 if (!isError) {
                   let label = "";
                   if (isImage) {
-                    label = `\u2714  Processed: ${path27.basename(filePath)}`;
+                    label = `\u2714  Processed: ${path26.basename(filePath)}`;
                     attachedBinaryPart = binPart;
                   } else if (isPdf || isOfficeFile) {
-                    label = `\u2714  Auto-Analysed: ${path27.basename(filePath)}`;
+                    label = `\u2714  Auto-Analysed: ${path26.basename(filePath)}`;
                     attachedBinaryPart = binPart;
                   } else {
-                    label = `\u2714  Auto-Read: ${path27.basename(filePath)}`;
+                    label = `\u2714  Auto-Read: ${path26.basename(filePath)}`;
                     taggedContextBlocks.push(textResult);
                   }
                   if (label) {
@@ -16059,7 +16319,7 @@ OS: ${osDetected}${systemSettings?.dynamicDirAwareness ? dirStructure : ""}${cwd
 WARNING: CWD Changed from previous: "${lastCwd}" to current: "${process.cwd()}", write change in chat to avoid future path mismatches
 ` : ""}${memoryPrompt}${ideBlock}
 [/METADATA]
-${activeSummaryBlock}${thinkingLevel !== "Fast" && (aiProvider === "Mistral" || thinkingLevel !== "xHigh" && aiProvider === "Google") ? `${aiProvider === "Mistral" || modelName.toLowerCase().startsWith("gemma") ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS HIGH PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>** [/SYSTEM]\n" : ""}` : ""}[SYSTEM Priority: HIGH] ONLY use the system prompt tool schema [tool:functions.ToolName(...)] [/SYSTEM]
+${activeSummaryBlock}${thinkingLevel !== "Fast" && (aiProvider === "Mistral" || thinkingLevel !== "xHigh" && aiProvider === "Google") ? `${aiProvider === "Mistral" || modelName.toLowerCase().startsWith("gemma") ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS HIGH PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>** [/SYSTEM]\n" : ""}` : ""}[SYSTEM Priority: HIGH] ONLY use the system prompt tool schema [tool:functions.ToolName(arg1="value1")] [/SYSTEM]
 ${taggedContextStr}[USER PROMPT]
 ${cleanPromptForModel.trim()}
 [/USER PROMPT]`.trim();
@@ -16094,10 +16354,31 @@ ${cleanPromptForModel.trim()}
             yield { type: "status", content: "Working" };
           }
           if (TERMINATION_SIGNAL) {
+            try {
+              const { clearPendingNudges: clearPendingNudges2 } = await Promise.resolve().then(() => (init_subagent_state(), subagent_state_exports));
+              clearPendingNudges2();
+            } catch (e) {
+            }
             yield { type: "status", content: "Request Cancelled" };
             yield { type: "text", content: "\n\n\x1B[33m\u24D8 Request Cancelled\x1B[0m" };
             break;
           }
+          try {
+            const { consumePendingNudges: consumePendingNudges2 } = await Promise.resolve().then(() => (init_subagent_state(), subagent_state_exports));
+            const pendingNudges = consumePendingNudges2();
+            if (pendingNudges && pendingNudges.length > 0) {
+              const combinedNudge = pendingNudges.join("\n\n");
+              if (modifiedHistory.length > 0 && modifiedHistory[modifiedHistory.length - 1].role === "user") {
+                modifiedHistory[modifiedHistory.length - 1].text += `
+
+${combinedNudge}`;
+              } else {
+                modifiedHistory.push({ role: "user", text: combinedNudge });
+              }
+              yield { type: "status", content: "Subagent Update" };
+            }
+          } catch (e) {
+          }
           if (steeringCallback) {
             const hint = await steeringCallback();
             if (hint) {
@@ -16359,7 +16640,8 @@ ${ideErr} [/ERROR]`;
                 );
                 stream = wrapNvidiaStreamWithQueueDepth(rawStream, targetModel);
               } else {
-                const apiCallPromise = client.models.generateContentStream({
+                const googleClient = getGoogleClient(settings?.apiKey);
+                const apiCallPromise = googleClient.models.generateContentStream({
                   model: targetModel || "gemini-3-flash-preview",
                   contents: activeContents,
                   config: {
@@ -16700,23 +16982,23 @@ ${ideErr} [/ERROR]`;
                       "getProgress": "get_progress",
                       "GetProgress": "get_progress",
                       "Cancel": "cancel",
-                      "await": "await",
-                      "Await": "await"
+                      "Await": "await",
+                      "Answer": "answer"
                     };
                     const potentialTool = NORMALIZE_MAP[toolContext.toolName] || toolContext.toolName;
                     const partialArgs = toolContext.args || "";
                     let detail = null;
-                    if (["write_file", "update_file", "view_file", "read_folder", "write_pdf", "write_docx", "search_keyword", "generate_image", "file_map", "invoke", "invoke_sync", "get_progress", "await"].includes(potentialTool)) {
+                    if (["write_file", "update_file", "view_file", "read_folder", "write_pdf", "write_docx", "search_keyword", "generate_image", "file_map", "invoke", "invoke_sync", "get_progress", "await", "answer"].includes(potentialTool)) {
                       const pArgs = parseArgs(partialArgs);
                       const filePath = pArgs.path || pArgs.targetFile || pArgs.TargetFile || pArgs.directory;
                       const keyword = pArgs.keyword;
                       const title = pArgs.title || pArgs.task;
                       const id = pArgs.id || pArgs.taskId;
-                      const timeVal = pArgs.time;
+                      const timeVal = pArgs.timeout || pArgs.time;
                       if (keyword !== void 0 && keyword !== null) {
                         detail = String(keyword).replace(RE_STRIP_QUOTES, "");
                       } else if (filePath) {
-                        detail = path27.basename(String(filePath).replace(RE_STRIP_QUOTES, "").replace(RE_BACKSLASH_SLASH, "/"));
+                        detail = path26.basename(String(filePath).replace(RE_STRIP_QUOTES, "").replace(RE_BACKSLASH_SLASH, "/"));
                       } else if (title && (potentialTool === "invoke" || potentialTool === "invoke_sync")) {
                         detail = String(title).replace(RE_STRIP_QUOTES, "").substring(0, 30);
                       } else if (id && potentialTool === "get_progress") {
@@ -16745,7 +17027,7 @@ ${ideErr} [/ERROR]`;
                           if (potentialTool === "invoke" || potentialTool === "invoke_sync" || potentialTool === "get_progress") {
                             detail = val.substring(0, 30);
                           } else {
-                            detail = potentialTool === "search_keyword" || potentialTool === "file_map" ? val : path27.basename(val.replace(RE_BACKSLASH_SLASH, "/"));
+                            detail = potentialTool === "search_keyword" || potentialTool === "file_map" ? val : path26.basename(val.replace(RE_BACKSLASH_SLASH, "/"));
                           }
                         }
                       }
@@ -16779,17 +17061,19 @@ ${ideErr} [/ERROR]`;
                           "Ask": "User Input Required",
                           "Memory": "Updating Memory",
                           "GenerateImage": "Generating",
-                          "InvokeSync": "Generalist Working",
-                          "invoke_sync": "Generalist Working",
-                          "Invoke": "Generalist Working",
-                          "invoke": "Generalist Working",
+                          "InvokeSync": "Sub-Agent Working",
+                          "invoke_sync": "Sub-Agent Working",
+                          "Invoke": "Working",
+                          "invoke": "Working",
                           "GetProgress": "Checking Progress",
                           "get_progress": "Checking Progress",
                           "Cancel": "Stopping Generalist",
                           "cancel": "Stopping Generalist",
                           "Await": "Waiting",
                           "await": "Waiting",
-                          "EmergencyRollback": "Rolling the Ball"
+                          "EmergencyRollback": "Rolling the Ball",
+                          "Answer": "Answering Sub-Agent",
+                          "answer": "Answering Sub-Agent"
                         };
                         const toolTitle = TOOL_TITLES[potentialTool] || "Working";
                         process.stdout.write(`\x1B]0;${toolTitle}...\x07`);
@@ -16921,14 +17205,20 @@ ${ideErr} [/ERROR]`;
                       "generate_image": "generate_image",
                       "todo": "todo",
                       "Todo": "todo",
-                      "invoke": "invoke",
+                      "Invoke": "invoke",
                       "InvokeSync": "invoke_sync",
                       "getProgress": "get_progress",
                       "GetProgress": "get_progress",
+                      "Await": "await",
+                      "await": "await",
+                      "AwaitSubagent": "await",
+                      "awaitSubagent": "await",
+                      "Answer": "answer",
+                      "answer": "answer",
+                      "AnswerSubagent": "answer",
+                      "answerSubagent": "answer",
                       "Cancel": "cancel",
                       "cancel": "cancel",
-                      "await": "await",
-                      "Await": "await",
                       "EmergencyRollback": "EmergencyRollback"
                     };
                     const normToolName = NORMALIZE_MAP[toolCall.toolName] || toolCall.toolName;
@@ -16951,9 +17241,9 @@ ${ideErr} [/ERROR]`;
                       let totalLines = "...";
                       let actualEndLine = eLine;
                       try {
-                        const absPath = path27.resolve(process.cwd(), targetPath2);
-                        if (fs28.existsSync(absPath)) {
-                          const content = fs28.readFileSync(absPath, "utf8");
+                        const absPath = path26.resolve(process.cwd(), targetPath2);
+                        if (fs27.existsSync(absPath)) {
+                          const content = fs27.readFileSync(absPath, "utf8");
                           const lines = content.split("\n").length;
                           totalLines = lines;
                           if (!rawStart && !rawEnd && lines > 800) {
@@ -16969,30 +17259,30 @@ ${ideErr} [/ERROR]`;
                       const isOfficeFile = pathLower.endsWith(".docx") || pathLower.endsWith(".doc") || pathLower.endsWith(".ppt") || pathLower.endsWith(".pptx") || pathLower.endsWith(".xls") || pathLower.endsWith(".xlsx");
                       const isImage = /\.(png|jpg|jpeg|webp|gif|bmp)$/.test(pathLower);
                       if (isPdf || isOfficeFile) {
-                        label = `${targetPath2.length > 0 ? "\u2714" : "\u2718"}  ${targetPath2 ? `Analyzed: ${path27.basename(targetPath2)}` : "Analyzed: File Not Found"}`;
+                        label = `${targetPath2.length > 0 ? "\u2714" : "\u2718"}  ${targetPath2 ? `Analyzed: ${path26.basename(targetPath2)}` : "Analyzed: File Not Found"}`;
                       } else if (isImage) {
-                        label = `${targetPath2.length > 0 ? "\u2714" : "\u2718"}  ${targetPath2 ? `Processed: ${path27.basename(targetPath2)}` : "Processed: File Not Found"}`;
+                        label = `${targetPath2.length > 0 ? "\u2714" : "\u2718"}  ${targetPath2 ? `Processed: ${path26.basename(targetPath2)}` : "Processed: File Not Found"}`;
                       } else {
-                        label = `${totalLines !== "..." ? "\u2714" : "\u2718"}  Read: ${targetPath2 ? `${path27.basename(targetPath2)} \u2192 ${totalLines !== "..." ? `Lines ${sLine} - ${actualEndLine} of ${totalLines}` : "File Not Found"}` : "File Not Found"}`;
+                        label = `${totalLines !== "..." ? "\u2714" : "\u2718"}  Read: ${targetPath2 ? `${path26.basename(targetPath2)} \u2192 ${totalLines !== "..." ? `Lines ${sLine} - ${actualEndLine} of ${totalLines}` : "File Not Found"}` : "File Not Found"}`;
                       }
                     } else if (normToolName === "list_files" || normToolName === "read_folder") {
                       const action = normToolName === "list_files" ? "List" : "Browsed";
-                      const path29 = parseArgs(toolCall.args).path || null;
+                      const path28 = parseArgs(toolCall.args).path || null;
                       const recurse = parseArgs(toolCall.args).recurse || 1;
-                      label = `${path29 ? "\u2714" : "\u2718"}  ${action}: ${path29 ? `${path29 === "." ? `./${recurse > 1 ? "*" : ""}` : `${path29.replaceAll("\\", "/")}${recurse > 1 ? `${path29.endsWith("/") ? `*` : `/*`}` : `${path29.endsWith("/") ? "" : "/"}`}`}` : "No Folder Selected"}`;
+                      label = `${path28 ? "\u2714" : "\u2718"}  ${action}: ${path28 ? `${path28 === "." ? `./${recurse > 1 ? "*" : ""}` : `${path28.replaceAll("\\", "/")}${recurse > 1 ? `${path28.endsWith("/") ? `*` : `/*`}` : `${path28.endsWith("/") ? "" : "/"}`}`}` : "No Folder Selected"}`;
                     } else if (normToolName === "write_file" || normToolName === "update_file") {
                       const action = normToolName === "write_file" ? "Created" : "Edited";
-                      const path29 = parseArgs(toolCall.args).path || null;
-                      label = `${path29 ? "\u2714" : "\u2718"}  ${action}: ${path29.replaceAll("\\", "/") || "No File Changes"}`;
+                      const path28 = parseArgs(toolCall.args).path || null;
+                      label = `${path28 ? "\u2714" : "\u2718"}  ${action}: ${path28.replaceAll("\\", "/") || "No File Changes"}`;
                     } else if (normToolName === "write_pdf") {
-                      const path29 = parseArgs(toolCall.args).path || null;
-                      label = `${path29 ? "\u2714" : "\u2718"}  Generated: ${path29.replaceAll("\\", "/") || "No PDF Generated"}`;
+                      const path28 = parseArgs(toolCall.args).path || null;
+                      label = `${path28 ? "\u2714" : "\u2718"}  Generated: ${path28.replaceAll("\\", "/") || "No PDF Generated"}`;
                     } else if (normToolName === "write_docx") {
-                      const path29 = parseArgs(toolCall.args).path || null;
-                      label = `${path29 ? "\u2714" : "\u2718"}  Generated: ${path29.replaceAll("\\", "/") || "No Docx Generated"}`;
+                      const path28 = parseArgs(toolCall.args).path || null;
+                      label = `${path28 ? "\u2714" : "\u2718"}  Generated: ${path28.replaceAll("\\", "/") || "No Docx Generated"}`;
                     } else if (normToolName === "file_map") {
-                      const path29 = parseArgs(toolCall.args).path;
-                      label = `${path29 ? "\u2714" : "\u2718"}  Indexed: ${path29.replaceAll("\\", "/") ? "" + path29 : "File Not Found"}`;
+                      const path28 = parseArgs(toolCall.args).path;
+                      label = `${path28 ? "\u2714" : "\u2718"}  Indexed: ${path28.replaceAll("\\", "/") ? "" + path28 : "File Not Found"}`;
                     } else if (normToolName.toLowerCase() === "search_keyword" || normToolName.toLowerCase() === "todo") {
                       label = "";
                     } else if (normToolName.toLowerCase() === "generate_image") {
@@ -17014,10 +17304,9 @@ ${ideErr} [/ERROR]`;
                       const { method } = parseArgs(toolCall.args);
                       label = method === "forceRevert" ? "" : "\u2714  Rollback Point Checked";
                     } else if (normToolName === "await" || normToolName === "Await") {
-                      const { time } = parseArgs(toolCall.args);
-                      let sec = parseFloat(time) || 0;
-                      if (sec < 10) sec = 10;
-                      if (sec > 180) sec = 180;
+                      const { time, timeout } = parseArgs(toolCall.args);
+                      let sec = parseFloat(timeout || time) || 0;
+                      if (!sec) sec = 120;
                       const formatTime = (s) => {
                         if (s >= 60) {
                           const m = Math.floor(s / 60);
@@ -17056,6 +17345,8 @@ ${ideErr} [/ERROR]`;
                       ];
                       let randomVibe = existentialVibes[Math.floor(Math.random() * existentialVibes.length)];
                       label = `\u2714  ${randomVibe} \u2192 ${formatTime(sec)}`;
+                    } else if (normToolName === "Answer" || normToolName === "answer") {
+                      label = "\u2714  Resolved Sub-Agent Query";
                     } else if (normToolName === "exec_command" || normToolName === "ask") {
                       label = "";
                     } else {
@@ -17066,7 +17357,7 @@ ${ideErr} [/ERROR]`;
                       const { command } = parseArgs(toolCall.args);
                       if (command && settings.systemSettings && settings.systemSettings.allowExternalAccess === false) {
                         const riskyPatterns = [/[a-zA-Z]:[\\\/]/i, /^\//, /\.\.[\\\/]/, /\/etc\//, /\/var\//, /\/root\//, /\/bin\//, /\/usr\//];
-                        const currentDrive = path27.resolve(process.cwd()).substring(0, 3).toLowerCase();
+                        const currentDrive = path26.resolve(process.cwd()).substring(0, 3).toLowerCase();
                         const splitCommands = (cmdString) => {
                           const commands = [];
                           let current = "";
@@ -17195,8 +17486,8 @@ ${ideErr} [/ERROR]`;
                     const targetPath = parsedArgs.path || parsedArgs.targetPath || null;
                     if (targetPath) {
                       const isExternalOff = settings.systemSettings && settings.systemSettings.allowExternalAccess === false;
-                      const absoluteTarget = path27.resolve(targetPath);
-                      const absoluteCwd = path27.resolve(process.cwd());
+                      const absoluteTarget = path26.resolve(targetPath);
+                      const absoluteCwd = path26.resolve(process.cwd());
                       if (isExternalOff && !absoluteTarget.startsWith(absoluteCwd)) {
                         const denyMsg = `Access Denied. You are not allowed to access files outside the current workspace.`;
                         if (normToolName === "write_file" || normToolName === "update_file") {
@@ -17385,7 +17676,7 @@ ${ideErr} [/ERROR]`;
                               const toolArgs = parseArgs(toolCall.args);
                               const { path: filePath } = toolArgs;
                               if (filePath) {
-                                const absPath = path27.resolve(process.cwd(), filePath);
+                                const absPath = path26.resolve(process.cwd(), filePath);
                                 const normalize2 = (p) => p ? p.toLowerCase().replace(/\\/g, "/").replace(/^[a-z]:/, (m) => m.toUpperCase()) : "";
                                 const normAbsPath = normalize2(absPath);
                                 let originalContent = "";
@@ -17395,8 +17686,8 @@ ${ideErr} [/ERROR]`;
                                 if (currentIDE && normFocused === normAbsPath && currentIDE.full_content) {
                                   originalContent = currentIDE.full_content;
                                   hasOriginal = true;
-                                } else if (fs28.existsSync(absPath)) {
-                                  originalContent = fs28.readFileSync(absPath, "utf8");
+                                } else if (fs27.existsSync(absPath)) {
+                                  originalContent = fs27.readFileSync(absPath, "utf8");
                                   hasOriginal = true;
                                 }
                                 originalContentForReporting = originalContent;
@@ -17424,9 +17715,9 @@ ${ideErr} [/ERROR]`;
                                     const successes = patchResults.filter((r) => r.success);
                                     const failures = patchResults.filter((r) => !r.success);
                                     if (successes.length === 0) {
-                                      const errorMsg = `[TOOL RESULT]: ERROR: Failed to apply patches to [${path27.basename(absPath)}].
+                                      const errorMsg = `[TOOL RESULT]: ERROR: Failed to apply patches to [${path26.basename(absPath)}].
 ${failures.map((f) => `  \u2022 ${f.error}`).join("\n")}`;
-                                      const errorLabel = `\u2714  Edited: ${path27.basename(absPath.replaceAll("\\", "/"))}`;
+                                      const errorLabel = `\u2714  Edited: ${path26.basename(absPath.replaceAll("\\", "/"))}`;
                                       let terminalWidth = 115;
                                       if (process.stdout.isTTY) {
                                         terminalWidth = process.stdout.columns - 5 || 120;
@@ -17443,19 +17734,19 @@ ${failures.map((f) => `  \u2022 ${f.error}`).join("\n")}`;
                                       continue;
                                     }
                                   }
-                                  yield { type: "status", content: `Opening Diff in IDE: ${path27.basename(absPath)}` };
+                                  yield { type: "status", content: `Opening Diff in IDE: ${path26.basename(absPath)}` };
                                   showDiffInIDE(absPath, originalContent, modifiedContent);
                                   diffOpened = true;
                                   await new Promise((r) => setTimeout(r, 50));
                                 } else if (normToolName === "write_file") {
                                   const rawContent = toolArgs.content || toolArgs.newContent || "";
                                   const modifiedContent = rawContent.endsWith("\n") ? rawContent : rawContent + "\n";
-                                  if (!fs28.existsSync(absPath)) {
+                                  if (!fs27.existsSync(absPath)) {
                                     isNewFileCreated = true;
-                                    fs28.mkdirSync(path27.dirname(absPath), { recursive: true });
-                                    fs28.writeFileSync(absPath, "", "utf8");
+                                    fs27.mkdirSync(path26.dirname(absPath), { recursive: true });
+                                    fs27.writeFileSync(absPath, "", "utf8");
                                   }
-                                  yield { type: "status", content: `Opening New File Diff in IDE: ${path27.basename(absPath)}` };
+                                  yield { type: "status", content: `Opening New File Diff in IDE: ${path26.basename(absPath)}` };
                                   showDiffInIDE(absPath, "", modifiedContent);
                                   diffOpened = true;
                                   await new Promise((r) => setTimeout(r, 50));
@@ -17491,11 +17782,11 @@ ${failures.map((f) => `  \u2022 ${f.error}`).join("\n")}`;
                           if (normToolName === "write_file" || normToolName === "update_file") {
                             const { path: filePath } = parseArgs(toolCall.args);
                             if (filePath) {
-                              const absPath = path27.resolve(process.cwd(), filePath);
+                              const absPath = path26.resolve(process.cwd(), filePath);
                               closeDiffInIDE(absPath, approval);
-                              if (approval === "deny" && isNewFileCreated && fs28.existsSync(absPath)) {
+                              if (approval === "deny" && isNewFileCreated && fs27.existsSync(absPath)) {
                                 try {
-                                  fs28.unlinkSync(absPath);
+                                  fs27.unlinkSync(absPath);
                                 } catch (e) {
                                 }
                               }
@@ -17507,18 +17798,18 @@ ${failures.map((f) => `  \u2022 ${f.error}`).join("\n")}`;
                         }
                         if (approval === "allow" && diffOpened && isBridgeConnected()) {
                           const { path: filePath } = parseArgs(toolCall.args);
-                          const absPath = path27.resolve(process.cwd(), filePath);
-                          const normPath = (p) => p ? path27.resolve(p).replace(/\\/g, "/").toLowerCase() : "";
+                          const absPath = path26.resolve(process.cwd(), filePath);
+                          const normPath = (p) => p ? path26.resolve(p).replace(/\\/g, "/").toLowerCase() : "";
                           const finalIDE = await getIDEContext();
                           let finalContent = "";
                           if (finalIDE && finalIDE.file_focused && normPath(finalIDE.file_focused) === normPath(absPath) && finalIDE.full_content) {
                             finalContent = finalIDE.full_content;
                           }
-                          if (!finalContent && fs28.existsSync(absPath)) {
-                            finalContent = fs28.readFileSync(absPath, "utf8");
+                          if (!finalContent && fs27.existsSync(absPath)) {
+                            finalContent = fs27.readFileSync(absPath, "utf8");
                             if (!finalContent) {
                               await new Promise((r) => setTimeout(r, 100));
-                              finalContent = fs28.readFileSync(absPath, "utf8");
+                              finalContent = fs27.readFileSync(absPath, "utf8");
                             }
                           }
                           const verifiedLines = finalContent.split(/\r?\n/);
@@ -17679,7 +17970,7 @@ ${snippet2}`;
                       try {
                         const { path: filePath } = parseArgs(toolCall.args);
                         if (filePath) {
-                          const absPath = path27.resolve(process.cwd(), filePath);
+                          const absPath = path26.resolve(process.cwd(), filePath);
                           const currentIDE = await getIDEContext();
                           if (currentIDE && currentIDE.file_focused === absPath && currentIDE.full_content) {
                             execToolContext.forcedContent = currentIDE.full_content;
@@ -17693,7 +17984,7 @@ ${snippet2}`;
                     if ((normToolName === "write_file" || normToolName === "update_file") && result.startsWith("SUCCESS")) {
                       const { path: filePath } = parseArgs(toolCall.args);
                       if (filePath) {
-                        const absPath = path27.resolve(process.cwd(), filePath);
+                        const absPath = path26.resolve(process.cwd(), filePath);
                         openFileInEditor(absPath);
                       }
                     }
@@ -17710,7 +18001,7 @@ ${snippet2}`;
                       result = result.text;
                     }
                     if (normToolName === "search_keyword") {
-                      const { keyword, path: path29 } = parseArgs(toolCall.args);
+                      const { keyword, path: path28 } = parseArgs(toolCall.args);
                       const _isGlob = typeof result === "string" && result.startsWith("[GLOB]");
                       if (_isGlob) result = result.slice(6).trimStart();
                       const _isDir = typeof result === "string" && result.startsWith("[DIR]");
@@ -17722,8 +18013,8 @@ ${snippet2}`;
                           matchCount = parseInt(m[1]);
                         }
                       }
-                      const _sp = path29 ? path29.replace(/[\/\\]+$/, "") : null;
-                      const displayPath = _sp && _sp !== "." ? `"${_isGlob ? path29 : _isDir ? `${_sp}/*` : _sp}"` : "./";
+                      const _sp = path28 ? path28.replace(/[\/\\]+$/, "") : null;
+                      const displayPath = _sp && _sp !== "." ? `"${_isGlob ? path28 : _isDir ? `${_sp}/*` : _sp}"` : "./";
                       const postLabel = `${keyword ? "\u2714" : "\u2718"}  Searched: "${keyword ? keyword : ""}" in ${displayPath.replaceAll("\\", "/")} \u2192 ${matchCount} Match${matchCount === 1 ? "" : "es"}`;
                       let terminalWidth = 115;
                       if (process.stdout.isTTY) {
@@ -17962,9 +18253,9 @@ ${snippet2}`;
               })() : String(err);
               ;
               const date = (/* @__PURE__ */ new Date()).toLocaleString();
-              const agentErrDir = path27.join(LOGS_DIR, "agent");
-              if (!fs28.existsSync(agentErrDir)) fs28.mkdirSync(agentErrDir, { recursive: true });
-              fs28.appendFileSync(path27.join(agentErrDir, "error.log"), `ERROR [${date}]: ${errLog}
+              const agentErrDir = path26.join(LOGS_DIR, "agent");
+              if (!fs27.existsSync(agentErrDir)) fs27.mkdirSync(agentErrDir, { recursive: true });
+              fs27.appendFileSync(path26.join(agentErrDir, "error.log"), `ERROR [${date}]: ${errLog}
 
 ----------------------------------------------------------------------
 
@@ -17984,7 +18275,7 @@ ${snippet2}`;
                   const waitTime = Math.min(1e3 * Math.pow(2, inStreamRetryCount - 1), 24e3);
                   if (turnText.trim().length > 0) {
                     modifiedHistory.push({ role: "agent", text: turnText });
-                    const recoveryText = "[SYSTEM]\n- SEAMLESS CONTINUATION: Resume immediately. Pick up from last words with zero gap/disruption\n- NO REPETITION: Do not repeat any text already written\n- NO RE-THINK: Do not restart or open <think> if reasoning already started. Continue the thinking and close thinking block </think> if opened before outputting user response\n- MID-TOOL SAFETY: If cutoff was mid-tool call, restart that tool call from start\n- STEALTH: Do not mention/apologize for cutoff [/SYSTEM]";
+                    const recoveryText = "[SYSTEM]\n- SEAMLESS CONTINUATION: Resume immediately. Pick up from last words with zero gap/disruption\n- NO REPETITION: Do not repeat any text already written\n- NO RE-THINK: Do not restart or open <think> if reasoning already started. Continue the thinking and close thinking block </think> BEFORE CHAT OUTPUT\n- MID-TOOL SAFETY: If cutoff was mid-tool call, restart that tool call from start\n- STEALTH: Do not mention/apologize for cutoff [/SYSTEM]";
                     if (toolResults.length > 0) {
                       toolResults.forEach((tr, idx) => {
                         if (idx === toolResults.length - 1) {
@@ -18011,7 +18302,7 @@ ${recoveryText}`
                   yield { type: "status", content: `Error Occured. Recovering Stream...` };
                 } else {
                   throw new Error(`Stream collapsed too many times. (Failed to resolve ${MAX_RETRIES} times)
-Error Log can be found in ${path27.join(LOGS_DIR, "agent", "error.log")}`);
+Error Log can be found in ${path26.join(LOGS_DIR, "agent", "error.log")}`);
                 }
               } else {
                 if (retryCount <= MAX_RETRIES) {
@@ -18029,7 +18320,7 @@ Error Log can be found in ${path27.join(LOGS_DIR, "agent", "error.log")}`);
                   yield { type: "status", content: `Trying to reach ${modelName}` };
                 } else {
                   throw new Error(`Model ${modelName} cannot be reached. (Failed ${MAX_RETRIES} times)
-Error Log can be found in ${path27.join(LOGS_DIR, "agent", "error.log")}`);
+Error Log can be found in ${path26.join(LOGS_DIR, "agent", "error.log")}`);
                 }
               }
             }
@@ -18148,10 +18439,10 @@ Error Log can be found in ${path27.join(LOGS_DIR, "agent", "error.log")}`);
           }
         })() : String(err);
         const date = (/* @__PURE__ */ new Date()).toLocaleString();
-        const agentErrDir = path27.join(LOGS_DIR, "agent");
+        const agentErrDir = path26.join(LOGS_DIR, "agent");
         yield { type: "text", content: `\u274C CRITICAL ERROR: ${errLog.includes("fetch failed") ? "Failed to Connect. Check your Internet Connection or Wait a moment" : errLog}` };
-        if (!fs28.existsSync(agentErrDir)) fs28.mkdirSync(agentErrDir, { recursive: true });
-        fs28.appendFileSync(path27.join(agentErrDir, "error.log"), `CRITICAL ERROR [${date}]: ${err}
+        if (!fs27.existsSync(agentErrDir)) fs27.mkdirSync(agentErrDir, { recursive: true });
+        fs27.appendFileSync(path26.join(agentErrDir, "error.log"), `CRITICAL ERROR [${date}]: ${err}
 
 ----------------------------------------------------------------------
 
@@ -18177,7 +18468,7 @@ Error Log can be found in ${path27.join(LOGS_DIR, "agent", "error.log")}`);
       }
       yield { type: "status", content: null };
     };
-    runSubagent = async (task, settings, model = null, allowedTools = null, maxTurns = 50, logCallback = null) => {
+    runSubagent = async (task, settings, model = null, allowedTools = null, maxTurns = 50, logCallback = null, isAsync = false) => {
       const savedSettings = await loadSettings();
       const mergedSettings = { ...savedSettings, ...settings };
       const envSubagentModel = process.env.SUBAGENT_MODEL ? process.env.SUBAGENT_MODEL.trim() : null;
@@ -18251,8 +18542,8 @@ Error Log can be found in ${path27.join(LOGS_DIR, "agent", "error.log")}`);
       const targetModel = model || subAgentCustomModel || settings?.modelName || settings?.activeModel || savedSettings.activeModel;
       const osDetected = process.platform === "win32" ? "Windows" : process.platform === "darwin" ? "macOS" : "Linux";
       const providedToolsSection = `-- TOOL DEFINITIONS (path = relative to CWD, path separator: '/') --
-TO ACCESS TOOLS **STRICTLY USE THE EXACT FORMAT IN CHAT OUTPUT:** [tool:functions.ToolName(args)]
-**NO OTHER SYNTAX/MARKERS/BOUNDARY ALLOWED**
+TO ACCESS TOOLS **STRICTLY USE THE EXACT FORMAT IN CHAT OUTPUT:** [tool:functions.ToolName(arg1="value1")]
+**NO OTHER SYNTAX/MARKERS/WRAPPER/BOUNDARY ALLOWED**
 
 TOOL POLICY:
 - Escape quotes: \\" for code strings
@@ -18263,10 +18554,12 @@ TOOL POLICY:
 - Need text or huge files? SearchKeyword > Full Read
 - Update Todos from realtime progress each turn
 - Restricted Shell Access, No Deletion
+- ONLY valid tools and syntax defined below are allowed
 
 **PROVIDED TOOLS**
--- Communication with USER --
-- [tool:functions.Ask(question="...", optionA="option::description", ...MAX 4)]. Ambiguity: MUST for path divergence, security risk. Ask, don't finish/guess. Suggest best options; no preferences. Keep options short
+-- Communication Tools --
+- [tool:functions.Ask(question="...", optionA="option::description", ...MAX 4)]. Communicate with USER. Ambiguity: MUST for path divergence, security risk. Ask, don't finish/guess. Suggest best options; no preferences. Keep options short
+${isAsync ? `- [tool:functions.AskMain(question="...", optionA="option::description", ...MAX 4)]. Communicate with PARENT/MAIN AGENT. When clarification/decision is needed for a task` : ""}
 
 -- Web Tools --
 - [tool:functions.WebSearch(query="...", aiMode="bool optional, default: false", limit="integer 3-10, aiMode: exclude")]. Usage: unknown info/docs. aiMode: LLM search
@@ -18279,7 +18572,7 @@ TOOL POLICY:
 - [tool:functions.PatchFile(path="...", allowMultiple="bool optional, default: false", replaceContent1="...", newContent1="...", ...MAX15)]. TARGET MINIMAL DIFF. allowMultiple: Replace all matches ONLY WHEN SURE. Multi-blocks: replaceContent2/newContent2... Verify diffs
 - [tool:functions.WriteFile(path="...", content="...")]. Creates/Overwrites. File Exist? PatchFile > WriteFile. VERIFY IMPORTS
 - [tool:functions.Run(command="...")]. Runs ${osDetected === "Windows" ? isPsAvailable() ? `WINDOWS POWERSHELL` : `WINDOWS CMD` : `BASH`} command. Destructive/Irreversible ops \u2192 Ask user`.trim();
-      const systemInstruction = `=== START SYSTEM PROMPT ===
+      const systemInstructionSubAgent = `=== START SYSTEM PROMPT ===
 You are a subagent helping the main FluxFlow CLI agent
 Your task is: "${task}"
 
@@ -18319,7 +18612,7 @@ Current Time: ${time}
           parts: [{ text: m.text }]
         }));
         if (logCallback) logCallback(`[Subagent Turn ${turn + 1}] Invoking model ${targetModel}...`);
-        const response = await generateSimpleContent(mergedSettings, targetModel, contents, systemInstruction, "Fast");
+        const response = await generateSimpleContent(mergedSettings, targetModel, contents, systemInstructionSubAgent, "Fast");
         const responseText = response.text || "";
         const cleanResponse = responseText.replace(/(?:<think>|\[think\])[\s\S]*?(?:<\/think>|\[\/think\])/gi, "").trim();
         finalAnswer = cleanResponse;
@@ -18331,6 +18624,8 @@ ${cleanResponse}
         if (toolCalls.length === 0) {
           break;
         }
+        const askMainCalls = toolCalls.filter((tc) => tc.toolName.toLowerCase() === "askmain" || tc.toolName.toLowerCase() === "ask_main");
+        let processedAskMainInTurn = false;
         let toolResultsStr = "";
         for (const toolCall of toolCalls) {
           if (TERMINATION_SIGNAL) {
@@ -18347,6 +18642,39 @@ ${cleanResponse}
             }
           }
           const normalizedToolName = toolCall.toolName.toLowerCase();
+          if (normalizedToolName === "askmain" || normalizedToolName === "ask_main") {
+            if (processedAskMainInTurn) continue;
+            processedAskMainInTurn = true;
+            let questionText = "";
+            let optionsObj = {};
+            if (askMainCalls.length === 1) {
+              const pArgs = parseArgs(askMainCalls[0].args);
+              questionText = pArgs.question || askMainCalls[0].args;
+              optionsObj = pArgs;
+            } else {
+              questionText = askMainCalls.map((tc, idx) => {
+                const pArgs = parseArgs(tc.args);
+                return `Q${idx + 1}: ${pArgs.question || tc.args}`;
+              }).join("\n");
+              optionsObj = {};
+            }
+            if (settings.onAskMain) {
+              if (logCallback) logCallback(`[Executing Tool] AskMain("${questionText}")...`);
+              const answer = await settings.onAskMain(questionText, optionsObj);
+              if (logCallback) logCallback(`[Tool Result]
+Answer from Main Agent: ${answer}
+`);
+              toolResultsStr += `[TOOL RESULT for AskMain]: Answer from Main Agent: ${answer}
+
+`;
+              await incrementUsage("toolSuccess");
+            } else {
+              toolResultsStr += `[TOOL RESULT for AskMain]: ERROR: Main agent communication channel not available.
+
+`;
+            }
+            continue;
+          }
           const allowed = allowedTools ? allowedTools.some((t) => t.toLowerCase() === normalizedToolName) : true;
           if (!allowed) {
             const errorMsg = `ERROR: Tool [${toolCall.toolName}] is not in the allowed tools list for this subagent.`;
@@ -18383,25 +18711,25 @@ ${cleanResponse}
             const keywordPath = pArgs.path || "";
             label = `${keyword ? "\u2714" : "\u2718"} \x1B[95mSearched\x1B[0m: ${keyword || "No Query"}${keywordPath ? ` \u2192 ${keywordPath.replaceAll("\\", "/")}` : ""}`;
           } else if (normalizedToolName === "view_file" || normalizedToolName === "viewfile" || normalizedToolName === "readfile") {
-            const path29 = parseArgs(toolCall.args).path || "";
-            label = `\u2714 \x1B[95mRead\x1B[0m: ${path29.replaceAll("\\", "/")}`;
+            const path28 = parseArgs(toolCall.args).path || "";
+            label = `\u2714 \x1B[95mRead\x1B[0m: ${path28.replaceAll("\\", "/")}`;
           } else if (normalizedToolName === "list_files" || normalizedToolName === "read_folder" || normalizedToolName === "readfolder") {
-            const path29 = parseArgs(toolCall.args).path || null;
+            const path28 = parseArgs(toolCall.args).path || null;
             const recurse = parseArgs(toolCall.args).recurse || 0;
-            label = `${path29 ? "\u2714" : "\u2718"} \x1B[95mBrowsed\x1B[0m: ${path29 ? `${path29.replaceAll("\\", "/")}${recurse > 0 ? `${path29.endsWith("/") ? `*${recurse}` : `/*${recurse}`}` : `${path29.endsWith("/") ? "" : "/"}`}` : ""}`;
+            label = `${path28 ? "\u2714" : "\u2718"} \x1B[95mBrowsed\x1B[0m: ${path28 ? `${path28.replaceAll("\\", "/")}${recurse > 0 ? `${path28.endsWith("/") ? `*${recurse}` : `/*${recurse}`}` : `${path28.endsWith("/") ? "" : "/"}`}` : ""}`;
           } else if (normalizedToolName === "write_file" || normalizedToolName === "writefile") {
-            const path29 = parseArgs(toolCall.args).path || null;
-            label = `${path29 ? "\u2714" : "\u2718"} \x1B[95mCreated\x1B[0m: ${path29 ? `${path29.replaceAll("\\", "/")}` : "No File Changes"}`;
+            const path28 = parseArgs(toolCall.args).path || null;
+            label = `${path28 ? "\u2714" : "\u2718"} \x1B[95mCreated\x1B[0m: ${path28 ? `${path28.replaceAll("\\", "/")}` : "No File Changes"}`;
           } else if (normalizedToolName === "update_file" || normalizedToolName === "updatefile" || normalizedToolName === "patchfile" || normalizedToolName === "patch_file" || normalizedToolName === "patchfile" || normalizedToolName === "updatefile") {
-            const path29 = parseArgs(toolCall.args).path || null;
+            const path28 = parseArgs(toolCall.args).path || null;
             const content = parseArgs(toolCall.args).content || null;
-            label = `${path29 ? "\u2714" : "\u2718"} \x1B[95mEdited\x1B[0m: ${path29 ? `${path29.replaceAll("\\", "/")}` : "No File Changes"}`;
+            label = `${path28 ? "\u2714" : "\u2718"} \x1B[95mEdited\x1B[0m: ${path28 ? `${path28.replaceAll("\\", "/")}` : "No File Changes"}`;
           } else if (normalizedToolName === "exec_command" || normalizedToolName === "execcommand" || normalizedToolName === "run") {
             const command = parseArgs(toolCall.args).command || null;
             label = `${command ? "\u2714" : "\u2718"} \x1B[95mExecuted\x1B[0m: ${command ? command.slice(0, 100) + (command.length > 100 ? "..." : "") : "No Command"}`;
           } else if (normalizedToolName === "file_map" || normalizedToolName === "filemap") {
-            const path29 = parseArgs(toolCall.args).path || "";
-            label = `${path29 ? "\u2714" : "\u2718"} \x1B[95mIndexed\x1B[0m: ${path29 ? `${path29.replaceAll("\\", "/")}` : "File Not Found"}`;
+            const path28 = parseArgs(toolCall.args).path || "";
+            label = `${path28 ? "\u2714" : "\u2718"} \x1B[95mIndexed\x1B[0m: ${path28 ? `${path28.replaceAll("\\", "/")}` : "File Not Found"}`;
           } else if (normalizedToolName === "await") {
             const { time: time2 } = parseArgs(toolCall.args);
             let sec = parseFloat(time2) || 0;
@@ -19397,7 +19725,7 @@ var init_RevertModal = __esm({
 import puppeteer4 from "puppeteer";
 import { exec } from "child_process";
 import { promisify } from "util";
-import fs29 from "fs";
+import fs28 from "fs";
 var execAsync, checkPuppeteerReady, installPuppeteerBrowser;
 var init_setup = __esm({
   "src/utils/setup.js"() {
@@ -19406,11 +19734,11 @@ var init_setup = __esm({
     checkPuppeteerReady = () => {
       try {
         const pptrConfig = getPuppeteerConfig();
-        if (pptrConfig.executablePath && fs29.existsSync(pptrConfig.executablePath)) {
+        if (pptrConfig.executablePath && fs28.existsSync(pptrConfig.executablePath)) {
           return true;
         }
         const exePath = puppeteer4.executablePath();
-        const exists = exePath && fs29.existsSync(exePath);
+        const exists = exePath && fs28.existsSync(exePath);
         if (exists) return true;
       } catch (e) {
         return false;
@@ -19497,8 +19825,8 @@ __export(app_exports, {
 import os4 from "os";
 import React16, { useState as useState15, useEffect as useEffect12, useRef as useRef4, useMemo as useMemo2 } from "react";
 import { Box as Box14, Text as Text16, useInput as useInput9, useStdout as useStdout2, Static } from "ink";
-import fs30 from "fs-extra";
-import path28 from "path";
+import fs29 from "fs-extra";
+import path27 from "path";
 import { exec as exec2 } from "child_process";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import TextInput4 from "ink-text-input";
@@ -19928,10 +20256,10 @@ function App({ args = [] }) {
     const kbPath = getKeybindingsPath(ideName);
     if (!kbPath) return;
     try {
-      await fs30.ensureDir(path28.dirname(kbPath));
+      await fs29.ensureDir(path27.dirname(kbPath));
       let bindings = [];
-      if (fs30.existsSync(kbPath)) {
-        const content = fs30.readFileSync(kbPath, "utf8").trim();
+      if (fs29.existsSync(kbPath)) {
+        const content = fs29.readFileSync(kbPath, "utf8").trim();
         if (content) {
           try {
             bindings = parseJsonc(content);
@@ -19951,7 +20279,7 @@ function App({ args = [] }) {
         },
         "when": "terminalFocus"
       });
-      fs30.writeFileSync(kbPath, JSON.stringify(bindings, null, 4), "utf8");
+      fs29.writeFileSync(kbPath, JSON.stringify(bindings, null, 4), "utf8");
       cachedShortcut = "Shift + Enter";
       setMessages((prev) => {
         setCompletedIndex(prev.length + 1);
@@ -20686,7 +21014,7 @@ function App({ args = [] }) {
   useEffect12(() => {
     async function init() {
       try {
-        const pkg = JSON.parse(fs30.readFileSync(path28.join(process.cwd(), "package.json"), "utf8"));
+        const pkg = JSON.parse(fs29.readFileSync(path27.join(process.cwd(), "package.json"), "utf8"));
         initBridge(versionFluxflow || pkg.version || "2.0.0");
       } catch (e) {
         initBridge("2.0.0");
@@ -20800,7 +21128,7 @@ function App({ args = [] }) {
       if (!parsedArgs.playground) {
         deleteChat(PLAYGROUND_CHAT_ID).catch(() => {
         });
-        fs30.remove(path28.join(DATA_DIR, "playground")).catch(() => {
+        fs29.remove(path27.join(DATA_DIR, "playground")).catch(() => {
         });
       }
       performVersionCheck(false, freshSettings);
@@ -20834,9 +21162,9 @@ function App({ args = [] }) {
         }
       }
       if (parsedArgs.playground) {
-        const playgroundDir = path28.join(DATA_DIR, "playground");
+        const playgroundDir = path27.join(DATA_DIR, "playground");
         try {
-          fs30.ensureDirSync(playgroundDir);
+          fs29.ensureDirSync(playgroundDir);
           process.chdir(playgroundDir);
         } catch (e) {
         }
@@ -20877,8 +21205,8 @@ function App({ args = [] }) {
         if (kbPath) {
           try {
             let bindings = [];
-            if (fs30.existsSync(kbPath)) {
-              const content = fs30.readFileSync(kbPath, "utf8").trim();
+            if (fs29.existsSync(kbPath)) {
+              const content = fs29.readFileSync(kbPath, "utf8").trim();
               if (content) {
                 bindings = parseJsonc(content);
               }
@@ -21257,22 +21585,22 @@ ${cleanText}`, color: "magenta" }];
             });
             break;
           }
-          const src = path28.join(DATA_DIR, "playground");
-          const dest = path28.join(parsedArgs.originalCwd, "playground-export");
+          const src = path27.join(DATA_DIR, "playground");
+          const dest = path27.join(parsedArgs.originalCwd, "playground-export");
           const moveFiles = async () => {
             try {
               setMessages((prev) => {
                 setCompletedIndex(prev.length + 1);
                 return [...prev, { id: Date.now(), role: "system", text: `[PLAYGROUND] Exporting playground content to ${dest}`, isMeta: true }];
               });
-              await fs30.ensureDir(dest);
+              await fs29.ensureDir(dest);
               const excludeDirs = ["node_modules", ".git", ".venv", "venv", "env", ".next", "dist", "build", ".cache"];
-              await fs30.copy(src, dest, {
+              await fs29.copy(src, dest, {
                 overwrite: true,
                 filter: (srcPath) => {
-                  const relative = path28.relative(src, srcPath);
+                  const relative = path27.relative(src, srcPath);
                   if (!relative) return true;
-                  const parts2 = relative.split(path28.sep);
+                  const parts2 = relative.split(path27.sep);
                   return !parts2.some((part) => excludeDirs.includes(part));
                 }
               });
@@ -21334,7 +21662,7 @@ ${cleanText}`, color: "magenta" }];
               }
             }
             setTimeout(() => {
-              fs30.emptyDir(path28.join(DATA_DIR, "playground")).catch((err) => {
+              fs29.emptyDir(path27.join(DATA_DIR, "playground")).catch((err) => {
                 setMessages((prev) => {
                   const newMsgs = [...prev, {
                     id: "playground-" + Date.now(),
@@ -21724,12 +22052,12 @@ ${list || "No saved chats found."}`, isMeta: true }];
                 setCompletedIndex(prev.length + 1);
                 return [...prev, { id: Date.now(), role: "system", text: "[NUCLEAR] Initiating reset...", isMeta: true }];
               });
-              if (fs30.existsSync(LOGS_DIR)) fs30.removeSync(LOGS_DIR);
-              if (fs30.existsSync(SECRET_DIR)) fs30.removeSync(SECRET_DIR);
-              if (fs30.existsSync(SETTINGS_FILE)) fs30.removeSync(SETTINGS_FILE);
+              if (fs29.existsSync(LOGS_DIR)) fs29.removeSync(LOGS_DIR);
+              if (fs29.existsSync(SECRET_DIR)) fs29.removeSync(SECRET_DIR);
+              if (fs29.existsSync(SETTINGS_FILE)) fs29.removeSync(SETTINGS_FILE);
               try {
-                const items = fs30.readdirSync(FLUXFLOW_DIR);
-                if (items.length === 0) fs30.removeSync(FLUXFLOW_DIR);
+                const items = fs29.readdirSync(FLUXFLOW_DIR);
+                if (items.length === 0) fs29.removeSync(FLUXFLOW_DIR);
               } catch (e) {
               }
               setTimeout(() => {
@@ -21851,15 +22179,15 @@ ${list || "No saved chats found."}`, isMeta: true }];
 # SKILLS & WORKFLOWS
 - [Define custom step-by-step recipes for this project here]
 `;
-            const filePath = path28.join(process.cwd(), "FluxFlow.md");
-            if (fs30.pathExistsSync(filePath)) {
+            const filePath = path27.join(process.cwd(), "FluxFlow.md");
+            if (fs29.pathExistsSync(filePath)) {
               setMessages((prev) => {
                 setCompletedIndex(prev.length + 1);
                 return [...prev, { id: "init-err-" + Date.now(), role: "system", text: "ERROR: FluxFlow.md already exists in this directory.", isMeta: true }];
               });
             } else {
               try {
-                fs30.writeFileSync(filePath, template);
+                fs29.writeFileSync(filePath, template);
                 setMessages((prev) => {
                   setCompletedIndex(prev.length + 1);
                   return [...prev, { id: "init-ok-" + Date.now(), role: "system", text: "[SUCCESS] FluxFlow.md has been initialized. You can now customize it for this project.", isMeta: true }];
@@ -21973,19 +22301,19 @@ ${list || "No saved chats found."}`, isMeta: true }];
               if (!fullTextStr.startsWith("[TOOL RESULT]:")) {
                 return m;
               }
-              if (fullTextStr.startsWith("[TOOL RESULT]: ERROR") || fullTextStr.startsWith("[TOOL RESULT]: DENIED") || fullTextStr.includes("...Result Truncated by System on User Request")) {
+              if (fullTextStr.startsWith("[TOOL RESULT]: ERROR") || fullTextStr.startsWith("[TOOL RESULT]: DENIED") || fullTextStr.includes("...Result Truncated by System on User Command")) {
                 return m;
               }
               truncatedCount++;
               if (fullTextStr.startsWith("[TOOL RESULT]: SUCCESS")) {
                 return {
                   ...m,
-                  fullText: "[TOOL RESULT]: SUCCESS: ...Result Truncated by System on User Request"
+                  fullText: "[TOOL RESULT]: SUCCESS: ...Result Truncated by System on User Command"
                 };
               }
               return {
                 ...m,
-                fullText: "[TOOL RESULT]: ...Result Truncated by System on User Request"
+                fullText: "[TOOL RESULT]: ...Result Truncated by System on User Command"
               };
             });
             const finalMsgs = [...updatedMessages, {
@@ -22602,10 +22930,27 @@ Selection: ${val}`,
               commitActiveStreamingMessage();
               inThinkMode = true;
               thinkConsumedInTurn = true;
-              let thinkStartText = afterText.replace(/<(think|thought)>/gi, "");
               currentThinkId = "think-" + Date.now();
               activeStreamingMsgRef.current = { id: currentThinkId, role: "think", text: "", isStreaming: true, startTime: Date.now() };
-              appendStreamText(thinkStartText);
+              if (afterText.match(/<\/(think|thought)>/i)) {
+                const parts = afterText.split(/<\/(think|thought)>/i);
+                const rawThinkContent = parts[0] || "";
+                const thinkContent = rawThinkContent.replace(/^<(think|thought)>/i, "");
+                const agentContent = parts.slice(2).join("").replace(/<\/?(think|thought)>/gi, "");
+                activeStreamingMsgRef.current.text = flattenString(thinkContent);
+                const startTime = activeStreamingMsgRef.current.startTime || Date.now();
+                activeStreamingMsgRef.current.duration = Date.now() - startTime;
+                commitActiveStreamingMessage();
+                inThinkMode = false;
+                currentAgentId = "agent-" + Date.now();
+                activeStreamingMsgRef.current = { id: currentAgentId, role: "agent", text: "", isStreaming: true };
+                if (agentContent) {
+                  appendStreamText(agentContent);
+                }
+              } else {
+                let thinkStartText = afterText.replace(/^<(think|thought)>/gi, "");
+                appendStreamText(thinkStartText);
+              }
               continue;
             }
             if ((chunkLower.includes("</think>") || chunkLower.includes("</thought>")) && activeStreamingMsgRef.current?.role === "think") {
@@ -24238,11 +24583,11 @@ var init_app = __esm({
       if (process.platform === "win32") {
         const appData = process.env.APPDATA;
         if (!appData) return null;
-        return path28.join(appData, dirName, "User", "keybindings.json");
+        return path27.join(appData, dirName, "User", "keybindings.json");
       } else if (process.platform === "darwin") {
-        return path28.join(home, "Library", "Application Support", dirName, "User", "keybindings.json");
+        return path27.join(home, "Library", "Application Support", dirName, "User", "keybindings.json");
       } else {
-        return path28.join(home, ".config", dirName, "User", "keybindings.json");
+        return path27.join(home, ".config", dirName, "User", "keybindings.json");
       }
     };
     parseJsonc = (content) => {
@@ -24286,8 +24631,8 @@ var init_app = __esm({
     SESSION_START_TIME = Date.now();
     CHANGELOG_URL = "https://fluxflow-cli.onrender.com/changelog";
     DOCS_URL = "https://fluxflow-cli.onrender.com/";
-    packageJsonPath = path28.join(path28.dirname(fileURLToPath3(import.meta.url)), "../package.json");
-    packageJson = JSON.parse(fs30.readFileSync(packageJsonPath, "utf8"));
+    packageJsonPath = path27.join(path27.dirname(fileURLToPath3(import.meta.url)), "../package.json");
+    packageJson = JSON.parse(fs29.readFileSync(packageJsonPath, "utf8"));
     versionFluxflow = packageJson.version;
     updatedOn = packageJson.date || "2026-05-20";
     ResolutionModal = ({ data, onResolve, onEdit, theme = "Dark" }) => {
@@ -24321,20 +24666,20 @@ var init_app = __esm({
         const scan = (currentDir) => {
           if (fileList.length >= 2e3) return;
           try {
-            const files = fs30.readdirSync(currentDir);
+            const files = fs29.readdirSync(currentDir);
             for (const file of files) {
               if (fileList.length >= 2e3) return;
               if (["node_modules", ".git", ".gemini", "dist", "build", ".next", ".cache", "out"].includes(file)) {
                 continue;
               }
-              const filePath = path28.join(currentDir, file);
-              const stat = fs30.statSync(filePath);
+              const filePath = path27.join(currentDir, file);
+              const stat = fs29.statSync(filePath);
               if (stat.isDirectory()) {
                 scan(filePath);
               } else {
                 fileList.push({
                   name: flattenString(file),
-                  relativePath: flattenString(path28.relative(process.cwd(), filePath))
+                  relativePath: flattenString(path27.relative(process.cwd(), filePath))
                 });
               }
             }
@@ -24534,11 +24879,11 @@ if (isBundled && !process.execArgv.some((arg) => arg.includes("max-old-space-siz
   const isUpdate = args[0] === "--update";
   const isExport = args[0] === "--export";
   if (isVersion || isHelp || isHelpCommands || isUpdate || isExport) {
-    const fs31 = await import("fs");
-    const path29 = await import("path");
+    const fs30 = await import("fs");
+    const path28 = await import("path");
     const { fileURLToPath: fileURLToPath5 } = await import("url");
-    const packageJsonPath2 = path29.join(path29.dirname(fileURLToPath5(import.meta.url)), "../package.json");
-    const packageJson2 = JSON.parse(fs31.readFileSync(packageJsonPath2, "utf8"));
+    const packageJsonPath2 = path28.join(path28.dirname(fileURLToPath5(import.meta.url)), "../package.json");
+    const packageJson2 = JSON.parse(fs30.readFileSync(packageJsonPath2, "utf8"));
     const versionFluxflow2 = packageJson2.version;
     if (isExport) {
       const subArg = (args[1] || "").toLowerCase();