notoken-core 1.8.0 → 1.8.1

package/dist/automation/discordPatchright.js

@@ -219,14 +219,16 @@ const USER_DATA_DIR = 'C:\\\\temp\\\\notoken-browser-profile';
     console.log('TOKEN_NOT_FOUND');
   }
 
-  // Enable intents
+  // Enable privileged intents (but NOT Code Grant which is switch index 1)
   await page.evaluate(() => window.scrollTo(0, document.body.scrollHeight));
   await page.waitForTimeout(1500);
   await page.locator('text=Privileged Gateway Intents').scrollIntoViewIfNeeded().catch(() => {});
   await page.waitForTimeout(1000);
-  const switches = await page.locator('label[data-react-aria-pressable="true"] input[role="switch"]').all();
+  const allSwitches = await page.locator('input[role="switch"]').all();
   let toggled = 0;
-  for (const sw of switches) {
+  // Skip switches 0 (Public Bot) and 1 (Code Grant) — only toggle intent switches (index 2+)
+  for (let idx = 2; idx < allSwitches.length; idx++) {
+    const sw = allSwitches[idx];
     if (!await sw.isChecked().catch(() => true)) {
       await sw.locator('..').locator('..').first().click({ force: true }).catch(() => {});
       await page.waitForTimeout(500);
@@ -236,6 +238,17 @@ const USER_DATA_DIR = 'C:\\\\temp\\\\notoken-browser-profile';
   await page.click('button:has-text("Save Changes")', { timeout: 3000 }).catch(() => {});
   console.log('INTENTS_ENABLED:' + toggled);
 
+  // Ensure Code Grant is OFF (switch index 1)
+  if (allSwitches.length >= 2) {
+    const codeGrantOn = await allSwitches[1].isChecked().catch(() => false);
+    if (codeGrantOn) {
+      await allSwitches[1].locator('..').click({ force: true }).catch(() => {});
+      await page.waitForTimeout(500);
+      await page.click('button:has-text("Save Changes")', { timeout: 3000 }).catch(() => {});
+      console.log('CODE_GRANT_DISABLED');
+    }
+  }
+
   // Save result
   const result = { token, appId, success: !!token };
   fs.writeFileSync('C:\\\\temp\\\\discord-bot-result.json', JSON.stringify(result));

package/dist/handlers/executor.js

@@ -373,10 +373,83 @@ export async function executeIntent(intent) {
             return `\x1b[31m✗ Discord diagnostics error: ${err.message.split("\n")[0]}\x1b[0m`;
         }
     }
-    // OpenClaw status
+    // OpenClaw status — quick summary or detailed
     if (intent.intent === "openclaw.status") {
+        const isDetailed = /\b(details?|detailed|verbose|full|deep|all|everything)\b/i.test(intent.rawText);
         const diagRemote = environment !== "local" && environment !== "localhost" && hasRealHost(environment);
-        return diagRemote ? await quickConnectivityCheck((cmd) => runRemoteCommand(environment, cmd)) : await quickConnectivityCheck();
+        if (isDetailed) {
+            // Full detailed check (existing behavior)
+            return diagRemote ? await quickConnectivityCheck((cmd) => runRemoteCommand(environment, cmd)) : await quickConnectivityCheck();
+        }
+        // Quick summary — fast, one-line-per-item
+        const cc = { reset: "\x1b[0m", bold: "\x1b[1m", dim: "\x1b[2m", green: "\x1b[32m", yellow: "\x1b[33m", red: "\x1b[31m", cyan: "\x1b[36m" };
+        const lines = [];
+        lines.push(`\n${cc.bold}${cc.cyan}── OpenClaw ──${cc.reset}\n`);
+        // Gateway running?
+        const health = await runLocalCommand("curl -sf http://127.0.0.1:18789/health 2>/dev/null").catch(() => "");
+        const gwUp = health.includes('"ok"');
+        lines.push(`  ${gwUp ? cc.green + "✓" : cc.red + "✗"}${cc.reset} Gateway: ${gwUp ? "running" : "not running"}`);
+        // Environment
+        const { getUserContext } = await import("../utils/userContext.js");
+        const ctx = getUserContext();
+        lines.push(`  ${cc.bold}Env:${cc.reset} ${ctx.isWSL ? "WSL" : ctx.isWindows ? "Windows" : "Linux"} (${ctx.effectiveUser})`);
+        // Current model
+        const ocConfig = await runLocalCommand("cat /root/.openclaw/openclaw.json 2>/dev/null || cat ~/.openclaw/openclaw.json 2>/dev/null").catch(() => "");
+        const modelMatch = ocConfig.match(/"primary"\s*:\s*"([^"]+)"/);
+        if (modelMatch)
+            lines.push(`  ${cc.bold}Model:${cc.reset} ${modelMatch[1]}`);
+        // LLM providers — quick check auth profiles
+        try {
+            const { readFileSync, existsSync } = await import("node:fs");
+            const { getAuthProfilesPath } = await import("../utils/userContext.js");
+            const authPath = getAuthProfilesPath();
+            if (existsSync(authPath)) {
+                const auth = JSON.parse(readFileSync(authPath, "utf-8"));
+                const providers = [];
+                for (const [name, profile] of Object.entries(auth.profiles ?? {})) {
+                    const expires = profile.expires ?? 0;
+                    const hoursLeft = (expires - Date.now()) / 3600000;
+                    const pName = name.split(":")[0];
+                    if (hoursLeft > 0) {
+                        providers.push(`${cc.green}✓${cc.reset} ${pName} (${Math.round(hoursLeft)}h)`);
+                    }
+                    else if (profile.type === "token" || profile.type === "api_key") {
+                        providers.push(`${cc.green}✓${cc.reset} ${pName} (static)`);
+                    }
+                    else if (expires > 0) {
+                        providers.push(`${cc.red}✗${cc.reset} ${pName} (expired)`);
+                    }
+                }
+                if (providers.length > 0) {
+                    lines.push(`  ${cc.bold}LLMs:${cc.reset} ${providers.join("  ")}`);
+                }
+            }
+        }
+        catch { }
+        // Channels — check Discord
+        const discordToken = ocConfig.includes('"discord"') && ocConfig.includes('"token"');
+        if (discordToken) {
+            // Quick check if Discord is connected via logs
+            const recentLog = await runLocalCommand("tail -20 /tmp/openclaw/openclaw-$(date +%Y-%m-%d).log 2>/dev/null").catch(() => "");
+            const discordOk = recentLog.includes("logged in to discord") || recentLog.includes("discord client ready");
+            const discordAwaiting = recentLog.includes("awaiting gateway readiness");
+            if (discordOk) {
+                lines.push(`  ${cc.green}✓${cc.reset} Discord: connected`);
+            }
+            else if (discordAwaiting) {
+                lines.push(`  ${cc.yellow}⏳${cc.reset} Discord: connecting...`);
+            }
+            else {
+                lines.push(`  ${cc.yellow}○${cc.reset} Discord: configured`);
+            }
+        }
+        // Ollama
+        const ollamaUp = await runLocalCommand("curl -sf http://localhost:11434/api/tags 2>/dev/null | head -1").catch(() => "");
+        if (ollamaUp.includes("models")) {
+            lines.push(`  ${cc.green}✓${cc.reset} Ollama: running`);
+        }
+        lines.push(`\n  ${cc.dim}Say "openclaw status details" for full diagnostics${cc.reset}`);
+        return lines.join("\n");
     }
     // OpenClaw diagnose
     if (intent.intent === "openclaw.diagnose") {
@@ -1249,6 +1322,22 @@ expect eof
         return getRandomTip();
     }
     // Notoken status — comprehensive overview
+    // notoken.versions — show current version and check for updates
+    if (intent.intent === "notoken.versions" || intent.intent === "notoken.version") {
+        try {
+            const { checkForUpdate } = await import("../utils/updater.js");
+            const info = await checkForUpdate();
+            if (!info)
+                return `\x1b[36mNoToken\x1b[0m v1.8.0\n\x1b[2mCould not check for updates.\x1b[0m`;
+            if (info.updateAvailable) {
+                return `\x1b[36mNoToken\x1b[0m v${info.current}\n\x1b[33m⬆ Update available: ${info.current} → ${info.latest}\x1b[0m\n\x1b[2m  Run: notoken update  or  /update\x1b[0m`;
+            }
+            return `\x1b[36mNoToken\x1b[0m v${info.current}\n\x1b[32m✓ You're on the latest version.\x1b[0m`;
+        }
+        catch {
+            return `\x1b[36mNoToken\x1b[0m v1.8.0`;
+        }
+    }
     // notoken.jobs — in one-shot mode just say "use interactive mode"
     if (intent.intent === "notoken.jobs") {
         return `\x1b[32m✓\x1b[0m No background tasks (one-shot mode).\n\x1b[2m  Run \x1b[1mnotoken\x1b[0m\x1b[2m for interactive mode with background task support.\x1b[0m`;
@@ -1397,6 +1486,178 @@ expect eof
             }
         }
     }
+    // ── Ollama environment detection — WSL vs Windows host ──
+    // Detects where Ollama is installed and routes commands to the right side.
+    // User can say "on windows" or "on wsl" to override.
+    /**
+     * Run an Ollama command on the right environment.
+     * Detects: WSL local, Windows host, Docker container.
+     * User can override with "on windows" / "on wsl" / "in docker".
+     */
+    async function runOllama(cmd) {
+        const isWSL = (await runLocalCommand("grep -qi microsoft /proc/version 2>/dev/null && echo wsl || echo native").catch(() => "native")).trim() === "wsl";
+        const raw = intent.rawText.toLowerCase();
+        // Explicit target from user
+        const forceWindows = /\b(on\s+)?windows\b|\bhost\b/i.test(raw);
+        const forceWSL = /\b(on\s+|in\s+)?wsl\b|\blinux\b/i.test(raw);
+        const forceDocker = /\b(in\s+)?docker\b|\bcontainer\b/i.test(raw);
+        // Default: run on current environment (where notoken is running)
+        // Only check other environments if user explicitly asks or local fails
+        const catchErr = (e) => { const err = e; return err.stdout ?? err.stderr ?? err.message ?? "failed"; };
+        // Explicit overrides first
+        if (forceDocker) {
+            const container = (await runLocalCommand("docker ps --format '{{.Names}}' 2>/dev/null | grep -i ollama").catch(() => "")).trim().split("\n")[0];
+            if (container) {
+                console.log(`\x1b[2m[Ollama in Docker: ${container}]\x1b[0m`);
+                return runLocalCommand(`docker exec ${container} ollama ${cmd} 2>&1`, 300_000).catch(catchErr);
+            }
+            return "No Ollama Docker container found. Start one: docker run -d --name ollama ollama/ollama";
+        }
+        if (forceWindows && isWSL) {
+            console.log(`\x1b[2m[Ollama on Windows host]\x1b[0m`);
+            return runLocalCommand(`cmd.exe /c 'ollama ${cmd}' 2>&1`, 300_000).catch(catchErr);
+        }
+        if (forceWSL || !isWSL) {
+            // Current env is WSL or native Linux — run directly
+            return runLocalCommand(`ollama ${cmd} 2>&1`, 300_000).catch(catchErr);
+        }
+        // Default for WSL: try local first, then Windows host
+        const localResult = await runLocalCommand(`ollama ${cmd} 2>&1`, 300_000).catch(() => "");
+        if (localResult && !localResult.includes("not found") && !localResult.includes("command not found")) {
+            return localResult;
+        }
+        // Local failed — try Windows host silently
+        const winResult = await runLocalCommand(`cmd.exe /c 'ollama ${cmd}' 2>&1`, 300_000).catch(() => "");
+        if (winResult && !winResult.includes("not recognized")) {
+            console.log(`\x1b[2m[Using Windows host Ollama]\x1b[0m`);
+            return winResult;
+        }
+        return "Ollama not found. Install: curl -fsSL https://ollama.com/install.sh | sh";
+    }
+    // Ollama status — quick check if running + version
+    if (intent.intent === "ollama.status") {
+        const cc = { reset: "\x1b[0m", bold: "\x1b[1m", dim: "\x1b[2m", green: "\x1b[32m", yellow: "\x1b[33m", red: "\x1b[31m", cyan: "\x1b[36m" };
+        const lines = [];
+        lines.push(`\n${cc.bold}${cc.cyan}── Ollama ──${cc.reset}\n`);
+        // Check if installed
+        const version = await runLocalCommand("ollama --version 2>/dev/null").catch(() => "");
+        if (!version) {
+            lines.push(`  ${cc.red}✗${cc.reset} Ollama not installed`);
+            lines.push(`  ${cc.dim}Install: curl -fsSL https://ollama.com/install.sh | sh${cc.reset}`);
+            return lines.join("\n");
+        }
+        lines.push(`  ${cc.green}✓${cc.reset} Installed: ${version.trim()}`);
+        // Check if running
+        const tags = await runLocalCommand("curl -sf http://127.0.0.1:11434/api/tags 2>/dev/null").catch(() => "");
+        if (tags.includes("models")) {
+            const models = JSON.parse(tags).models ?? [];
+            lines.push(`  ${cc.green}✓${cc.reset} Running on port 11434`);
+            lines.push(`  ${cc.bold}Models:${cc.reset} ${models.length} installed`);
+            for (const m of models.slice(0, 5)) {
+                const size = (m.size / 1024 / 1024 / 1024).toFixed(1);
+                lines.push(`    ${cc.green}•${cc.reset} ${m.name} (${size}GB)`);
+            }
+        }
+        else {
+            lines.push(`  ${cc.yellow}○${cc.reset} Not running`);
+            lines.push(`  ${cc.dim}Start: "start ollama"${cc.reset}`);
+        }
+        // GPU
+        const gpu = await runLocalCommand("nvidia-smi --query-gpu=name,memory.total --format=csv,noheader,nounits 2>/dev/null").catch(() => "");
+        if (gpu.trim()) {
+            const [name, mem] = gpu.trim().split(",").map(s => s.trim());
+            lines.push(`  ${cc.bold}GPU:${cc.reset} ${name} (${mem}MB VRAM)`);
+        }
+        lines.push(`\n  ${cc.dim}Say: "ollama models" for details, "ollama pull llama3.2" to download${cc.reset}`);
+        return lines.join("\n");
+    }
+    // Ollama uninstall — platform-aware removal
+    if (intent.intent === "ollama.uninstall") {
+        const cc = { reset: "\x1b[0m", bold: "\x1b[1m", dim: "\x1b[2m", green: "\x1b[32m", yellow: "\x1b[33m", red: "\x1b[31m", cyan: "\x1b[36m" };
+        const isWSL = (await runLocalCommand("grep -qi microsoft /proc/version 2>/dev/null && echo wsl || echo native").catch(() => "native")).trim() === "wsl";
+        const isWin = process.platform === "win32";
+        const isMac = process.platform === "darwin";
+        const removeModels = /\b(completely|everything|and models|all data)\b/i.test(intent.rawText);
+        const lines = [];
+        lines.push(`\n${cc.bold}${cc.cyan}── Uninstall Ollama ──${cc.reset}\n`);
+        // Check what's installed
+        const version = await runLocalCommand("ollama --version 2>/dev/null").catch(() => "");
+        const models = await runLocalCommand("curl -sf http://127.0.0.1:11434/api/tags 2>/dev/null").catch(() => "");
+        let modelCount = 0;
+        let modelSize = "unknown";
+        try {
+            const parsed = JSON.parse(models);
+            modelCount = parsed.models?.length ?? 0;
+            const totalBytes = parsed.models?.reduce((sum, m) => sum + (m.size ?? 0), 0) ?? 0;
+            modelSize = (totalBytes / 1024 / 1024 / 1024).toFixed(1) + "GB";
+        }
+        catch { }
+        if (!version) {
+            return `${cc.dim}Ollama doesn't appear to be installed.${cc.reset}`;
+        }
+        lines.push(`  ${cc.bold}Installed:${cc.reset} ${version.trim()}`);
+        if (modelCount > 0)
+            lines.push(`  ${cc.bold}Models:${cc.reset} ${modelCount} installed (${modelSize})`);
+        // Stop the service first
+        lines.push(`\n  ${cc.dim}Stopping Ollama service...${cc.reset}`);
+        await runLocalCommand("systemctl stop ollama 2>/dev/null").catch(() => "");
+        await runLocalCommand("pkill -f ollama 2>/dev/null").catch(() => "");
+        if (isWSL || (!isWin && !isMac)) {
+            // Linux / WSL
+            lines.push(`  ${cc.bold}Platform:${cc.reset} ${isWSL ? "WSL" : "Linux"}`);
+            // Remove binary
+            await runLocalCommand("sudo rm -f /usr/local/bin/ollama 2>/dev/null").catch(() => "");
+            lines.push(`  ${cc.green}✓${cc.reset} Removed /usr/local/bin/ollama`);
+            // Remove systemd service
+            await runLocalCommand("sudo systemctl disable ollama 2>/dev/null").catch(() => "");
+            await runLocalCommand("sudo rm -f /etc/systemd/system/ollama.service 2>/dev/null").catch(() => "");
+            await runLocalCommand("sudo systemctl daemon-reload 2>/dev/null").catch(() => "");
+            lines.push(`  ${cc.green}✓${cc.reset} Removed systemd service`);
+            // Remove user
+            await runLocalCommand("sudo userdel -r ollama 2>/dev/null").catch(() => "");
+            await runLocalCommand("sudo groupdel ollama 2>/dev/null").catch(() => "");
+            lines.push(`  ${cc.green}✓${cc.reset} Removed ollama user/group`);
+            // Remove models if requested
+            if (removeModels) {
+                const modelDirs = ["/usr/share/ollama", `${process.env.HOME}/.ollama`, process.env.OLLAMA_MODELS].filter(Boolean);
+                for (const dir of modelDirs) {
+                    if (dir) {
+                        await runLocalCommand(`sudo rm -rf "${dir}" 2>/dev/null`).catch(() => "");
+                        lines.push(`  ${cc.green}✓${cc.reset} Removed ${dir}`);
+                    }
+                }
+            }
+            else {
+                lines.push(`\n  ${cc.yellow}⚠${cc.reset} Models kept. To remove: "uninstall ollama completely"`);
+                const modelDir = process.env.OLLAMA_MODELS ?? "/usr/share/ollama/.ollama/models";
+                lines.push(`  ${cc.dim}Model directory: ${modelDir}${cc.reset}`);
+            }
+            // Check Windows side too if in WSL
+            if (isWSL) {
+                const winOllama = await runLocalCommand("cmd.exe /c 'where ollama' 2>/dev/null").catch(() => "");
+                if (winOllama.includes("ollama")) {
+                    lines.push(`\n  ${cc.yellow}⚠${cc.reset} Ollama also installed on Windows host.`);
+                    lines.push(`  ${cc.dim}To remove from Windows: Settings → Apps → Ollama → Uninstall${cc.reset}`);
+                }
+            }
+        }
+        else if (isMac) {
+            lines.push(`  ${cc.bold}Platform:${cc.reset} macOS`);
+            await runLocalCommand("brew uninstall ollama 2>/dev/null || rm -f /usr/local/bin/ollama").catch(() => "");
+            lines.push(`  ${cc.green}✓${cc.reset} Removed Ollama`);
+            if (removeModels) {
+                await runLocalCommand(`rm -rf ${process.env.HOME}/.ollama 2>/dev/null`).catch(() => "");
+                lines.push(`  ${cc.green}✓${cc.reset} Removed ~/.ollama`);
+            }
+        }
+        else if (isWin) {
+            lines.push(`  ${cc.bold}Platform:${cc.reset} Windows`);
+            lines.push(`  ${cc.dim}Use Settings → Apps → Ollama → Uninstall${cc.reset}`);
+            lines.push(`  ${cc.dim}Or: winget uninstall ollama${cc.reset}`);
+        }
+        lines.push(`\n  ${cc.green}✓${cc.reset} ${cc.bold}Ollama uninstalled.${cc.reset}`);
+        return lines.join("\n");
+    }
     // Ollama model management
     if (intent.intent === "ollama.models" || intent.intent === "ollama.list") {
         const cc = { reset: "\x1b[0m", bold: "\x1b[1m", dim: "\x1b[2m", green: "\x1b[32m", yellow: "\x1b[33m", red: "\x1b[31m", cyan: "\x1b[36m" };
@@ -1405,8 +1666,8 @@ expect eof
         const totalRAMGB = Math.round(parseInt(ramOut) / 1073741824);
         const freeRamOut = await runLocalCommand("free -b | grep Mem | awk '{print $7}'").catch(() => "0");
         const freeRAMGB = Math.round(parseInt(freeRamOut) / 1073741824);
-        // Get installed models
-        const installed = await runLocalCommand("ollama list 2>&1").catch(() => "Ollama not running");
+        // Get installed models — checks both WSL and Windows
+        const installed = await runOllama("list").catch(() => "Ollama not running");
         const lines = [];
         lines.push(`\n${cc.bold}${cc.cyan}── Ollama Models ──${cc.reset}\n`);
         lines.push(`  ${cc.bold}System:${cc.reset} ${totalRAMGB}GB RAM (${freeRAMGB}GB available)\n`);
@@ -1526,7 +1787,7 @@ expect eof
         }
         console.log(lines.join("\n"));
         console.log(`\n\x1b[2mPulling ${model}... this may take a few minutes.\x1b[0m`);
-        result = await withSpinner(`Pulling ${model}...`, () => runLocalCommand(`ollama pull ${model} 2>&1`, 300_000));
+        result = await withSpinner(`Pulling ${model}...`, () => runOllama(`pull ${model}`));
         return result;
     }
     // Ollama storage — check location & disk usage
@@ -1762,7 +2023,7 @@ expect eof
         const model = fields.model ?? intent.rawText.match(/(?:remove|delete|rm)\s+(?:ollama\s+(?:model\s+)?)?(\S+)/i)?.[1];
         if (!model)
             return `\x1b[33mUsage: ollama remove <model>\x1b[0m\n\x1b[2m  Example: "ollama remove llama3.2"\x1b[0m`;
-        result = await withSpinner(`Removing ${model}...`, () => runLocalCommand(`ollama rm ${model} 2>&1`, 30_000));
+        result = await withSpinner(`Removing ${model}...`, () => runOllama(`rm ${model}`));
         return result.includes("deleted") ? `\x1b[32m✓\x1b[0m Model ${model} removed.` : result;
     }
     // Codex CLI handlers
@@ -3104,6 +3365,87 @@ expect eof
         }
         return "";
     }
+    // File organization — uses LLM to categorize and move files
+    if (intent.intent === "files.organize") {
+        const cc = { reset: "\x1b[0m", bold: "\x1b[1m", dim: "\x1b[2m", green: "\x1b[32m", yellow: "\x1b[33m", red: "\x1b[31m", cyan: "\x1b[36m" };
+        const cwd = process.cwd();
+        const fileList = await runLocalCommand(`ls -1 "${cwd}" 2>/dev/null`).catch(() => "");
+        const fileCount = fileList.trim().split("\n").filter(Boolean).length;
+        if (fileCount === 0)
+            return `${cc.yellow}⚠${cc.reset} No files in current directory.`;
+        if (fileCount < 3)
+            return `${cc.dim}Only ${fileCount} files — not much to organize.${cc.reset}`;
+        console.log(`${cc.cyan}Analyzing ${fileCount} files in ${cwd}...${cc.reset}`);
+        try {
+            const ollamaModel = process.env.NOTOKEN_OLLAMA_MODEL ?? "llama3.2";
+            const prompt = `Files in folder:\n${fileList}\nGive me ONLY shell commands to organize these into directories. No explanation.\nStart with mkdir -p commands, then mv commands. Always include an Uncategorized folder for anything unclear.\nExample:\nmkdir -p photos videos documents Uncategorized\nmv photo.jpg photos/\nmv unknown.dat Uncategorized/\n\nOutput ONLY commands:`;
+            const controller = new AbortController();
+            const timeout = setTimeout(() => controller.abort(), 120_000);
+            const resp = await fetch("http://127.0.0.1:11434/api/generate", {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                signal: controller.signal,
+                body: JSON.stringify({ model: ollamaModel, prompt, stream: false, options: { temperature: 0.1, num_predict: 4096 } }),
+            });
+            clearTimeout(timeout);
+            const data = await resp.json();
+            const commands = (data.response ?? "").split("\n").map((l) => l.trim()).filter((l) => l.startsWith("mkdir") || l.startsWith("mv "));
+            const mkdirs = commands.filter((c) => c.startsWith("mkdir"));
+            const mvs = commands.filter((c) => c.startsWith("mv"));
+            if (commands.length === 0)
+                return `${cc.yellow}⚠${cc.reset} LLM couldn't generate organization commands. Try being more specific.`;
+            const dirs = mkdirs.join(" ").match(/[\w-]+/g)?.filter((d) => d !== "mkdir" && d !== "-p") ?? [];
+            const lines = [`\n${cc.bold}${cc.cyan}── File Organization Plan ──${cc.reset}\n`];
+            lines.push(`  ${cc.bold}${fileCount} files${cc.reset} → ${cc.bold}${dirs.length} directories${cc.reset}\n`);
+            lines.push(`  ${cc.bold}Directories:${cc.reset} ${dirs.map((d) => `📁 ${d}`).join("  ")}\n`);
+            lines.push(`  ${cc.bold}Sample moves:${cc.reset}`);
+            for (const mv of mvs.slice(0, 10)) {
+                const parts = mv.match(/mv\s+(\S+)\s+(\S+)/);
+                if (parts)
+                    lines.push(`    ${cc.dim}${parts[1]}${cc.reset} → ${cc.cyan}${parts[2]}${cc.reset}`);
+            }
+            if (mvs.length > 10)
+                lines.push(`    ${cc.dim}... and ${mvs.length - 10} more moves${cc.reset}`);
+            console.log(lines.join("\n"));
+            suggestAction({ action: `cd "${cwd}" && ${commands.join(" && ")}`, description: `Organize ${fileCount} files into ${dirs.length} folders`, type: "command" });
+            return `\n  ${cc.bold}Execute this plan?${cc.reset} Say "yes" to proceed, or "cancel" to abort.`;
+        }
+        catch (err) {
+            return `${cc.red}✗${cc.reset} LLM error: ${err.message?.substring(0, 100)}\n${cc.dim}Make sure Ollama is running.${cc.reset}`;
+        }
+    }
+    // File placement — suggest where a file should go
+    if (intent.intent === "files.place") {
+        const cc = { reset: "\x1b[0m", bold: "\x1b[1m", dim: "\x1b[2m", green: "\x1b[32m", cyan: "\x1b[36m" };
+        const cwd = process.cwd();
+        const dirStructure = await runLocalCommand(`find "${cwd}" -maxdepth 2 -type d 2>/dev/null | head -30`).catch(() => "");
+        const fileMatch = intent.rawText.match(/(?:put|place|file)\s+(\S+\.\w+)/i) ?? intent.rawText.match(/(\S+\.\w{2,4})$/);
+        const fileName = fileMatch?.[1] ?? "this file";
+        try {
+            const ollamaModel = process.env.NOTOKEN_OLLAMA_MODEL ?? "llama3.2";
+            const prompt = `My directory structure:\n${dirStructure}\n\nWhere should I put "${fileName}"?\n\nComplete this JSON:\n\`\`\`json\n{"file": "${fileName}", "destination": "FILL_best_directory", "reason": "FILL_why", "command": "mv ${fileName} FILL/"}\n\`\`\`\nOutput only JSON:`;
+            const controller = new AbortController();
+            const timeout = setTimeout(() => controller.abort(), 60_000);
+            const resp = await fetch("http://127.0.0.1:11434/api/generate", {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                signal: controller.signal,
+                body: JSON.stringify({ model: ollamaModel, prompt, stream: false, options: { temperature: 0.1, num_predict: 200 } }),
+            });
+            clearTimeout(timeout);
+            const data = await resp.json();
+            const jsonMatch = (data.response ?? "").match(/\{[\s\S]*\}/);
+            if (jsonMatch) {
+                const parsed = JSON.parse(jsonMatch[0]);
+                suggestAction({ action: parsed.command, description: `Move ${fileName} to ${parsed.destination}`, type: "command" });
+                return `\n  ${cc.bold}${parsed.file}${cc.reset} → ${cc.cyan}${parsed.destination}${cc.reset}\n  ${cc.dim}${parsed.reason}${cc.reset}\n\n  ${cc.dim}Say "yes" to move it.${cc.reset}`;
+            }
+            return `${cc.dim}${(data.response ?? "").substring(0, 200)}${cc.reset}`;
+        }
+        catch (err) {
+            return `${cc.dim}Could not determine placement: ${err.message?.substring(0, 80)}${cc.reset}`;
+        }
+    }
     // Casual chat responses — loaded from config/chat-responses.json
     if (intent.intent.startsWith("chat.")) {
         const cc = { reset: "\x1b[0m", bold: "\x1b[1m", dim: "\x1b[2m", green: "\x1b[32m", cyan: "\x1b[36m", yellow: "\x1b[33m" };
@@ -3185,6 +3527,99 @@ expect eof
         // Fallback if no JSON responses loaded
         return `${cc.cyan}I'm NoToken.${cc.reset} Type "help" to see what I can do.`;
     }
+    // ── Tool uninstall ──
+    if (intent.intent === "tool.uninstall") {
+        let toolName = resolveToolName(intent.rawText) || (fields.tool ?? "").toLowerCase();
+        toolName = TOOL_ALIASES[toolName] ?? toolName;
+        const cc = { reset: "\x1b[0m", bold: "\x1b[1m", dim: "\x1b[2m", green: "\x1b[32m", yellow: "\x1b[33m", red: "\x1b[31m", cyan: "\x1b[36m" };
+        if (!toolName || !INSTALL_INFO[toolName]) {
+            return `${cc.red}✗ Unknown tool: "${toolName || "?"}"\x1b[0m\n\n  ${cc.dim}Available: ${Object.keys(INSTALL_INFO).join(", ")}${cc.reset}`;
+        }
+        const info = INSTALL_INFO[toolName];
+        // Check if installed
+        const existing = await runLocalCommand(info.check + " 2>/dev/null").catch(() => "");
+        if (!existing) {
+            return `${cc.dim}${info.name} is not installed — nothing to uninstall.${cc.reset}`;
+        }
+        console.log(`\n${cc.cyan}Uninstalling ${info.name}...${cc.reset}`);
+        // Determine uninstall command
+        let uninstallCmd = "";
+        if (info.install.startsWith("npm ")) {
+            // npm-based tools — npm uninstall -g
+            const pkg = info.install.replace("npm install -g ", "");
+            uninstallCmd = `npm uninstall -g ${pkg}`;
+        }
+        else if (toolName === "ollama") {
+            if (process.platform === "win32") {
+                uninstallCmd = `powershell -Command "Get-Process ollama -ErrorAction SilentlyContinue | Stop-Process -Force" 2>/dev/null; rm -rf "$(cygpath '$LOCALAPPDATA')/Programs/Ollama" 2>/dev/null; rm -rf "$(cygpath '$LOCALAPPDATA')/Ollama" 2>/dev/null`;
+            }
+            else {
+                uninstallCmd = "sudo systemctl stop ollama 2>/dev/null; sudo rm -f /usr/local/bin/ollama; sudo rm -rf /usr/share/ollama";
+            }
+        }
+        else if (toolName === "docker") {
+            uninstallCmd = process.platform === "win32"
+                ? `powershell -Command "echo 'Uninstall Docker Desktop from Settings > Apps'"`
+                : "sudo apt-get remove -y docker-ce docker-ce-cli containerd.io 2>/dev/null || sudo dnf remove -y docker-ce docker-ce-cli containerd.io 2>/dev/null";
+        }
+        else {
+            uninstallCmd = `echo '${info.name} — uninstall manually'`;
+        }
+        // For openclaw — also stop the gateway first
+        if (toolName === "openclaw") {
+            if (process.platform === "win32") {
+                await runLocalCommand(`powershell -Command "Get-WmiObject Win32_Process -Filter \\"Name='node.exe'\\" | Where-Object { \\$_.CommandLine -match 'openclaw.*gateway' } | ForEach-Object { \\$_.Terminate() }" 2>/dev/null`).catch(() => "");
+            }
+            else {
+                await runLocalCommand("pkill -f openclaw-gateway 2>/dev/null").catch(() => "");
+            }
+            await runLocalCommand("sleep 2").catch(() => { });
+            console.log(`${cc.dim}Gateway stopped${cc.reset}`);
+        }
+        try {
+            result = await withSpinner(`Uninstalling ${info.name}...`, () => runLocalCommand(uninstallCmd + " 2>&1", 120_000));
+            // Verify removal
+            const stillExists = await runLocalCommand(info.check + " 2>/dev/null").catch(() => "");
+            if (!stillExists) {
+                return `${cc.green}✓${cc.reset} ${info.name} uninstalled successfully.`;
+            }
+            return `${cc.yellow}⚠${cc.reset} Uninstall ran but ${info.name} may still be present.\n  ${cc.dim}Try manually: ${uninstallCmd}${cc.reset}`;
+        }
+        catch (err) {
+            return `${cc.red}✗ Uninstall failed:${cc.reset} ${err.message.split("\n")[0]}\n  ${cc.dim}Try manually: ${uninstallCmd}${cc.reset}`;
+        }
+    }
+    // ── Tool reinstall (uninstall + install) ──
+    if (intent.intent === "tool.reinstall") {
+        let toolName = resolveToolName(intent.rawText) || (fields.tool ?? "").toLowerCase();
+        toolName = TOOL_ALIASES[toolName] ?? toolName;
+        const cc = { reset: "\x1b[0m", bold: "\x1b[1m", dim: "\x1b[2m", green: "\x1b[32m", yellow: "\x1b[33m", red: "\x1b[31m", cyan: "\x1b[36m" };
+        if (!toolName || !INSTALL_INFO[toolName]) {
+            return `${cc.red}✗ Unknown tool: "${toolName || "?"}"\x1b[0m\n\n  ${cc.dim}Available: ${Object.keys(INSTALL_INFO).join(", ")}${cc.reset}`;
+        }
+        const info = INSTALL_INFO[toolName];
+        console.log(`\n${cc.cyan}Reinstalling ${info.name}...${cc.reset}\n`);
+        // Uninstall first
+        if (info.install.startsWith("npm ")) {
+            const pkg = info.install.replace("npm install -g ", "");
+            console.log(`${cc.dim}Uninstalling...${cc.reset}`);
+            // Stop openclaw gateway if reinstalling openclaw
+            if (toolName === "openclaw") {
+                if (process.platform === "win32") {
+                    await runLocalCommand(`powershell -Command "Get-WmiObject Win32_Process -Filter \\"Name='node.exe'\\" | Where-Object { \\$_.CommandLine -match 'openclaw.*gateway' } | ForEach-Object { \\$_.Terminate() }" 2>/dev/null`).catch(() => "");
+                }
+                else {
+                    await runLocalCommand("pkill -f openclaw-gateway 2>/dev/null").catch(() => "");
+                }
+                await runLocalCommand("sleep 2").catch(() => { });
+            }
+            await withSpinner(`Uninstalling ${info.name}...`, () => runLocalCommand(`npm uninstall -g ${pkg} 2>&1`, 60_000)).catch(() => "");
+        }
+        // Install fresh — reuse the tool.install intent
+        console.log(`${cc.dim}Installing fresh...${cc.reset}`);
+        const fakeIntent = { ...intent, intent: "tool.install" };
+        return executeIntent(fakeIntent);
+    }
     // Entity define/list
     if (intent.intent === "entity.define")
         return learnEntity(intent.rawText) ?? "Could not understand. Try: 'metroplex is 66.94.115.165'";

package/dist/index.d.ts

@@ -16,13 +16,16 @@ export { findSimilarIntents, phraseSimilarity, expandWithCooccurrences } from ".
 export { loadKnowledgeGraph, saveKnowledgeGraph, addEntity, addRelation, getEntity, getRelated, resolveReference, resolveCandidates, inferIntent, queryGraph, rebuildGraph, learnFromExecution, flushGraph } from "./nlp/knowledgeGraph.js";
 export { expandQuery, findCluster, suggestIntents, clusterWords } from "./nlp/conceptExpansion.js";
 export { analyzeUncertainty, getUncoveredSpans } from "./nlp/uncertainty.js";
-export { llmFallback, isLLMConfigured, getLLMBackend, formatLLMFallback } from "./nlp/llmFallback.js";
+export { llmFallback, llmMultiTurn, isLLMConfigured, getLLMBackend, formatLLMFallback, addLLMContext, clearLLMContext } from "./nlp/llmFallback.js";
 export { suggestEntityCorrection, correctEntities, resolveDescription, resetEntityVocab } from "./nlp/entitySpellCorrect.js";
 export { recordOutcome, getMultiplier, calibrateVotes, recordCorrection, getCalibrationStats, flushCalibration } from "./nlp/confidenceCalibrator.js";
 export { detectBatch, expandBatch, expandEnvironmentBatch } from "./nlp/batchParser.js";
 export { getCurrentTopic, suggestFollowups, getTopicDefault } from "./conversation/topicTracker.js";
 export { progressReporter, reportProgress, reportStep } from "./utils/progressReporter.js";
 export { loadHistory as loadCommandHistory, addToHistory, searchHistory as searchCommandHistory, getRecentCommands, getReadlineHistory } from "./utils/commandHistory.js";
+export { getUserContext, findFreshestClaudeToken, detectUserMismatch, getAuthProfilesPath, resetUserContext } from "./utils/userContext.js";
+export { parseOpenclawModels, parseOpenclawStatus, parseOpenclawDeepStatus } from "./utils/openclawDiag.js";
+export { parseLogLine, analyzeLogs, formatLogAnalysis } from "./utils/openclawLogParser.js";
 export { recordCommand, getAchievements, getUsageStats, flushStats } from "./utils/achievements.js";
 export { teachCommand, getLearnedCommand, listLearnedCommands, forgetCommand, parseTeachStatement } from "./utils/teachMode.js";
 export { executeIntent, getRandomTip } from "./handlers/executor.js";

package/dist/index.js

@@ -17,7 +17,7 @@ export { findSimilarIntents, phraseSimilarity, expandWithCooccurrences } from ".
 export { loadKnowledgeGraph, saveKnowledgeGraph, addEntity, addRelation, getEntity, getRelated, resolveReference, resolveCandidates, inferIntent, queryGraph, rebuildGraph, learnFromExecution, flushGraph } from "./nlp/knowledgeGraph.js";
 export { expandQuery, findCluster, suggestIntents, clusterWords } from "./nlp/conceptExpansion.js";
 export { analyzeUncertainty, getUncoveredSpans } from "./nlp/uncertainty.js";
-export { llmFallback, isLLMConfigured, getLLMBackend, formatLLMFallback } from "./nlp/llmFallback.js";
+export { llmFallback, llmMultiTurn, isLLMConfigured, getLLMBackend, formatLLMFallback, addLLMContext, clearLLMContext } from "./nlp/llmFallback.js";
 export { suggestEntityCorrection, correctEntities, resolveDescription, resetEntityVocab } from "./nlp/entitySpellCorrect.js";
 export { recordOutcome, getMultiplier, calibrateVotes, recordCorrection, getCalibrationStats, flushCalibration } from "./nlp/confidenceCalibrator.js";
 export { detectBatch, expandBatch, expandEnvironmentBatch } from "./nlp/batchParser.js";
@@ -25,6 +25,10 @@ export { getCurrentTopic, suggestFollowups, getTopicDefault } from "./conversati
 // ── Progress & History ──
 export { progressReporter, reportProgress, reportStep } from "./utils/progressReporter.js";
 export { loadHistory as loadCommandHistory, addToHistory, searchHistory as searchCommandHistory, getRecentCommands, getReadlineHistory } from "./utils/commandHistory.js";
+// ── User Context & OpenClaw Parsing ──
+export { getUserContext, findFreshestClaudeToken, detectUserMismatch, getAuthProfilesPath, resetUserContext } from "./utils/userContext.js";
+export { parseOpenclawModels, parseOpenclawStatus, parseOpenclawDeepStatus } from "./utils/openclawDiag.js";
+export { parseLogLine, analyzeLogs, formatLogAnalysis } from "./utils/openclawLogParser.js";
 // ── Achievements & Teach ──
 export { recordCommand, getAchievements, getUsageStats, flushStats } from "./utils/achievements.js";
 export { teachCommand, getLearnedCommand, listLearnedCommands, forgetCommand, parseTeachStatement } from "./utils/teachMode.js";

package/dist/nlp/llmFallback.d.ts

@@ -22,8 +22,27 @@ export interface LLMFallbackResult {
         intent?: string;
         command?: string;
     }>;
+    /** Raw shell commands to run if no intent matches */
+    shellCommands?: string[];
+    /** Questions to ask the user for clarification */
     missingInfo?: string[];
+    /** Commands to run first to gather info before answering (multi-turn) */
+    gatherCommands?: Array<{
+        command: string;
+        purpose: string;
+    }>;
+    /** Whether the LLM needs more info from command outputs before it can answer */
+    needsMoreInfo?: boolean;
 }
+/** Add a turn to the LLM conversation for multi-turn context */
+export declare function addLLMContext(role: "user" | "assistant", content: string): void;
+/** Clear LLM conversation when topic changes */
+export declare function clearLLMContext(): void;
+/** Get conversation for context in multi-turn */
+export declare function getLLMContext(): Array<{
+    role: "user" | "assistant";
+    content: string;
+}>;
 /**
  * Check if any LLM is configured.
  */
@@ -47,6 +66,34 @@ export declare function llmFallback(rawText: string, context: {
         type: string;
     }>;
     uncertainTokens?: string[];
+    nearMisses?: Array<{
+        intent: string;
+        score: number;
+        source: string;
+    }>;
+}): Promise<LLMFallbackResult | null>;
+/**
+ * Multi-turn LLM disambiguation.
+ *
+ * 1. Ask the LLM what to do
+ * 2. If it needs more info → run gatherCommands → feed results back
+ * 3. Repeat up to maxTurns times
+ * 4. Return the final result
+ */
+export declare function llmMultiTurn(rawText: string, context: {
+    recentIntents?: string[];
+    knownEntities?: Array<{
+        entity: string;
+        type: string;
+    }>;
+    nearMisses?: Array<{
+        intent: string;
+        score: number;
+        source: string;
+    }>;
+}, options?: {
+    maxTurns?: number;
+    onProgress?: (msg: string) => void;
 }): Promise<LLMFallbackResult | null>;
 /**
  * Check if Ollama is installed (not just running).