cc-claw 0.22.7 → 0.23.0

package/dist/cli.js

@@ -33,7 +33,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = true ? "0.22.7" : (() => {
+    VERSION = true ? "0.23.0" : (() => {
       try {
         return JSON.parse(readFileSync(join(process.cwd(), "package.json"), "utf-8")).version ?? "unknown";
       } catch {
@@ -11793,8 +11793,8 @@ var init_memory = __esm({
           return jsonResponse(res, { success: deleted, mode: "id" });
         }
         if (body.keyword) {
-          const { forgetMemory: forgetMemory3 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
-          const count = forgetMemory3(body.keyword);
+          const { forgetMemory: forgetMemory4 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+          const count = forgetMemory4(body.keyword);
           return jsonResponse(res, { success: true, count, mode: "keyword" });
         }
         jsonResponse(res, { error: "Either 'keyword' or 'memoryId' is required" }, 400);
@@ -12189,8 +12189,8 @@ var init_config = __esm({
     handleModelSet = async (req, res) => {
       try {
         const body = JSON.parse(await readBody(req));
-        const { setModel: setModel4, clearThinkingLevel: clearThinkingLevel4, clearSession: clearSession3 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
-        setModel4(body.chatId, body.model);
+        const { setModel: setModel5, clearThinkingLevel: clearThinkingLevel4, clearSession: clearSession3 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+        setModel5(body.chatId, body.model);
         clearThinkingLevel4(body.chatId);
         clearSession3(body.chatId);
         logActivity(getDb(), { chatId: body.chatId, source: "cli", eventType: "config_changed", summary: `Model set to ${body.model}`, detail: { field: "model", value: body.model } });
@@ -12202,8 +12202,8 @@ var init_config = __esm({
     handleThinkingSet = async (req, res) => {
       try {
         const body = JSON.parse(await readBody(req));
-        const { setThinkingLevel: setThinkingLevel4 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
-        setThinkingLevel4(body.chatId, body.level);
+        const { setThinkingLevel: setThinkingLevel5 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+        setThinkingLevel5(body.chatId, body.level);
         logActivity(getDb(), { chatId: body.chatId, source: "cli", eventType: "config_changed", summary: `Thinking set to ${body.level}`, detail: { field: "thinking", value: body.level } });
         jsonResponse(res, { success: true });
       } catch (err) {
@@ -12244,8 +12244,8 @@ var init_config = __esm({
     handlePermissionsSet = async (req, res) => {
       try {
         const body = JSON.parse(await readBody(req));
-        const { setMode: setMode4 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
-        setMode4(body.chatId, body.mode);
+        const { setMode: setMode5 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+        setMode5(body.chatId, body.mode);
         logActivity(getDb(), { chatId: body.chatId, source: "cli", eventType: "config_changed", summary: `Permissions set to ${body.mode}`, detail: { field: "permissions", value: body.mode } });
         jsonResponse(res, { success: true });
       } catch (err) {
@@ -12255,12 +12255,12 @@ var init_config = __esm({
     handleToolsToggle = async (req, res) => {
       try {
         const body = JSON.parse(await readBody(req));
-        const { toggleTool: toggleTool5 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+        const { toggleTool: toggleTool6 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
         if (body.enabled !== void 0) {
           const db3 = getDb();
           db3.prepare("INSERT OR REPLACE INTO chat_tools (chat_id, tool, enabled) VALUES (?, ?, ?)").run(body.chatId, body.tool, body.enabled ? 1 : 0);
         } else {
-          toggleTool5(body.chatId, body.tool);
+          toggleTool6(body.chatId, body.tool);
         }
         jsonResponse(res, { success: true });
       } catch (err) {
@@ -12270,8 +12270,8 @@ var init_config = __esm({
     handleToolsReset = async (req, res) => {
       try {
         const body = JSON.parse(await readBody(req));
-        const { resetTools: resetTools4 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
-        resetTools4(body.chatId);
+        const { resetTools: resetTools5 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+        resetTools5(body.chatId);
         jsonResponse(res, { success: true });
       } catch (err) {
         jsonResponse(res, { error: errorMessage(err) }, 400);
@@ -12280,8 +12280,8 @@ var init_config = __esm({
     handleVerboseSet = async (req, res) => {
       try {
         const body = JSON.parse(await readBody(req));
-        const { setVerboseLevel: setVerboseLevel4 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
-        setVerboseLevel4(body.chatId, body.level);
+        const { setVerboseLevel: setVerboseLevel5 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+        setVerboseLevel5(body.chatId, body.level);
         jsonResponse(res, { success: true });
       } catch (err) {
         jsonResponse(res, { error: errorMessage(err) }, 400);
@@ -12322,8 +12322,8 @@ var init_config = __esm({
     handleHeartbeatSet = async (req, res) => {
       try {
         const body = JSON.parse(await readBody(req));
-        const { setHeartbeatConfig: setHeartbeatConfig4 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
-        setHeartbeatConfig4(body.chatId, body);
+        const { setHeartbeatConfig: setHeartbeatConfig3 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+        setHeartbeatConfig3(body.chatId, body);
         jsonResponse(res, { success: true });
       } catch (err) {
         jsonResponse(res, { error: errorMessage(err) }, 400);
@@ -12383,8 +12383,8 @@ var init_config = __esm({
           const db3 = getDb();
           db3.prepare("INSERT OR REPLACE INTO chat_voice (chat_id, enabled) VALUES (?, ?)").run(body.chatId, body.value === "on" || body.value === "1" ? 1 : 0);
         } else if (body.key === "response-style") {
-          const { setResponseStyle: setResponseStyle4 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
-          setResponseStyle4(body.chatId, body.value);
+          const { setResponseStyle: setResponseStyle5 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+          setResponseStyle5(body.chatId, body.value);
         } else if (body.key === "backend") {
           const { setBackend: setBackend4, clearSession: clearSession3, clearModel: clearModel4, clearThinkingLevel: clearThinkingLevel4 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
           clearSession3(body.chatId);
@@ -12392,19 +12392,19 @@ var init_config = __esm({
           clearThinkingLevel4(body.chatId);
           setBackend4(body.chatId, body.value);
         } else if (body.key === "model") {
-          const { setModel: setModel4, clearThinkingLevel: clearThinkingLevel4, clearSession: clearSession3 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
-          setModel4(body.chatId, body.value);
+          const { setModel: setModel5, clearThinkingLevel: clearThinkingLevel4, clearSession: clearSession3 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+          setModel5(body.chatId, body.value);
           clearThinkingLevel4(body.chatId);
           clearSession3(body.chatId);
         } else if (body.key === "thinking") {
-          const { setThinkingLevel: setThinkingLevel4 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
-          setThinkingLevel4(body.chatId, body.value);
+          const { setThinkingLevel: setThinkingLevel5 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+          setThinkingLevel5(body.chatId, body.value);
         } else if (body.key === "mode") {
-          const { setMode: setMode4 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
-          setMode4(body.chatId, body.value);
+          const { setMode: setMode5 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+          setMode5(body.chatId, body.value);
         } else if (body.key === "verbose") {
-          const { setVerboseLevel: setVerboseLevel4 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
-          setVerboseLevel4(body.chatId, body.value);
+          const { setVerboseLevel: setVerboseLevel5 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+          setVerboseLevel5(body.chatId, body.value);
         } else if (body.key === "summarizer") {
           const { setSummarizer: setSummarizer4, clearSummarizer: clearSummarizer4 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
           if (body.value === "auto") clearSummarizer4(body.chatId);
@@ -15185,7 +15185,7 @@ async function askAgentImpl(chatId, userMessage, opts) {
       const slotSpawnOpts = (() => {
         if (adapter.id !== "gemini") return spawnOpts;
         const geminiAdapter = adapter;
-        const { env, slot } = geminiAdapter.resolveSlotEnv(chatId);
+        const { env, slot } = geminiAdapter.resolveSlotEnv(settingsChat);
         if (slot) {
           log(`[agent] rotation=off, using pinned slot: ${slot.label || `slot-${slot.id}`} (${slot.slotType})`);
           return { ...spawnOpts, envOverride: env };
@@ -15239,7 +15239,7 @@ async function askAgentImpl(chatId, userMessage, opts) {
         const retryOpts = (() => {
           if (adapter.id !== "gemini") return spawnOpts;
           const geminiAdapter = adapter;
-          const { env, slot } = geminiAdapter.resolveSlotEnv(chatId);
+          const { env, slot } = geminiAdapter.resolveSlotEnv(settingsChat);
           if (slot) return { ...spawnOpts, envOverride: env };
           return spawnOpts;
         })();
@@ -15262,7 +15262,7 @@ async function askAgentImpl(chatId, userMessage, opts) {
         const retryOpts = (() => {
           if (adapter.id !== "gemini") return spawnOpts;
           const geminiAdapter = adapter;
-          const { env, slot } = geminiAdapter.resolveSlotEnv(chatId);
+          const { env, slot } = geminiAdapter.resolveSlotEnv(settingsChat);
           if (slot) return { ...spawnOpts, envOverride: env };
           return spawnOpts;
         })();
@@ -15282,7 +15282,7 @@ async function askAgentImpl(chatId, userMessage, opts) {
           const retryOpts = (() => {
             if (adapter.id !== "gemini") return spawnOpts;
             const geminiAdapter = adapter;
-            const { env, slot } = geminiAdapter.resolveSlotEnv(chatId);
+            const { env, slot } = geminiAdapter.resolveSlotEnv(settingsChat);
             if (slot) return { ...spawnOpts, envOverride: env };
             return spawnOpts;
           })();
@@ -15303,7 +15303,7 @@ async function askAgentImpl(chatId, userMessage, opts) {
           const retryOpts = (() => {
             if (adapter.id !== "gemini") return spawnOpts;
             const geminiAdapter = adapter;
-            const { env, slot } = geminiAdapter.resolveSlotEnv(chatId);
+            const { env, slot } = geminiAdapter.resolveSlotEnv(settingsChat);
             if (slot) return { ...spawnOpts, envOverride: env };
             return spawnOpts;
           })();
@@ -16374,18 +16374,23 @@ function enableHeartbeat(chatId, opts) {
       resumeJob2(existing.id);
       log(`[heartbeat] Resumed job #${existing.id}`);
     }
+    if (!existing.backend) {
+      migrateHeartbeatDefaults(existing);
+    }
     return existing.id;
   }
   const { insertJob: insertJob2 } = (init_jobs(), __toCommonJS(jobs_exports));
   const { startSingleJob: startSingleJob2 } = (init_cron(), __toCommonJS(cron_exports));
   const intervalMs = opts?.intervalMs ?? DEFAULT_INTERVAL_MS;
+  const backend2 = opts?.backend ?? resolveDefaultBackend(chatId);
+  const model2 = opts?.model ?? resolveDefaultModel(backend2);
   const job = insertJob2({
     scheduleType: "every",
     everyMs: intervalMs,
     description: DEFAULT_DESCRIPTION,
     chatId,
-    backend: opts?.backend ?? null,
-    model: opts?.model ?? null,
+    backend: backend2,
+    model: model2,
     sessionType: "isolated",
     deliveryMode: "announce",
     channel: opts?.channel ?? "telegram",
@@ -16395,9 +16400,36 @@ function enableHeartbeat(chatId, opts) {
     timeout: 120
   });
   startSingleJob2(job);
-  log(`[heartbeat] Created job #${job.id} (every ${intervalMs / 6e4}min)`);
+  log(`[heartbeat] Created job #${job.id} (every ${intervalMs / 6e4}min, backend=${backend2}, model=${model2})`);
   return job.id;
 }
+function resolveDefaultBackend(chatId) {
+  try {
+    const { getAdapterForChat: getAdapterForChat2 } = (init_backends(), __toCommonJS(backends_exports));
+    return getAdapterForChat2(chatId).id;
+  } catch {
+    return "claude";
+  }
+}
+function resolveDefaultModel(backend2) {
+  try {
+    const { getAdapter: getAdapter4 } = (init_backends(), __toCommonJS(backends_exports));
+    return getAdapter4(backend2).defaultModel;
+  } catch {
+    return "claude-sonnet-4-6";
+  }
+}
+function migrateHeartbeatDefaults(job) {
+  const backend2 = resolveDefaultBackend(job.chatId);
+  const model2 = resolveDefaultModel(backend2);
+  try {
+    const { getDb: getDb2 } = (init_store5(), __toCommonJS(store_exports5));
+    getDb2().prepare("UPDATE jobs SET backend = ?, model = ? WHERE id = ?").run(backend2, model2, job.id);
+    log(`[heartbeat] Migrated job #${job.id}: backend=${backend2}, model=${model2}`);
+  } catch (err) {
+    log(`[heartbeat] Migration failed for job #${job.id}: ${err}`);
+  }
+}
 function disableHeartbeat() {
   const job = findHeartbeatJob();
   if (!job) return false;
@@ -16431,6 +16463,14 @@ function updateHeartbeatConfig(updates) {
     sets.push("model = ?");
     values.push(updates.model);
   }
+  if (updates.thinking !== void 0) {
+    sets.push("thinking = ?");
+    values.push(updates.thinking);
+  }
+  if (updates.timeout !== void 0) {
+    sets.push("timeout = ?");
+    values.push(updates.timeout);
+  }
   if (updates.target !== void 0) {
     sets.push("target = ?");
     values.push(updates.target);
@@ -16439,11 +16479,19 @@ function updateHeartbeatConfig(updates) {
     sets.push("channel = ?");
     values.push(updates.channel);
   }
+  if (updates.fallbacks !== void 0) {
+    sets.push("fallbacks = ?");
+    values.push(updates.fallbacks);
+  }
+  if (updates.credentialSlotId !== void 0) {
+    sets.push("credential_slot_id = ?");
+    values.push(updates.credentialSlotId);
+  }
   if (sets.length === 0) return false;
   values.push(job.id);
   db3.prepare(`UPDATE jobs SET ${sets.join(", ")} WHERE id = ?`).run(...values);
   if (job.enabled) {
-    const { stopJobTimer: stopJobTimer2, startSingleJob: startSingleJob2, listJobs: listJobs3 } = (init_cron(), __toCommonJS(cron_exports));
+    const { stopJobTimer: stopJobTimer2, startSingleJob: startSingleJob2 } = (init_cron(), __toCommonJS(cron_exports));
     const { getJobById: getJobById3 } = (init_store5(), __toCommonJS(store_exports5));
     stopJobTimer2(job.id);
     const refreshed = getJobById3(job.id);
@@ -18695,9 +18743,30 @@ var init_gate = __esm({
 });
 
 // src/voice/stt.ts
+var stt_exports = {};
+__export(stt_exports, {
+  ELEVENLABS_VOICES: () => ELEVENLABS_VOICES,
+  GROK_VOICES: () => GROK_VOICES,
+  LOCAL_WHISPER_MODELS: () => LOCAL_WHISPER_MODELS,
+  MACOS_VOICES: () => MACOS_VOICES,
+  downloadWhisperModel: () => downloadWhisperModel,
+  getSttModel: () => getSttModel,
+  getSttProvider: () => getSttProvider,
+  getVoiceConfig: () => getVoiceConfig,
+  isFfmpegAvailable: () => isFfmpegAvailable,
+  isVoiceEnabled: () => isVoiceEnabled,
+  isWhisperCliAvailable: () => isWhisperCliAvailable,
+  isWhisperModelDownloaded: () => isWhisperModelDownloaded,
+  setSttModel: () => setSttModel,
+  setSttProvider: () => setSttProvider,
+  setVoiceProvider: () => setVoiceProvider,
+  synthesizeSpeech: () => synthesizeSpeech,
+  toggleVoice: () => toggleVoice,
+  transcribeAudio: () => transcribeAudio
+});
 import crypto from "crypto";
 import { execFile as execFile2, execFileSync as execFileSync3 } from "child_process";
-import { readFile as readFile3, unlink as unlink2, mkdir as mkdir2, writeFile } from "fs/promises";
+import { readFile as readFile3, unlink as unlink2, writeFile } from "fs/promises";
 import { existsSync as existsSync22 } from "fs";
 import { join as join22 } from "path";
 import { promisify as promisify2 } from "util";
@@ -18769,59 +18838,61 @@ function setSttModel(chatId, model2) {
     ON CONFLICT(chat_id) DO UPDATE SET stt_model = ?
   `).run(chatId, model2, model2);
 }
-function isWhisperCliAvailable() {
-  if (whisperCliAvailableCache !== null) return whisperCliAvailableCache;
+function isFfmpegAvailable() {
+  if (ffmpegAvailable !== null) return ffmpegAvailable;
   try {
-    execFileSync3("whisper-cli", ["--help"], { stdio: "ignore" });
-    whisperCliAvailableCache = true;
+    execFileSync3("ffmpeg", ["-version"], { stdio: "ignore" });
+    ffmpegAvailable = true;
   } catch {
-    try {
-      execFileSync3("whisper", ["--help"], { stdio: "ignore" });
-      whisperCliAvailableCache = true;
-    } catch {
-      whisperCliAvailableCache = false;
-    }
+    ffmpegAvailable = false;
   }
-  return whisperCliAvailableCache;
+  return ffmpegAvailable;
 }
-function getWhisperBin() {
-  try {
-    execFileSync3("whisper-cli", ["--help"], { stdio: "ignore" });
-    return "whisper-cli";
-  } catch {
-  }
-  try {
-    execFileSync3("whisper", ["--help"], { stdio: "ignore" });
-    return "whisper";
-  } catch {
-  }
-  return null;
-}
-function whisperModelPath(model2) {
-  return join22(WHISPER_MODELS_PATH, `ggml-${model2}.bin`);
+function isWhisperCliAvailable() {
+  return true;
 }
 function isWhisperModelDownloaded(model2) {
-  return existsSync22(whisperModelPath(model2));
+  const hfId = HF_MODEL_IDS[model2];
+  if (!hfId) return false;
+  const home = process.env.HOME ?? "/tmp";
+  const cacheDir = join22(home, ".cache", "huggingface", "hub", `models--${hfId.replace("/", "--")}`);
+  return existsSync22(cacheDir);
 }
 async function downloadWhisperModel(model2, onProgress) {
-  await mkdir2(WHISPER_MODELS_PATH, { recursive: true });
-  const dest = whisperModelPath(model2);
-  const url = `https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-${model2}.bin`;
   const info = LOCAL_WHISPER_MODELS[model2];
+  const hfId = HF_MODEL_IDS[model2];
+  if (!hfId) throw new Error(`Unknown model: ${model2}`);
   onProgress?.(`\u2B07\uFE0F Downloading Whisper model ${model2} (${info.size})...`);
-  log(`[stt] Downloading model ${model2} from ${url}`);
-  const response = await fetch(url);
-  if (!response.ok) throw new Error(`Failed to download model: ${response.status} ${response.statusText}`);
-  const arrayBuffer = await response.arrayBuffer();
-  await writeFile(dest, Buffer.from(arrayBuffer));
-  log(`[stt] Model ${model2} downloaded to ${dest}`);
+  log(`[stt] Downloading model ${hfId} via @huggingface/transformers`);
+  try {
+    const { pipeline } = await import("@huggingface/transformers");
+    const transcriber = await pipeline("automatic-speech-recognition", hfId);
+    if (cachedPipeline?.model !== model2) {
+      await cachedPipeline?.transcriber?.dispose?.();
+    }
+    cachedPipeline = { model: model2, transcriber };
+    log(`[stt] Model ${model2} downloaded and cached`);
+    onProgress?.(`\u2705 Model ${model2} downloaded and ready!`);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    log(`[stt] Model download failed: ${msg}`);
+    throw new Error(`Failed to download model ${model2}: ${msg}`);
+  }
 }
 async function transcribeWithLocalWhisper(audioBuffer, model2, onProgress) {
   ensureFfmpeg();
-  const bin = getWhisperBin();
-  if (!bin) throw new Error("whisper-cli not found. Install it: brew install whisper-cpp (macOS) or see https://github.com/ggml-org/whisper.cpp");
-  if (!isWhisperModelDownloaded(model2)) {
-    await downloadWhisperModel(model2, onProgress);
+  const hfId = HF_MODEL_IDS[model2];
+  if (!hfId) throw new Error(`Unknown whisper model: ${model2}`);
+  let transcriber;
+  if (cachedPipeline?.model === model2) {
+    transcriber = cachedPipeline.transcriber;
+  } else {
+    onProgress?.(`\u{1F504} Loading Whisper model ${model2}...`);
+    log(`[stt] Loading pipeline for ${hfId}`);
+    const { pipeline } = await import("@huggingface/transformers");
+    transcriber = await pipeline("automatic-speech-recognition", hfId);
+    if (cachedPipeline) await cachedPipeline.transcriber?.dispose?.();
+    cachedPipeline = { model: model2, transcriber };
   }
   const id = crypto.randomUUID();
   const tmpOgg = `/tmp/cc-claw-stt-${id}.ogg`;
@@ -18829,16 +18900,26 @@ async function transcribeWithLocalWhisper(audioBuffer, model2, onProgress) {
   try {
     await writeFile(tmpOgg, audioBuffer);
     await execFileAsync2("ffmpeg", ["-y", "-i", tmpOgg, "-ar", "16000", "-ac", "1", "-c:a", "pcm_s16le", tmpWav]);
-    const modelFile = whisperModelPath(model2);
-    const result = await execFileAsync2(bin, ["-m", modelFile, "-f", tmpWav, "-nt", "--output-txt", "-of", `/tmp/cc-claw-stt-${id}`]);
-    const txtFile = `/tmp/cc-claw-stt-${id}.txt`;
-    let transcript = "";
-    if (existsSync22(txtFile)) {
-      transcript = (await readFile3(txtFile, "utf-8")).trim();
-      unlink2(txtFile).catch(() => {
-      });
-    } else {
-      transcript = (result.stdout ?? "").trim();
+    const wavefileMod = await import("wavefile");
+    const WaveFile = wavefileMod.default?.WaveFile ?? wavefileMod.WaveFile;
+    const wavBuffer = await readFile3(tmpWav);
+    const wav = new WaveFile(wavBuffer);
+    wav.toBitDepth("32f");
+    wav.toSampleRate(16e3);
+    let audioData = wav.getSamples();
+    if (Array.isArray(audioData)) {
+      if (audioData.length > 1) {
+        const SCALING_FACTOR = Math.sqrt(2);
+        for (let i = 0; i < audioData[0].length; ++i) {
+          audioData[0][i] = SCALING_FACTOR * (audioData[0][i] + audioData[1][i]) / 2;
+        }
+      }
+      audioData = audioData[0];
+    }
+    const result = await transcriber(audioData);
+    const transcript = (result?.text ?? "").trim();
+    if (!transcript) {
+      throw new Error("Whisper returned empty transcript. The audio may be too short or silent.");
     }
     return transcript;
   } finally {
@@ -18986,13 +19067,12 @@ async function macOsTts(text, voice2 = "Samantha") {
   });
   return oggBuffer;
 }
-var execFileAsync2, ffmpegAvailable, LOCAL_WHISPER_MODELS, ELEVENLABS_VOICES, GROK_VOICES, MACOS_VOICES, whisperCliAvailableCache;
+var execFileAsync2, ffmpegAvailable, LOCAL_WHISPER_MODELS, ELEVENLABS_VOICES, GROK_VOICES, MACOS_VOICES, HF_MODEL_IDS, cachedPipeline;
 var init_stt = __esm({
   "src/voice/stt.ts"() {
     "use strict";
     init_log();
     init_store5();
-    init_paths();
     execFileAsync2 = promisify2(execFile2);
     ffmpegAvailable = null;
     LOCAL_WHISPER_MODELS = {
@@ -19019,7 +19099,16 @@ var init_stt = __esm({
       "Samantha": { name: "Samantha", gender: "F" },
       "Albert": { name: "Albert", gender: "M" }
     };
-    whisperCliAvailableCache = null;
+    HF_MODEL_IDS = {
+      "tiny.en": "Xenova/whisper-tiny.en",
+      "base.en": "Xenova/whisper-base.en",
+      "small.en": "Xenova/whisper-small.en",
+      "small": "Xenova/whisper-small",
+      "medium.en": "Xenova/whisper-medium.en",
+      "medium": "Xenova/whisper-medium",
+      "large-v3-turbo": "Xenova/whisper-large-v3-turbo"
+    };
+    cachedPipeline = null;
   }
 });
 
@@ -19568,13 +19657,13 @@ var init_video = __esm({
 
 // src/router/media.ts
 import { join as join24 } from "path";
-import { mkdir as mkdir3, writeFile as writeFile3, readdir as readdir4, stat as stat3, unlink as unlink4 } from "fs/promises";
+import { mkdir as mkdir2, writeFile as writeFile3, readdir as readdir4, stat as stat3, unlink as unlink4 } from "fs/promises";
 function getMediaRetentionMs() {
   const hours = parseInt(process.env.MEDIA_RETENTION_HOURS ?? "24", 10);
   return (isNaN(hours) || hours < 1 ? 24 : hours) * 60 * 60 * 1e3;
 }
 async function saveMedia(buffer, prefix, ext) {
-  await mkdir3(MEDIA_INCOMING_PATH, { recursive: true });
+  await mkdir2(MEDIA_INCOMING_PATH, { recursive: true });
   const filename = `${prefix}-${Date.now()}.${ext}`;
   const fullPath = join24(MEDIA_INCOMING_PATH, filename);
   await writeFile3(fullPath, buffer);
@@ -19582,7 +19671,7 @@ async function saveMedia(buffer, prefix, ext) {
 }
 async function cleanupOldMedia() {
   try {
-    await mkdir3(MEDIA_INCOMING_PATH, { recursive: true });
+    await mkdir2(MEDIA_INCOMING_PATH, { recursive: true });
     const retentionMs = getMediaRetentionMs();
     const retentionHours = Math.round(retentionMs / (60 * 60 * 1e3));
     const files = await readdir4(MEDIA_INCOMING_PATH);
@@ -19652,7 +19741,20 @@ async function handleVoice(msg, channel) {
     await sendResponse(chatId, channel, response.text, msg.messageId);
   } catch (err) {
     error("[router] Voice error:", err);
-    await channel.sendText(chatId, `Voice processing error: ${errorMessage(err)}`, { parseMode: "plain" });
+    const raw = errorMessage(err);
+    let userMsg;
+    if (raw.includes("ffmpeg")) {
+      userMsg = "\u274C ffmpeg is not installed \u2014 needed to convert audio.\n\nFix: brew install ffmpeg";
+    } else if (raw.includes("GROQ_API_KEY") || raw.includes("Groq API error")) {
+      userMsg = "\u274C Groq transcription failed. Check your GROQ_API_KEY in ~/.cc-claw/.env, or switch to Local Whisper via /voice.";
+    } else if (raw.includes("empty transcript")) {
+      userMsg = "\u274C Couldn't hear anything in that voice message. Try again with a longer or clearer recording.";
+    } else if (raw.includes("Failed to download model")) {
+      userMsg = "\u274C Couldn't download the Whisper model. Check your internet connection and try again via /voice.";
+    } else {
+      userMsg = `\u274C Voice processing error: ${raw}`;
+    }
+    await channel.sendText(chatId, userMsg, { parseMode: "plain" });
   }
 }
 async function handleMedia(msg, channel) {
@@ -19740,11 +19842,12 @@ Acknowledge receipt. Do NOT analyze the video unless they ask you to.`;
       return;
     }
     const fileBuffer = await channel.downloadFile(fileName);
-    const originalName = fileName ?? "file";
+    const originalName = msg.metadata?.originalName ?? fileName ?? "file";
     const ext = originalName.split(".").pop()?.toLowerCase() ?? "";
+    const effectiveExt = ext && ext !== originalName ? ext : msg.mimeType?.split("/")[1]?.replace("plain", "txt").replace("javascript", "js") ?? "";
     let prompt;
     let tempFilePath;
-    if (msg.type === "photo" || isImageExt(ext)) {
+    if (msg.type === "photo" || isImageExt(ext) || isImageExt(effectiveExt)) {
       const imgExt = msg.type === "photo" ? "jpg" : ext || "jpg";
       tempFilePath = await saveMedia(fileBuffer, "img", imgExt);
       const allPaths = [tempFilePath];
@@ -19780,7 +19883,7 @@ ${pathList}
 
 Please read all image files and describe what you see.`;
       }
-    } else if (isTextExt(ext)) {
+    } else if (isTextExt(ext) || isTextExt(effectiveExt)) {
       const MAX_TEXT_FILE_BYTES = 1048576;
       if (fileBuffer.length > MAX_TEXT_FILE_BYTES) {
         await channel.sendText(chatId, `\u26A0\uFE0F Text file too large for inline processing (${(fileBuffer.length / 1024 / 1024).toFixed(1)}MB, max 1MB). Saving to disk instead.`, { parseMode: "plain" });
@@ -19805,7 +19908,25 @@ ${content}
 \`\`\``;
       }
     } else {
-      prompt = `I've shared a file "${originalName}" (${fileBuffer.length} bytes). ${caption || "What can you tell me about it?"}`;
+      const MAX_TEXT_SNIFF = 1048576;
+      const looksLikeText = fileBuffer.length <= MAX_TEXT_SNIFF && !fileBuffer.includes(0);
+      if (looksLikeText) {
+        const content = fileBuffer.toString("utf-8");
+        prompt = caption ? `Here's a file "${originalName}":
+
+\`\`\`
+${content}
+\`\`\`
+
+${caption}` : `Here's a file "${originalName}". Please analyze its contents:
+
+\`\`\`
+${content}
+\`\`\``;
+      } else {
+        tempFilePath = await saveMedia(fileBuffer, "file", ext || "bin");
+        prompt = `The user shared a binary file "${originalName}" (${fileBuffer.length} bytes), saved at: ${tempFilePath}. ${caption || "What can you tell me about it?"}`;
+      }
     }
     const mediaModel = resolveModel(chatId);
     const mMode = getMode(chatId);
@@ -20179,7 +20300,7 @@ var install_exports = {};
 __export(install_exports, {
   installSkillFromGitHub: () => installSkillFromGitHub
 });
-import { mkdir as mkdir4, readdir as readdir5, readFile as readFile5, cp } from "fs/promises";
+import { mkdir as mkdir3, readdir as readdir5, readFile as readFile5, cp } from "fs/promises";
 import { existsSync as existsSync24 } from "fs";
 import { join as join25, basename as basename2 } from "path";
 import { execSync as execSync4 } from "child_process";
@@ -20212,7 +20333,7 @@ async function installSkillFromGitHub(urlOrShorthand) {
     if (existsSync24(destDir)) {
       log(`[skill-install] Overwriting existing skill at ${destDir}`);
     }
-    await mkdir4(destDir, { recursive: true });
+    await mkdir3(destDir, { recursive: true });
     await cp(skillDir, destDir, { recursive: true });
     let skillName = skillFolderName;
     try {
@@ -20423,6 +20544,53 @@ var init_humanize = __esm({
 });
 
 // src/router/ui.ts
+var ui_exports = {};
+__export(ui_exports, {
+  ROTATION_MODE_CONFIRM_LABELS: () => ROTATION_MODE_CONFIRM_LABELS,
+  ROTATION_MODE_LABELS: () => ROTATION_MODE_LABELS,
+  buildAccountSlotKeyboard: () => buildAccountSlotKeyboard,
+  doBackendSwitch: () => doBackendSwitch,
+  getJobScheduleText: () => getJobScheduleText,
+  getJobStatusEmoji: () => getJobStatusEmoji,
+  getJobStatusLabel: () => getJobStatusLabel,
+  handleRotationModeChange: () => handleRotationModeChange,
+  sendBackendAccountPicker: () => sendBackendAccountPicker,
+  sendBackendConfigPanel: () => sendBackendConfigPanel,
+  sendBackendModelPicker: () => sendBackendModelPicker,
+  sendBackendPicker: () => sendBackendPicker,
+  sendBackendSwitchConfirmation: () => sendBackendSwitchConfirmation,
+  sendBackendThinkingPicker: () => sendBackendThinkingPicker,
+  sendCurrentProposal: () => sendCurrentProposal,
+  sendForgetPicker: () => sendForgetPicker,
+  sendHeartbeatEngine: () => sendHeartbeatEngine,
+  sendHeartbeatFallbacks: () => sendHeartbeatFallbacks,
+  sendHeartbeatHours: () => sendHeartbeatHours,
+  sendHeartbeatKeyboard: () => sendHeartbeatKeyboard,
+  sendHeartbeatThinking: () => sendHeartbeatThinking,
+  sendHeartbeatTimeout: () => sendHeartbeatTimeout,
+  sendHeartbeatWatches: () => sendHeartbeatWatches,
+  sendHelpCategories: () => sendHelpCategories,
+  sendHelpCategory: () => sendHelpCategory,
+  sendHistoryView: () => sendHistoryView,
+  sendJobDetail: () => sendJobDetail,
+  sendJobPicker: () => sendJobPicker,
+  sendJobRunsView: () => sendJobRunsView,
+  sendJobsBoard: () => sendJobsBoard,
+  sendMemoryDetail: () => sendMemoryDetail,
+  sendMemoryForgetConfirm: () => sendMemoryForgetConfirm,
+  sendMemoryPage: () => sendMemoryPage,
+  sendModelKeyboard: () => sendModelKeyboard,
+  sendModelSigKeyboard: () => sendModelSigKeyboard,
+  sendPermissionsKeyboard: () => sendPermissionsKeyboard,
+  sendResponseStyleKeyboard: () => sendResponseStyleKeyboard,
+  sendSkillsPage: () => sendSkillsPage,
+  sendThinkingKeyboard: () => sendThinkingKeyboard,
+  sendToolsKeyboard: () => sendToolsKeyboard,
+  sendUnifiedUsage: () => sendUnifiedUsage,
+  sendUsageLimits: () => sendUsageLimits,
+  sendVerboseKeyboard: () => sendVerboseKeyboard,
+  sendVoiceConfigKeyboard: () => sendVoiceConfigKeyboard
+});
 function buildAccountSlotKeyboard(slots, activeSlotId, rotationMode, callbackPrefix, rotationPrefix) {
   const slotButtons = slots.filter((s) => s.enabled).map((s) => {
     const label2 = s.label || `slot-${s.id}`;
@@ -20470,8 +20638,7 @@ async function handleRotationModeChange(chatId, channel, backendId, mode) {
   const prefix = isGemini ? "" : `${displayName} `;
   await channel.sendText(chatId, `${prefix}Rotation mode set to <b>${ROTATION_MODE_CONFIRM_LABELS[mode]}</b>.`, { parseMode: "html" });
 }
-async function sendHelpCategories(chatId, channel) {
-  if (typeof channel.sendKeyboard !== "function") return;
+async function sendHelpCategories(chatId, channel, messageId) {
   const header2 = `${buildSectionHeader("CC-Claw Commands")}`;
   const cats = Object.keys(HELP_CATEGORIES);
   const rows = [];
@@ -20484,22 +20651,21 @@ async function sendHelpCategories(chatId, channel) {
     }
     rows.push(row);
   }
-  await channel.sendKeyboard(chatId, header2, rows);
+  await sendOrEditKeyboard(chatId, channel, messageId, header2, rows);
 }
-async function sendHelpCategory(chatId, category, channel) {
-  if (typeof channel.sendKeyboard !== "function") return;
+async function sendHelpCategory(chatId, category, channel, messageId) {
   const cat = Object.entries(HELP_CATEGORIES).find(([k]) => k.toLowerCase() === category.toLowerCase());
   if (!cat) return;
   const [name, cmds] = cat;
   const header2 = `${buildSectionHeader(`${name} (${cmds.length} commands)`)}`;
   const body = cmds.map((c) => `${c.cmd} \u2014 ${c.desc}`).join("\n");
-  await channel.sendKeyboard(chatId, `${header2}
+  await sendOrEditKeyboard(chatId, channel, messageId, `${header2}
 
 ${body}`, [
     [{ label: "\u2190 Back to Categories", data: "help:back" }]
   ]);
 }
-async function sendUnifiedUsage(chatId, channel, view) {
+async function sendUnifiedUsage(chatId, channel, view, messageId) {
   const { pricing, defaultPricing } = buildUsagePricing();
   const fmt = (n) => `$${n.toFixed(4)}`;
   const fmtK = (n) => `${(n / 1e3).toFixed(0)}K`;
@@ -20555,25 +20721,21 @@ async function sendUnifiedUsage(chatId, channel, view) {
       }
     }
   }
-  if (typeof channel.sendKeyboard === "function") {
-    const buttons = [
-      [
-        { label: view === "session" ? "Session \u2713" : "Session", data: "usage:session", ...view === "session" ? { style: "primary" } : {} },
-        { label: view === "24h" ? "24h \u2713" : "24h", data: "usage:24h", ...view === "24h" ? { style: "primary" } : {} },
-        { label: view === "7d" ? "7d \u2713" : "7d", data: "usage:7d", ...view === "7d" ? { style: "primary" } : {} },
-        { label: view === "30d" ? "30d \u2713" : "30d", data: "usage:30d", ...view === "30d" ? { style: "primary" } : {} }
-      ],
-      [
-        { label: view === "model" ? "By Model \u2713" : "By Model", data: "usage:model", ...view === "model" ? { style: "primary" } : {} },
-        { label: "Set Limits", data: "usage:limits" }
-      ]
-    ];
-    await channel.sendKeyboard(chatId, lines.join("\n"), buttons);
-  } else {
-    await channel.sendText(chatId, lines.join("\n"), { parseMode: "plain" });
-  }
+  const buttons = [
+    [
+      { label: view === "session" ? "\u2713 Session" : "Session", data: "usage:session", ...view === "session" ? { style: "primary" } : {} },
+      { label: view === "24h" ? "\u2713 24h" : "24h", data: "usage:24h", ...view === "24h" ? { style: "primary" } : {} },
+      { label: view === "7d" ? "\u2713 7d" : "7d", data: "usage:7d", ...view === "7d" ? { style: "primary" } : {} },
+      { label: view === "30d" ? "\u2713 30d" : "30d", data: "usage:30d", ...view === "30d" ? { style: "primary" } : {} }
+    ],
+    [
+      { label: view === "model" ? "\u2713 By Model" : "By Model", data: "usage:model", ...view === "model" ? { style: "primary" } : {} },
+      { label: "Set Limits", data: "usage:limits" }
+    ]
+  ];
+  await sendOrEditKeyboard(chatId, channel, messageId, lines.join("\n"), buttons);
 }
-async function sendUsageLimits(chatId, channel) {
+async function sendUsageLimits(chatId, channel, messageId) {
   const limits2 = getAllBackendLimits();
   const fmtK = (n) => `${(n / 1e3).toFixed(0)}K`;
   const lines = [buildSectionHeader("Set Usage Limits"), ""];
@@ -20587,27 +20749,19 @@ async function sendUsageLimits(chatId, channel) {
     }
   }
   lines.push("", "Use /limits <backend> <window> <tokens> to set.\nExample: /limits claude daily 500000");
-  if (typeof channel.sendKeyboard === "function") {
-    const setButtons = getAvailableBackendIds().map((bid) => ({
-      label: `Set ${getAdapter(bid).displayName} Limit`,
-      data: `usage:limits:set:${bid}`
-    }));
-    const rows = [];
-    for (let i = 0; i < setButtons.length; i += 2) {
-      rows.push(setButtons.slice(i, i + 2));
-    }
-    rows.push([
-      { label: "Clear All", data: "usage:limits:clear", style: "danger" }
-    ]);
-    rows.push([
-      { label: "\u2190 Back to Usage", data: "usage:back" }
-    ]);
-    await channel.sendKeyboard(chatId, lines.join("\n"), rows);
-  } else {
-    await channel.sendText(chatId, lines.join("\n"), { parseMode: "plain" });
+  const setButtons = getAvailableBackendIds().map((bid) => ({
+    label: `Set ${getAdapter(bid).displayName} Limit`,
+    data: `usage:limits:set:${bid}`
+  }));
+  const rows = [];
+  for (let i = 0; i < setButtons.length; i += 2) {
+    rows.push(setButtons.slice(i, i + 2));
   }
+  rows.push([{ label: "Clear All", data: "usage:limits:clear", style: "danger" }]);
+  rows.push([{ label: "\u2190 Back to Usage", data: "usage:back" }]);
+  await sendOrEditKeyboard(chatId, channel, messageId, lines.join("\n"), rows);
 }
-async function sendHistoryView(chatId, channel, filter) {
+async function sendHistoryView(chatId, channel, filter, messageId) {
   const limit = filter.limit ?? 10;
   let rows = getRecentMessageLog(chatId, 100).reverse();
   if (filter.backend) {
@@ -20622,7 +20776,9 @@ async function sendHistoryView(chatId, channel, filter) {
   }
   const userMsgs = rows.filter((r) => r.role === "user").slice(0, limit);
   if (userMsgs.length === 0) {
-    await channel.sendText(chatId, "No conversation history found.", { parseMode: "plain" });
+    await sendOrEditKeyboard(chatId, channel, messageId, "No conversation history found.", [
+      [[{ label: "Show More (25)", data: "hist:recent:25" }, { label: "Today", data: "hist:today" }, { label: "This Week", data: "hist:week" }]][0]
+    ]);
     return;
   }
   const lines = [`\u{1F4CB} Recent Conversation (last ${userMsgs.length})`, "\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501"];
@@ -20631,28 +20787,28 @@ async function sendHistoryView(chatId, channel, filter) {
     const preview = row.content.slice(0, 80) + (row.content.length > 80 ? "\u2026" : "");
     lines.push(`[${row.backend ?? "?"} \xB7 ${date}] ${preview}`);
   }
-  await channel.sendText(chatId, lines.join("\n"), { parseMode: "plain" });
+  lines.push("", "Tip: /history <query> for full-text search");
   const filterRow = [
-    { label: "Show More (25)", data: "hist:recent:25" },
-    { label: "Today", data: "hist:today" },
-    { label: "This Week", data: "hist:week" }
+    { label: filter.limit === 25 ? "\u2713 Show More (25)" : "Show More (25)", data: "hist:recent:25", ...filter.limit === 25 ? { style: "primary" } : {} },
+    { label: filter.period === "today" ? "\u2713 Today" : "Today", data: "hist:today", ...filter.period === "today" ? { style: "primary" } : {} },
+    { label: filter.period === "week" ? "\u2713 This Week" : "This Week", data: "hist:week", ...filter.period === "week" ? { style: "primary" } : {} }
   ];
   const backendRow = getAvailableAdapters().map((a) => ({
-    label: a.displayName,
+    label: filter.backend === a.id ? `\u2713 ${a.displayName}` : a.displayName,
     data: `hist:backend:${a.id}`,
-    style: "primary"
+    ...filter.backend === a.id ? { style: "primary" } : {}
   }));
-  await channel.sendKeyboard(chatId, "Tip: /history <query> for full-text search", [filterRow, backendRow]);
+  await sendOrEditKeyboard(chatId, channel, messageId, lines.join("\n"), [filterRow, backendRow]);
 }
-async function sendVoiceConfigKeyboard(chatId, channel) {
-  if (typeof channel.sendKeyboard !== "function") {
+async function sendVoiceConfigKeyboard(chatId, channel, messageId) {
+  if (typeof channel.sendKeyboard !== "function" && typeof channel.editKeyboard !== "function") {
     await channel.sendText(chatId, "Voice configuration requires an interactive channel (Telegram).", { parseMode: "plain" });
     return;
   }
   const ttsConfig = getVoiceConfig(chatId);
   const sttProvider = getSttProvider(chatId);
   const sttModel = getSttModel(chatId);
-  const whisperAvailable = isWhisperCliAvailable();
+  const ffmpegOk = isFfmpegAvailable();
   const buttons = [];
   const groqAvailable = !!process.env.GROQ_API_KEY;
   buttons.push([
@@ -20662,12 +20818,12 @@ async function sendVoiceConfigKeyboard(chatId, channel) {
       ...sttProvider === "groq" ? { style: "primary" } : {}
     },
     {
-      label: `${sttProvider === "local-whisper" ? "\u2713 " : ""}\u{1F4BB} Local Whisper${!whisperAvailable ? " (install first)" : ""}`,
+      label: `${sttProvider === "local-whisper" ? "\u2713 " : ""}\u{1F4BB} Local Whisper`,
       data: "vcfg:stt:local-whisper",
       ...sttProvider === "local-whisper" ? { style: "primary" } : {}
     }
   ]);
-  if (sttProvider === "local-whisper" || whisperAvailable) {
+  if (sttProvider === "local-whisper") {
     const modelEntries = Object.entries(LOCAL_WHISPER_MODELS);
     for (let i = 0; i < modelEntries.length; i += 2) {
       const row = modelEntries.slice(i, i + 2).map(([id, info]) => {
@@ -20712,14 +20868,158 @@ async function sendVoiceConfigKeyboard(chatId, channel) {
       buttons.push(Object.entries(MACOS_VOICES).map(([id, v]) => ({ label: `${ttsConfig.voiceId === id ? "\u2713 " : ""}${v.name}`, data: `vcfg:v:${id}` })));
     }
   }
-  const sttLabel = sttProvider === "groq" ? "Groq (cloud)" : `Local Whisper \xB7 ${sttModel}`;
+  const sttLabel = sttProvider === "groq" ? "Groq (cloud)" : `Local Whisper \xB7 ${sttModel} (on-device)`;
   const ttsLabel = ttsConfig.enabled ? `${ttsConfig.provider === "grok" ? "Grok" : ttsConfig.provider === "macos" ? "macOS" : "ElevenLabs"} replies ON` : "Replies OFF";
-  const modelLegend = sttProvider === "local-whisper" || whisperAvailable ? "\n\u25CF = downloaded  \u25CB = not yet downloaded" : "";
+  const modelLegend = sttProvider === "local-whisper" ? "\n\u25CF = downloaded  \u25CB = tap to download" : "";
+  const prereqWarning = sttProvider === "local-whisper" && !ffmpegOk ? "\n\u26A0\uFE0F ffmpeg not found \u2014 required for audio conversion" : "";
   const header2 = `\u{1F399}\uFE0F Voice Settings
 
 \u{1F3A4} Transcription: ${sttLabel}
-\u{1F50A} Text-to-Speech: ${ttsLabel}${modelLegend}`;
-  await channel.sendKeyboard(chatId, header2, buttons);
+\u{1F50A} Text-to-Speech: ${ttsLabel}${modelLegend}${prereqWarning}`;
+  await sendOrEditKeyboard(chatId, channel, messageId, header2, buttons);
+}
+async function sendPermissionsKeyboard(chatId, channel, messageId) {
+  const currentMode = getMode(chatId);
+  const currentExecMode = getExecMode(chatId);
+  const permButtons = Object.entries(PERM_MODES).map(([id, label2]) => [{
+    label: `${id === currentMode ? "\u2713 " : ""}${label2}`,
+    data: `perms:${id}`,
+    ...id === currentMode ? { style: "primary" } : {}
+  }]);
+  const approvalOn = currentExecMode === "approved";
+  permButtons.push([{
+    label: `${approvalOn ? "\u2713 " : ""}\u{1F512} Approve Before Execute: ${approvalOn ? "ON" : "OFF"}`,
+    data: `execmode:${approvalOn ? "yolo" : "approved"}`,
+    ...approvalOn ? { style: "primary" } : {}
+  }]);
+  await sendOrEditKeyboard(chatId, channel, messageId, "\u2699\uFE0F Permission & Execution Settings:", permButtons);
+}
+async function sendVerboseKeyboard(chatId, channel, messageId) {
+  const currentVerbose = getVerboseLevel(chatId);
+  const buttons = Object.entries(VERBOSE_LEVELS).map(([id, label2]) => [{
+    label: `${id === currentVerbose ? "\u2713 " : ""}${label2}`,
+    data: `verbose:${id}`,
+    ...id === currentVerbose ? { style: "primary" } : {}
+  }]);
+  await sendOrEditKeyboard(chatId, channel, messageId, "\u{1F441}\uFE0F Tool Visibility:", buttons);
+}
+async function sendToolsKeyboard(chatId, channel, messageId) {
+  const toolsMap = getToolsMap(chatId);
+  const currentMode = getMode(chatId);
+  const toolButtons = [];
+  const toolList = [...ALL_TOOLS];
+  for (let i = 0; i < toolList.length; i += 3) {
+    const row = toolList.slice(i, i + 3).map((t) => ({
+      label: `${toolsMap[t] ? "\u2705" : "\u274C"} ${t}`,
+      data: `tool:toggle:${t}`
+    }));
+    toolButtons.push(row);
+  }
+  toolButtons.push([{ label: "Reset to defaults (all on)", data: "tool:reset", style: "danger" }]);
+  const enabledCount = Object.values(toolsMap).filter(Boolean).length;
+  const modeNote = currentMode === "plan" ? "\n\nNote: In plan mode, tool list is ignored (read-only)." : currentMode === "yolo" ? "\n\nNote: In YOLO mode, tool list is ignored (all tools allowed)." : "";
+  await sendOrEditKeyboard(
+    chatId,
+    channel,
+    messageId,
+    `\u{1F527} Tools (${enabledCount}/${toolList.length} enabled, mode: ${currentMode})${modeNote}
+Tap to toggle:`,
+    toolButtons
+  );
+}
+async function sendResponseStyleKeyboard(chatId, channel, messageId) {
+  const currentStyle = getResponseStyle(chatId);
+  await sendOrEditKeyboard(chatId, channel, messageId, "\u{1F5E3}\uFE0F AI Response Style:", [
+    [
+      { label: `${currentStyle === "concise" ? "\u2713 " : ""}Concise`, data: "style:concise", ...currentStyle === "concise" ? { style: "primary" } : {} },
+      { label: `${currentStyle === "normal" ? "\u2713 " : ""}Normal`, data: "style:normal", ...currentStyle === "normal" ? { style: "primary" } : {} },
+      { label: `${currentStyle === "detailed" ? "\u2713 " : ""}Detailed`, data: "style:detailed", ...currentStyle === "detailed" ? { style: "primary" } : {} }
+    ]
+  ]);
+}
+async function sendModelSigKeyboard(chatId, channel, messageId) {
+  const currentSig = getModelSignature(chatId);
+  await sendOrEditKeyboard(
+    chatId,
+    channel,
+    messageId,
+    `\u{1F9E0} Model Signature: ${currentSig === "on" ? "ON" : "OFF"}
+Appends model + thinking level to each response.`,
+    [[
+      { label: `${currentSig === "on" ? "\u2713 " : ""}On`, data: "model_sig:on", ...currentSig === "on" ? { style: "success" } : {} },
+      { label: `${currentSig !== "on" ? "\u2713 " : ""}Off`, data: "model_sig:off", ...currentSig !== "on" ? { style: "danger" } : {} }
+    ]]
+  );
+}
+async function sendModelKeyboard(chatId, channel, messageId) {
+  let adapter;
+  try {
+    adapter = getAdapterForChat(chatId);
+  } catch {
+    await channel.sendText(chatId, "No backend set. Use /backend first.", { parseMode: "plain" });
+    return;
+  }
+  const models = adapter.availableModels;
+  const current = getModel(chatId) ?? adapter.defaultModel;
+  const isAuto = getModel(chatId) === "auto";
+  const buttons = Object.entries(models).map(([id, info]) => {
+    const tag = info.thinking === "adjustable" ? " \u26A1" : "";
+    return [{
+      label: `${id === current ? "\u2713 " : ""}${info.label}${tag}`,
+      data: `model:${id}`,
+      ...id === current ? { style: "primary" } : {}
+    }];
+  });
+  buttons.unshift([{
+    label: `${isAuto ? "\u2713 " : ""}\u{1F916} Auto (smart routing)`,
+    data: "model:auto",
+    ...isAuto ? { style: "primary" } : {}
+  }]);
+  await sendOrEditKeyboard(chatId, channel, messageId, `Models for ${adapter.displayName}:`, buttons);
+}
+async function sendThinkingKeyboard(chatId, channel, messageId, forModelId) {
+  let adapter;
+  try {
+    adapter = getAdapterForChat(chatId);
+  } catch {
+    await channel.sendText(chatId, "No backend set. Use /backend first.", { parseMode: "plain" });
+    return;
+  }
+  const currentModel = forModelId ?? getModel(chatId) ?? adapter.defaultModel;
+  const modelInfo = adapter.availableModels[currentModel];
+  const currentLevel = getThinkingLevel(chatId) || "auto";
+  if (!modelInfo || modelInfo.thinking !== "adjustable" || !modelInfo.thinkingLevels) {
+    await sendOrEditKeyboard(
+      chatId,
+      channel,
+      messageId,
+      `Model ${shortModelName(currentModel)} uses fixed thinking \u2014 no adjustment needed.`,
+      [[{ label: "\u2190 Back to Model", data: "menu:model" }]]
+    );
+    return;
+  }
+  const showThinkingUi = getShowThinkingUi(chatId);
+  const buttons = modelInfo.thinkingLevels.map((level) => [{
+    label: `${level === currentLevel ? "\u2713 " : ""}${level === "auto" ? "Auto" : capitalize(level)}`,
+    data: `thinking:${level}`,
+    ...level === currentLevel ? { style: "primary" } : {}
+  }]);
+  buttons.push([{
+    label: `${showThinkingUi ? "\u2713 " : ""}\u{1F4AD} Show Thinking`,
+    data: "thinking_show_ui:toggle",
+    ...showThinkingUi ? { style: "primary" } : {}
+  }]);
+  await sendOrEditKeyboard(
+    chatId,
+    channel,
+    messageId,
+    `\u{1F4AD} Thinking Level \u2014 ${shortModelName(currentModel)}
+Current: ${capitalize(currentLevel)}
+Show thinking tokens: ${showThinkingUi ? "On" : "Off"}${adapter.id !== "claude" ? `
+
+\u26A0\uFE0F ${adapter.displayName} CLI doesn't stream thinking tokens` : ""}`,
+    buttons
+  );
 }
 async function sendSkillsPage(chatId, channel, skills2, page, messageId) {
   const approved = skills2.filter((s) => s.status === "approved");
@@ -20805,69 +21105,135 @@ async function sendMemoryPage(chatId, channel, page, messageId) {
     await channel.sendText(chatId, "No memories stored yet.", { parseMode: "plain" });
     return;
   }
-  const pageSize = 10;
+  const pageSize = 8;
   const totalPages = Math.max(1, Math.ceil(memories.length / pageSize));
   const safePage = Math.max(1, Math.min(page, totalPages));
   const start = (safePage - 1) * pageSize;
   const pageItems = memories.slice(start, start + pageSize);
-  const lines = [
-    `Memories (${memories.length} total, ${safePage === 1 ? "top " : ""}${pageItems.length} by relevance${totalPages > 1 ? ` \xB7 page ${safePage}/${totalPages}` : ""})`,
-    "\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501",
-    ""
-  ];
-  for (const [i, m] of pageItems.entries()) {
-    lines.push(`${start + i + 1}. ${m.trigger}: ${m.content.slice(0, 60)}${m.content.length > 60 ? "\u2026" : ""}`);
-  }
+  const header2 = `\u{1F9E0} Memories (${memories.length} total${totalPages > 1 ? ` \xB7 page ${safePage}/${totalPages}` : ""})`;
   const buttons = [];
-  const itemRow = [];
   for (const [i, m] of pageItems.entries()) {
-    itemRow.push({ label: `${start + i + 1}`, data: `mem:view:${m.id}` });
-    if (itemRow.length === 5) {
-      buttons.push([...itemRow]);
-      itemRow.length = 0;
-    }
+    const num = start + i + 1;
+    const preview = `${m.trigger}: ${m.content}`.slice(0, 32);
+    buttons.push([{
+      label: `${num}. ${preview}${m.content.length > 32 ? "\u2026" : ""}`,
+      data: `mem:view:${m.id}`
+    }]);
   }
-  if (itemRow.length > 0) buttons.push([...itemRow]);
   if (totalPages > 1) {
     const navRow = [];
     if (safePage > 1) navRow.push({ label: `\u2190 Page ${safePage - 1}`, data: `mem:page:${safePage - 1}` });
-    navRow.push({ label: `${safePage}/${totalPages}`, data: "mem:page:noop" });
+    navRow.push({ label: `${safePage}/${totalPages}`, data: "mem:noop" });
     if (safePage < totalPages) navRow.push({ label: `Page ${safePage + 1} \u2192`, data: `mem:page:${safePage + 1}` });
     buttons.push(navRow);
   }
-  const footerRow = [];
-  if (memories.length > 50) {
-    footerRow.push({ label: "Show All (file)", data: "mem:showall", style: "primary" });
+  const footerRow = [
+    { label: "\u{1F50D} Search", data: "mem:noop", switchInlineQueryCurrentChat: "" }
+  ];
+  if (memories.length > 30) {
+    footerRow.push({ label: "\u{1F4C4} Export All", data: "mem:showall", style: "primary" });
   }
-  footerRow.push({ label: "Search: /memory <query>", data: "mem:page:noop" });
   buttons.push(footerRow);
+  await sendOrEditKeyboard(chatId, channel, messageId, header2, buttons);
+}
+async function sendMemoryDetail(chatId, memoryId, channel, messageId) {
+  const memory2 = getMemoryById(memoryId);
+  if (!memory2) {
+    await sendOrEditKeyboard(chatId, channel, messageId, "This memory no longer exists.", [
+      [{ label: "\u2190 Back to List", data: "mem:back" }]
+    ]);
+    return;
+  }
+  const lines = [
+    `\u{1F9E0} Memory #${memory2.id}`,
+    buildSectionHeader("", 26),
+    "",
+    `Trigger: ${memory2.trigger}`,
+    `Content: ${memory2.content}`,
+    "",
+    `Salience: ${memory2.salience.toFixed(2)}  \xB7  Created: ${memory2.created_at.slice(0, 10)}`
+  ];
+  const buttons = [
+    [
+      { label: "\u270F\uFE0F Edit", data: `mem:edit:${memoryId}`, style: "primary" },
+      { label: "\u{1F5D1} Forget", data: `mem:forget:${memoryId}`, style: "danger" }
+    ],
+    [{ label: "\u2190 Back to List", data: "mem:back" }]
+  ];
   await sendOrEditKeyboard(chatId, channel, messageId, lines.join("\n"), buttons);
 }
-async function sendHeartbeatKeyboard(chatId, channel, messageId) {
+async function sendMemoryForgetConfirm(chatId, memoryId, channel, messageId) {
+  const memory2 = getMemoryById(memoryId);
+  if (!memory2) {
+    await sendOrEditKeyboard(chatId, channel, messageId, "Memory already deleted.", [
+      [{ label: "\u2190 Back to List", data: "mem:back" }]
+    ]);
+    return;
+  }
+  const lines = [
+    "Delete this memory?",
+    "",
+    `"${memory2.trigger}: ${memory2.content}"`
+  ];
+  const buttons = [
+    [
+      { label: "\u2705 Confirm Delete", data: `mem:forget:confirm:${memoryId}`, style: "danger" },
+      { label: "Cancel", data: `mem:view:${memoryId}` }
+    ]
+  ];
+  await sendOrEditKeyboard(chatId, channel, messageId, lines.join("\n"), buttons);
+}
+function getHeartbeatContext(chatId) {
+  const { findHeartbeatJob: findHeartbeatJob2 } = (init_heartbeat2(), __toCommonJS(heartbeat_exports));
+  const job = findHeartbeatJob2();
   const config2 = getHeartbeatConfig(chatId);
-  const enabled = config2?.enabled === 1;
-  const intervalMs = config2?.intervalMs ?? 18e5;
-  const intervalMin = intervalMs / 6e4;
-  const activeStart = config2?.activeStart ?? "08:00";
-  const activeEnd = config2?.activeEnd ?? "22:00";
   const watches = getActiveWatches(chatId);
-  const fallbacks = parseHeartbeatFallbacks(config2?.fallbacks ?? null);
-  const backendDisplay = config2?.backend ? capitalize(config2.backend) : "Default";
-  const modelDisplay = config2?.model ?? "default";
-  const thinkingDisplay = config2?.thinking ?? "off";
-  const lastBeat = config2?.lastBeatAt ? config2.lastBeatAt.replace("T", " ").slice(0, 16) : "never";
-  const watchNote = watches.length > 0 ? `  \xB7  ${watches.length} watch${watches.length !== 1 ? "es" : ""}` : "";
-  const fallbackNote = fallbacks.length > 0 ? `Fallbacks: ${fallbacks.map((f) => `${capitalize(f.backend)}${f.model ? ` (${shortModelName(f.model)})` : ""}`).join(" \u2192 ")}` : "";
-  const header2 = [
-    `\u{1FAC0} Heartbeat \u2014 ${enabled ? "ON" : "OFF"}  \xB7  Every ${intervalMin} min  \xB7  ${activeStart}\u2013${activeEnd}${watchNote}`,
-    `Backend: ${backendDisplay}  \xB7  Model: ${modelDisplay}  \xB7  Last: ${lastBeat}`,
-    fallbackNote
-  ].filter(Boolean).join("\n");
+  return {
+    job,
+    activeStart: config2?.activeStart ?? "08:00",
+    activeEnd: config2?.activeEnd ?? "22:00",
+    lastBeatAt: config2?.lastBeatAt ?? job?.lastRunAt ?? null,
+    watches
+  };
+}
+function formatEngine(job) {
+  if (!job) return "Not configured";
+  const backend2 = job.backend ?? "not set";
+  let modelName = job.model ?? "not set";
+  if (job.model) {
+    try {
+      modelName = shortModelName(job.model);
+    } catch {
+    }
+  }
+  return `${capitalize(backend2)} \xB7 ${modelName}`;
+}
+async function sendHeartbeatKeyboard(chatId, channel, messageId) {
+  const { job, activeStart, activeEnd, lastBeatAt, watches } = getHeartbeatContext(chatId);
+  const enabled = job ? !!job.enabled : false;
+  const intervalMin = job ? (job.everyMs ?? 18e5) / 6e4 : 30;
+  const fallbacks = job?.fallbacks ?? [];
+  const slotLabel = job?.credentialSlotId ? resolveSlotLabel(job.backend ?? void 0, job.credentialSlotId) : null;
+  const lastBeat = lastBeatAt ? String(lastBeatAt).replace("T", " ").slice(0, 16) : "never";
+  const lines = [
+    "\u{1FAC0} Heartbeat",
+    buildSectionHeader("", 26),
+    "",
+    `Status: ${enabled ? "ON" : "OFF"}  \xB7  Every ${intervalMin} min`,
+    `Hours: ${activeStart}\u2013${activeEnd}`,
+    `Engine: ${formatEngine(job)}`
+  ];
+  if (slotLabel) lines.push(`Account: ${slotLabel}`);
+  if (fallbacks.length > 0) {
+    lines.push(`Fallbacks: ${fallbacks.map((f) => `${capitalize(f.backend)}${f.model ? ` (${shortModelName(f.model)})` : ""}`).join(" \u2192 ")}`);
+  }
+  if (job?.thinking && job.thinking !== "auto") lines.push(`Thinking: ${job.thinking}`);
+  if (job?.timeout && job.timeout !== 120) lines.push(`Timeout: ${job.timeout}s`);
+  lines.push(`Last run: ${lastBeat}`);
   const buttons = [];
   buttons.push([
     { label: `${enabled ? "\u2713 " : ""}On`, data: "hb:on", ...enabled ? { style: "success" } : {} },
-    { label: `${!enabled ? "\u2713 " : ""}Off`, data: "hb:off", ...!enabled ? { style: "danger" } : {} },
-    { label: "\u25B6 Run Now", data: "hb:run", style: "primary" }
+    { label: `${!enabled ? "\u2713 " : ""}Off`, data: "hb:off", ...!enabled ? { style: "danger" } : {} }
   ]);
   const presets = [15, 30, 60, 120];
   buttons.push(presets.map((m) => ({
@@ -20875,63 +21241,225 @@ async function sendHeartbeatKeyboard(chatId, channel, messageId) {
     data: `hb:interval:${m}`,
     ...m === intervalMin ? { style: "primary" } : {}
   })));
-  const available = getAvailableBackendIds();
-  const backendRow = [
-    {
-      label: `${!config2?.backend ? "\u2713 " : ""}Default`,
-      data: "hb:backend:default",
-      ...!config2?.backend ? { style: "primary" } : {}
-    },
-    ...available.map((bid) => ({
-      label: `${config2?.backend === bid ? "\u2713 " : ""}${capitalize(bid)}`,
-      data: `hb:backend:${bid}`,
-      ...config2?.backend === bid ? { style: "primary" } : {}
-    }))
+  buttons.push([
+    { label: `\u23F0 Active Hours`, data: "hb:hours" },
+    { label: "\u25B6 Run Now", data: "hb:run", style: "primary" }
+  ]);
+  buttons.push([
+    { label: "\u{1F9E0} Engine & Account", data: "hb:engine" },
+    { label: `\u{1F517} Fallbacks${fallbacks.length > 0 ? ` (${fallbacks.length})` : ""}`, data: "hb:fallbacks" }
+  ]);
+  const row5 = [
+    { label: `\u{1F441} Watches${watches.length > 0 ? ` (${watches.length})` : ""}`, data: "hb:watches" },
+    { label: "\u23F1 Timeout", data: "hb:timeout" },
+    { label: "\u{1F4AD} Thinking", data: "hb:thinking" }
   ];
-  buttons.push(backendRow);
-  const targetBackend = config2?.backend ?? getBackend(chatId) ?? "claude";
-  try {
-    const adapter = getAdapter(targetBackend);
-    const models = Object.entries(adapter.availableModels);
-    if (models.length > 0) {
-      const modelRow = [
-        {
-          label: `${!config2?.model ? "\u2713 " : ""}Default`,
-          data: "hb:model:default",
-          ...!config2?.model ? { style: "primary" } : {}
-        },
-        ...models.slice(0, 4).map(([key]) => ({
-          label: `${config2?.model === key ? "\u2713 " : ""}${shortModelName(key)}`,
+  buttons.push(row5);
+  await sendOrEditKeyboard(chatId, channel, messageId, lines.join("\n"), buttons);
+}
+async function sendHeartbeatEngine(chatId, channel, messageId) {
+  const { job } = getHeartbeatContext(chatId);
+  const currentBackend = job?.backend ?? null;
+  const currentModel = job?.model ?? null;
+  const slotLabel = job?.credentialSlotId ? resolveSlotLabel(currentBackend ?? void 0, job.credentialSlotId) : "Auto (rotate)";
+  const lines = [
+    "\u{1FAC0} Heartbeat \u203A Engine & Account",
+    buildSectionHeader("", 26),
+    "",
+    `Backend: ${currentBackend ? capitalize(currentBackend) : "\u26A0\uFE0F Not set"}`,
+    `Model: ${currentModel ? shortModelName(currentModel) : "\u26A0\uFE0F Not set"}`,
+    `Account: ${slotLabel}`
+  ];
+  const buttons = [];
+  const available = getAvailableBackendIds();
+  const backendBtns = available.map((bid) => ({
+    label: `${currentBackend === bid ? "\u2713 " : ""}${capitalize(bid)}`,
+    data: `hb:backend:${bid}`,
+    ...currentBackend === bid ? { style: "primary" } : {}
+  }));
+  for (let i = 0; i < backendBtns.length; i += 3) {
+    buttons.push(backendBtns.slice(i, i + 3));
+  }
+  if (currentBackend) {
+    try {
+      const adapter = getAdapter(currentBackend);
+      const models = Object.entries(adapter.availableModels);
+      if (models.length > 0) {
+        buttons.push([{ label: "\u2500\u2500 Model \u2500\u2500", data: "hb:noop" }]);
+        const modelBtns = models.map(([key]) => ({
+          label: `${currentModel === key ? "\u2713 " : ""}${shortModelName(key)}`,
           data: `hb:model:${key}`,
-          ...config2?.model === key ? { style: "primary" } : {}
-        }))
-      ];
-      buttons.push(modelRow);
+          ...currentModel === key ? { style: "primary" } : {}
+        }));
+        for (let i = 0; i < modelBtns.length; i += 3) {
+          buttons.push(modelBtns.slice(i, i + 3));
+        }
+      }
+    } catch {
     }
-  } catch {
+    const isGemini = currentBackend === "gemini";
+    const slots = isGemini ? getGeminiSlots() : getBackendSlots(currentBackend);
+    const enabledSlots = slots.filter((s) => s.enabled !== 0);
+    if (enabledSlots.length > 0) {
+      buttons.push([{ label: "\u2500\u2500 Account \u2500\u2500", data: "hb:noop" }]);
+      buttons.push([{
+        label: `${!job?.credentialSlotId ? "\u2713 " : ""}Auto (rotate)`,
+        data: "hb:slot:auto",
+        ...!job?.credentialSlotId ? { style: "primary" } : {}
+      }]);
+      for (const s of enabledSlots) {
+        const icon = s.slotType === "api_key" ? "\u{1F511}" : "\u{1F4E7}";
+        const label2 = s.label || s.email || `Slot #${s.id}`;
+        buttons.push([{
+          label: `${job?.credentialSlotId === s.id ? "\u2713 " : ""}${icon} ${label2}`,
+          data: `hb:slot:${s.id}`,
+          ...job?.credentialSlotId === s.id ? { style: "primary" } : {}
+        }]);
+      }
+    }
+  } else {
+    buttons.push([{ label: "\u26A0\uFE0F Pick a backend first", data: "hb:noop" }]);
   }
-  const fbCandidates = available.filter((bid) => !fallbacks.some((f) => f.backend === bid) && bid !== config2?.backend);
+  buttons.push([{ label: "\u2190 Back", data: "hb:back" }]);
+  await sendOrEditKeyboard(chatId, channel, messageId, lines.join("\n"), buttons);
+}
+async function sendHeartbeatFallbacks(chatId, channel, messageId) {
+  const { job } = getHeartbeatContext(chatId);
+  const fallbacks = job?.fallbacks ?? [];
+  const currentBackend = job?.backend ?? null;
+  const lines = [
+    "\u{1FAC0} Heartbeat \u203A Fallbacks",
+    buildSectionHeader("", 26),
+    "",
+    "If the primary backend is unavailable,",
+    "these fire in order:",
+    ""
+  ];
   if (fallbacks.length > 0) {
-    buttons.push([
-      { label: `\u{1F504} ${fallbacks.map((f) => capitalize(f.backend)).join(" \u2192 ")}`, data: "hb:noop" },
-      { label: "\u2715 Clear", data: "hb:fb:clear", style: "danger" }
-    ]);
+    for (let i = 0; i < fallbacks.length; i++) {
+      const f = fallbacks[i];
+      const model2 = f.model ? ` (${shortModelName(f.model)})` : "";
+      lines.push(`  ${i + 1}. ${capitalize(f.backend)}${model2}`);
+    }
+  } else {
+    lines.push("  (none configured)");
   }
-  if (fbCandidates.length > 0) {
-    buttons.push(fbCandidates.slice(0, 4).map((bid) => ({
-      label: `+ ${capitalize(bid)} fallback`,
+  const buttons = [];
+  const available = getAvailableBackendIds();
+  const used = new Set([currentBackend, ...fallbacks.map((f) => f.backend)].filter(Boolean));
+  const candidates = available.filter((bid) => !used.has(bid));
+  if (candidates.length > 0) {
+    const addBtns = candidates.map((bid) => ({
+      label: `+ ${capitalize(bid)}`,
       data: `hb:fb:add:${bid}`
-    })));
+    }));
+    for (let i = 0; i < addBtns.length; i += 3) {
+      buttons.push(addBtns.slice(i, i + 3));
+    }
   }
-  const optionsRow = [];
+  if (fallbacks.length > 0) {
+    buttons.push([{ label: "\u2715 Clear All", data: "hb:fb:clear", style: "danger" }]);
+  }
+  buttons.push([{ label: "\u2190 Back", data: "hb:back" }]);
+  await sendOrEditKeyboard(chatId, channel, messageId, lines.join("\n"), buttons);
+}
+async function sendHeartbeatHours(chatId, channel, messageId) {
+  const config2 = getHeartbeatConfig(chatId);
+  const activeStart = config2?.activeStart ?? "08:00";
+  const activeEnd = config2?.activeEnd ?? "22:00";
+  const lines = [
+    "\u{1FAC0} Heartbeat \u203A Active Hours",
+    buildSectionHeader("", 26),
+    "",
+    `Current: ${activeStart}\u2013${activeEnd}`,
+    "Heartbeat only runs during these hours."
+  ];
+  const startHours = ["06:00", "07:00", "08:00", "09:00", "10:00"];
+  const endHours = ["20:00", "21:00", "22:00", "23:00", "00:00"];
+  const buttons = [];
+  buttons.push([{ label: "\u2500\u2500 Start \u2500\u2500", data: "hb:noop" }]);
+  buttons.push(startHours.map((h) => ({
+    label: `${h === activeStart ? "\u2713 " : ""}${h}`,
+    data: `hb:hstart:${h}`,
+    ...h === activeStart ? { style: "primary" } : {}
+  })));
+  buttons.push([{ label: "\u2500\u2500 End \u2500\u2500", data: "hb:noop" }]);
+  buttons.push(endHours.map((h) => ({
+    label: `${h === activeEnd ? "\u2713 " : ""}${h}`,
+    data: `hb:hend:${h}`,
+    ...h === activeEnd ? { style: "primary" } : {}
+  })));
+  buttons.push([{ label: "\u2190 Back", data: "hb:back" }]);
+  await sendOrEditKeyboard(chatId, channel, messageId, lines.join("\n"), buttons);
+}
+async function sendHeartbeatTimeout(chatId, channel, messageId) {
+  const { job } = getHeartbeatContext(chatId);
+  const current = job?.timeout ?? 120;
+  const lines = [
+    "\u{1FAC0} Heartbeat \u203A Timeout",
+    buildSectionHeader("", 26),
+    "",
+    `Current: ${current}s (${Math.round(current / 60)} min)`,
+    "Max time per heartbeat check."
+  ];
+  const presets = [60, 120, 300, 600];
+  const buttons = [];
+  buttons.push(presets.map((s) => ({
+    label: `${s === current ? "\u2713 " : ""}${s >= 60 ? `${Math.round(s / 60)} min` : `${s}s`}`,
+    data: `hb:tout:${s}`,
+    ...s === current ? { style: "primary" } : {}
+  })));
+  buttons.push([{ label: "\u2190 Back", data: "hb:back" }]);
+  await sendOrEditKeyboard(chatId, channel, messageId, lines.join("\n"), buttons);
+}
+async function sendHeartbeatThinking(chatId, channel, messageId) {
+  const { job } = getHeartbeatContext(chatId);
+  const current = job?.thinking ?? "auto";
+  const lines = [
+    "\u{1FAC0} Heartbeat \u203A Thinking Level",
+    buildSectionHeader("", 26),
+    "",
+    `Current: ${current}`,
+    "Reasoning depth for heartbeat checks."
+  ];
+  const levels = ["auto", "off", "low", "medium", "high"];
+  const buttons = [];
+  buttons.push(levels.slice(0, 3).map((l) => ({
+    label: `${l === current ? "\u2713 " : ""}${capitalize(l)}`,
+    data: `hb:think:${l}`,
+    ...l === current ? { style: "primary" } : {}
+  })));
+  buttons.push(levels.slice(3).map((l) => ({
+    label: `${l === current ? "\u2713 " : ""}${capitalize(l)}`,
+    data: `hb:think:${l}`,
+    ...l === current ? { style: "primary" } : {}
+  })));
+  buttons.push([{ label: "\u2190 Back", data: "hb:back" }]);
+  await sendOrEditKeyboard(chatId, channel, messageId, lines.join("\n"), buttons);
+}
+async function sendHeartbeatWatches(chatId, channel, messageId) {
+  const watches = getActiveWatches(chatId);
+  const lines = [
+    "\u{1FAC0} Heartbeat \u203A Watches",
+    buildSectionHeader("", 26),
+    ""
+  ];
   if (watches.length > 0) {
-    optionsRow.push({ label: `\u{1F441} Watches (${watches.length})`, data: "hb:watches" });
+    for (const w of watches) {
+      const expiry = w.expiresAt ? ` (until ${w.expiresAt.slice(0, 16)})` : "";
+      lines.push(`  ${w.id}. ${w.description}${expiry}`);
+    }
+    lines.push("");
+    lines.push("Remove: /watch remove <id>");
   } else {
-    optionsRow.push({ label: "\u{1F441} Add Watch", data: "hb:addwatch" });
+    lines.push("  (no active watches)");
   }
-  optionsRow.push({ label: `\u23F0 Hours: ${activeStart}\u2013${activeEnd}`, data: "hb:noop" });
-  buttons.push(optionsRow);
-  await sendOrEditKeyboard(chatId, channel, messageId, header2, buttons);
+  lines.push("");
+  lines.push("Add: /watch add <description>");
+  lines.push("Example: /watch add Check email for urgent messages");
+  const buttons = [];
+  buttons.push([{ label: "\u2190 Back", data: "hb:back" }]);
+  await sendOrEditKeyboard(chatId, channel, messageId, lines.join("\n"), buttons);
 }
 async function sendForgetPicker(chatId, channel, page, messageId) {
   const memories = listMemories();
@@ -21159,94 +21687,223 @@ async function sendJobPicker(chatId, channel, action) {
   buttons.push([{ label: "Cancel", data: "job:back" }]);
   await channel.sendKeyboard(chatId, `${actionLabel} which job?`, buttons);
 }
-async function sendCurrentProposal(chatId, channel) {
-  const { getReviewSession: getReviewSession2, getInsightById: getInsightById2, deleteReviewSession: deleteReviewSession2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
+async function sendCurrentProposal(chatId, channel, messageId) {
+  const { getReviewSession: getReviewSession2, getInsightById: getInsightById2, deleteReviewSession: deleteReviewSession2, advanceReviewSession: advanceReviewSession2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
   const { formatProposalCardWithProgress: formatProposalCardWithProgress2, buildProposalKeyboard: buildProposalKeyboard2, buildReviewCompleteMessage: buildReviewCompleteMessage3 } = await Promise.resolve().then(() => (init_propose(), propose_exports));
   const session2 = getReviewSession2(getDb(), chatId);
   if (!session2) return;
   if (session2.currentIndex >= session2.insightIds.length) {
     const summary = buildReviewCompleteMessage3(session2.results);
     deleteReviewSession2(getDb(), chatId);
-    await channel.sendText(chatId, summary, { parseMode: "plain" });
+    await sendOrEditKeyboard(
+      chatId,
+      channel,
+      messageId,
+      summary,
+      [[{ label: "\u2190 Back to Dashboard", data: "evolve:menu" }]]
+    );
     return;
   }
   const insightId = session2.insightIds[session2.currentIndex];
   const insight = getInsightById2(getDb(), insightId);
   if (!insight || insight.status !== "pending") {
-    const { advanceReviewSession: advanceReviewSession2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
     advanceReviewSession2(getDb(), chatId, insightId, "skipped");
-    return sendCurrentProposal(chatId, channel);
+    return sendCurrentProposal(chatId, channel, messageId);
   }
   const card = formatProposalCardWithProgress2(insight, session2.currentIndex, session2.insightIds.length);
-  const kb = buildProposalKeyboard2(insight.id, insight.category);
-  await channel.sendKeyboard(chatId, card, kb);
+  const kb = [
+    ...buildProposalKeyboard2(insight.id, insight.category),
+    [{ label: "\u2190 Dashboard", data: "evolve:menu" }]
+  ];
+  await sendOrEditKeyboard(chatId, channel, messageId, card, kb);
+}
+function resolveBackendAccountLabel(chatId, backendId) {
+  if (backendId === "gemini") {
+    const slotId2 = getChatGeminiSlotId(chatId);
+    if (slotId2 == null) return "Auto";
+    const slots2 = getGeminiSlots();
+    const slot2 = slots2.find((s) => s.id === slotId2);
+    return slot2?.label ?? `slot-${slotId2}`;
+  }
+  const slotId = getChatBackendSlotId(chatId, backendId);
+  if (slotId == null) return "Auto";
+  const slots = getBackendSlots(backendId);
+  const slot = slots.find((s) => s.id === slotId);
+  return slot?.label ?? `slot-${slotId}`;
+}
+function backendPickerLabel(chatId, backendId, currentBackend) {
+  const adapter = getAdapter(backendId);
+  const model2 = backendId === currentBackend ? getModel(chatId) ?? adapter.defaultModel : adapter.defaultModel;
+  const modelInfo = adapter.availableModels[model2];
+  const modelShort = modelInfo?.label ?? model2;
+  const thinking2 = backendId === currentBackend ? getThinkingLevel(chatId) ?? "auto" : "auto";
+  const account = resolveBackendAccountLabel(chatId, backendId);
+  const active = backendId === currentBackend ? "\u2713 " : "";
+  return `${active}${adapter.displayName} \xB7 ${modelShort} \xB7 ${capitalize(thinking2)} \xB7 ${account}`;
+}
+function backendConfigSummary(chatId, backendId, switched) {
+  const adapter = getAdapter(backendId);
+  const model2 = getModel(chatId) ?? adapter.defaultModel;
+  const modelInfo = adapter.availableModels[model2];
+  const modelLabel = modelInfo?.label ?? model2;
+  const thinking2 = getThinkingLevel(chatId) ?? "auto";
+  const account = resolveBackendAccountLabel(chatId, backendId);
+  const header2 = switched ? `\u2705 Switched to ${adapter.displayName}` : `\u2699\uFE0F ${adapter.displayName}`;
+  return `${header2}
+
+Model: ${modelLabel}
+Thinking: ${capitalize(thinking2)}
+Account: ${account}`;
 }
-async function sendBackendSwitchConfirmation(chatId, target, channel) {
-  const current = getBackend(chatId);
-  const targetAdapter = getAdapter(target);
-  if (current === target) {
-    await channel.sendText(chatId, `Already using ${targetAdapter.displayName}.`, { parseMode: "plain" });
+async function sendBackendPicker(chatId, channel, messageId) {
+  if (typeof channel.sendKeyboard !== "function") return;
+  const currentBackend = getBackend(chatId) ?? "";
+  const ids = getAvailableChatBackendIds();
+  const buttons = ids.map((id) => [{
+    label: backendPickerLabel(chatId, id, currentBackend),
+    data: `backend:${id}`,
+    ...id === currentBackend ? { style: "primary" } : {}
+  }]);
+  await sendOrEditKeyboard(chatId, channel, messageId, "Select AI backend:", buttons);
+}
+async function sendBackendConfigPanel(chatId, backendId, channel, messageId, switched = false) {
+  if (typeof channel.sendKeyboard !== "function") return;
+  const summary = backendConfigSummary(chatId, backendId, switched);
+  const buttons = [
+    [
+      { label: "Model", data: `bconf:model:${backendId}` },
+      { label: "Thinking", data: `bconf:thinking:${backendId}` },
+      { label: "Account", data: `bconf:account:${backendId}` }
+    ],
+    [{ label: "\u2190 Back to Backends", data: "bconf:back" }]
+  ];
+  await sendOrEditKeyboard(chatId, channel, messageId, summary, buttons);
+}
+async function sendBackendModelPicker(chatId, backendId, channel, messageId) {
+  if (typeof channel.sendKeyboard !== "function") return;
+  const adapter = getAdapter(backendId);
+  const currentModel = getModel(chatId) ?? adapter.defaultModel;
+  const summary = backendConfigSummary(chatId, backendId, false);
+  const modelButtons = Object.entries(adapter.availableModels).map(([id, info]) => [{
+    label: `${id === currentModel ? "\u2713 " : ""}${info.label}`,
+    data: `bconf:setmodel:${backendId}:${id}`,
+    ...id === currentModel ? { style: "primary" } : {}
+  }]);
+  modelButtons.push([{ label: "\u2190 Back", data: `bconf:panel:${backendId}` }]);
+  await sendOrEditKeyboard(chatId, channel, messageId, `${summary}
+
+Pick a model:`, modelButtons);
+}
+async function sendBackendThinkingPicker(chatId, backendId, channel, messageId) {
+  if (typeof channel.sendKeyboard !== "function") return;
+  const adapter = getAdapter(backendId);
+  const currentModel = getModel(chatId) ?? adapter.defaultModel;
+  const modelInfo = adapter.availableModels[currentModel];
+  const supportsThinking = modelInfo?.thinking === "adjustable";
+  const summary = backendConfigSummary(chatId, backendId, false);
+  if (!supportsThinking) {
+    await sendOrEditKeyboard(
+      chatId,
+      channel,
+      messageId,
+      `${summary}
+
+\u26A0\uFE0F Thinking is fixed for ${modelInfo?.label ?? currentModel}.`,
+      [[{ label: "\u2190 Back", data: `bconf:panel:${backendId}` }]]
+    );
     return;
   }
-  if (typeof channel.sendKeyboard === "function") {
-    await channel.sendKeyboard(
+  const current = getThinkingLevel(chatId) ?? "auto";
+  const levels = [
+    ["auto", "Auto"],
+    ["off", "Off"],
+    ["low", "Low"],
+    ["medium", "Medium"],
+    ["high", "High"],
+    ["extra_high", "Extra High"]
+  ];
+  const buttons = levels.map(([val, label2]) => [{
+    label: `${val === current ? "\u2713 " : ""}${label2}`,
+    data: `bconf:setthinking:${backendId}:${val}`,
+    ...val === current ? { style: "primary" } : {}
+  }]);
+  buttons.push([{ label: "\u2190 Back", data: `bconf:panel:${backendId}` }]);
+  await sendOrEditKeyboard(chatId, channel, messageId, `${summary}
+
+Pick thinking level:`, buttons);
+}
+async function sendBackendAccountPicker(chatId, backendId, channel, messageId) {
+  if (typeof channel.sendKeyboard !== "function") return;
+  const summary = backendConfigSummary(chatId, backendId, false);
+  const isGemini = backendId === "gemini";
+  const slots = isGemini ? getGeminiSlots() : getBackendSlots(backendId);
+  const enabledSlots = slots.filter((s) => s.enabled !== 0 && s.enabled !== false);
+  if (enabledSlots.length === 0) {
+    await sendOrEditKeyboard(
       chatId,
-      `\u{1F504} Switch to ${targetAdapter.displayName}?
-Your conversation history is preserved. ${targetAdapter.displayName} will receive a summary of recent context and can access your full history on request.`,
-      [
-        [
-          { label: `Switch to ${targetAdapter.displayName}`, data: `backend_confirm:${target}`, style: "primary" },
-          { label: `Switch + Clear History`, data: `backend_confirm_clear:${target}`, style: "primary" }
-        ],
-        [{ label: "Cancel", data: `backend_cancel:${target}` }]
-      ]
+      channel,
+      messageId,
+      `${summary}
+
+\u26A0\uFE0F No accounts configured. Add one via /accounts.`,
+      [[{ label: "\u2190 Back", data: `bconf:panel:${backendId}` }]]
     );
-  } else {
-    await doBackendSwitch(chatId, target, channel);
+    return;
   }
+  const activeSlotId = isGemini ? getChatGeminiSlotId(chatId) : getChatBackendSlotId(chatId, backendId);
+  const buttons = enabledSlots.map((s) => {
+    const label2 = s.label ?? `slot-${s.id}`;
+    const icon = (s.slotType ?? s.slot_type) === "oauth" ? "\u{1F464}" : "\u{1F511}";
+    const active = activeSlotId === s.id;
+    return [{
+      label: `${active ? "\u2713 " : ""}${icon} ${label2}`,
+      data: `bconf:setaccount:${backendId}:${s.id}`,
+      ...active ? { style: "primary" } : {}
+    }];
+  });
+  buttons.push([{ label: "\u2190 Auto (rotate)", data: `bconf:setaccount:${backendId}:auto` }]);
+  buttons.push([{ label: "\u2190 Back", data: `bconf:panel:${backendId}` }]);
+  await sendOrEditKeyboard(chatId, channel, messageId, `${summary}
+
+Pick an account:`, buttons);
 }
-async function doBackendSwitch(chatId, backendId, channel) {
-  const targetAdapter = getAdapter(backendId);
-  const pairCount = getMessagePairCount(chatId);
-  if (pairCount >= 2) {
-    await channel.sendText(chatId, `\u23F3 Saving context...`, { parseMode: "plain" });
-  }
-  const summarized = await summarizeWithFallbackChain(chatId, backendId);
-  const bridge = buildContextBridge(chatId);
-  if (bridge) {
-    setPendingContextBridge(chatId, bridge);
+async function sendBackendSwitchConfirmation(chatId, target, channel, messageId) {
+  const current = getBackend(chatId);
+  const targetAdapter = getAdapter(target);
+  if (current === target) {
+    await sendBackendConfigPanel(chatId, target, channel, messageId, false);
+    return;
   }
-  if (summarized) {
-    await channel.sendText(chatId, "\u{1F4BE} Context saved \u2014 session summarized to memory.", { parseMode: "plain" });
-  } else if (bridge) {
-    await channel.sendText(chatId, "\u{1F4AC} Context preserved.", { parseMode: "plain" });
+  await doBackendSwitch(chatId, target, channel, { messageId });
+}
+async function doBackendSwitch(chatId, backendId, channel, opts) {
+  const targetAdapter = getAdapter(backendId);
+  if (!opts?.skipContext) {
+    const pairCount = getMessagePairCount(chatId);
+    if (pairCount >= 2) {
+      if (opts?.messageId && typeof channel.editKeyboard === "function") {
+        await channel.editKeyboard(chatId, opts.messageId, `\u23F3 Saving context before switching to ${targetAdapter.displayName}...`, []);
+      } else {
+        await channel.sendText(chatId, `\u23F3 Saving context...`, { parseMode: "plain" });
+      }
+    }
+    const summarized = await summarizeWithFallbackChain(chatId, backendId);
+    const bridge = buildContextBridge(chatId);
+    if (bridge) setPendingContextBridge(chatId, bridge);
   }
   clearSession(chatId);
   clearModel(chatId);
   clearThinkingLevel(chatId);
-  if (backendId !== "gemini") {
-    clearChatGeminiSlot(chatId);
-  }
+  if (backendId !== "gemini") clearChatGeminiSlot(chatId);
   setBackend(chatId, backendId);
-  logActivity(getDb(), { chatId, source: "telegram", eventType: "config_changed", summary: `Backend switched to ${targetAdapter.displayName}`, detail: { field: "backend", value: backendId } });
-  if (typeof channel.sendKeyboard === "function") {
-    const models = targetAdapter.availableModels;
-    const modelButtons = Object.entries(models).map(([id, info]) => {
-      const tag = info.thinking === "adjustable" ? " \u26A1" : "";
-      return { label: `${info.label}${tag}`, data: `model:${id}` };
-    });
-    const rows = modelButtons.map((b) => [b]);
-    rows.push([{ label: "\u2705 Use Default", data: `backend_dismiss:${backendId}` }]);
-    await channel.sendKeyboard(
-      chatId,
-      `\u2705 Switched to ${targetAdapter.displayName}.
-
-Choose a model (optional):`,
-      rows
-    );
-  } else {
-    await channel.sendText(chatId, `\u2705 Switched to ${targetAdapter.displayName}. Ready!`, { parseMode: "plain" });
-  }
+  logActivity(getDb(), {
+    chatId,
+    source: "telegram",
+    eventType: "config_changed",
+    summary: `Backend switched to ${targetAdapter.displayName}`,
+    detail: { field: "backend", value: backendId }
+  });
+  await sendBackendConfigPanel(chatId, backendId, channel, opts?.messageId, true);
 }
 var ROTATION_MODE_LABELS, ROTATION_MODE_CONFIRM_LABELS;
 var init_ui = __esm({
@@ -21255,6 +21912,7 @@ var init_ui = __esm({
     init_format();
     init_backends();
     init_store5();
+    init_chat_settings();
     init_summarize();
     init_inject();
     init_session_log();
@@ -21299,237 +21957,285 @@ var init_resolve = __esm({
 
 // src/router/evolve.ts
 import { homedir as homedir6 } from "os";
-async function handleEvolveCommand(chatId, channel) {
-  const { getReflectionStatus: getRefStatus, getUnprocessedSignalCount: getUnprocessedSignalCount2, getPendingInsightCount: getPendingInsightCount2, getLastAnalysisTime: getLastAnalysisTime2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
+function relativeTime(isoUtc) {
+  const diffMs = Date.now() - (/* @__PURE__ */ new Date(isoUtc + "Z")).getTime();
+  const h = Math.floor(diffMs / 36e5);
+  if (h < 1) return "< 1 hour ago";
+  if (h < 24) return `${h}h ago`;
+  return `${Math.floor(h / 24)}d ago`;
+}
+async function getReflectionChatId(chatId) {
   const { getPrimaryChatId: getPrimaryChatId2 } = await Promise.resolve().then(() => (init_resolve(), resolve_exports));
-  const reflectionChatId = getPrimaryChatId2() || chatId;
-  const isActive = getRefStatus(getDb(), reflectionChatId) === "active";
-  if (!isActive) {
-    const text = [
-      "Self-Learning & Evolution",
-      "\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501",
-      "",
-      "Teach your assistant to improve over time.",
-      "",
-      "When enabled, CC-Claw watches for corrections,",
-      "preferences, and frustration in your messages,",
-      "then proposes changes to its personality and",
-      "behavior files (SOUL.md, USER.md).",
-      "",
-      "You review and approve every change."
-    ].join("\n");
-    if (typeof channel.sendKeyboard === "function") {
-      const { buildEvolveOnboardingKeyboard: buildEvolveOnboardingKeyboard2 } = await Promise.resolve().then(() => (init_propose(), propose_exports));
-      await channel.sendKeyboard(chatId, text, buildEvolveOnboardingKeyboard2());
-    } else {
-      await channel.sendText(chatId, text + "\n\nUse /evolve enable to activate.", { parseMode: "plain" });
-    }
-  } else {
-    await sendEvolveDashboard(chatId, reflectionChatId, channel);
-  }
+  return getPrimaryChatId2() || chatId;
 }
-async function sendEvolveDashboard(chatId, reflectionChatId, channel) {
+async function buildDashboardView(chatId, reflChatId) {
   const { getUnprocessedSignalCount: getUnprocessedSignalCount2, getPendingInsightCount: getPendingInsightCount2, getLastAnalysisTime: getLastAnalysisTime2, getReflectionModelConfig: getReflectionModelConfig2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
-  const signals = getUnprocessedSignalCount2(getDb(), reflectionChatId);
-  const pending = getPendingInsightCount2(getDb(), reflectionChatId);
-  const lastTime = getLastAnalysisTime2(getDb(), reflectionChatId);
-  let lastText = "never";
-  if (lastTime) {
-    const diffMs = Date.now() - (/* @__PURE__ */ new Date(lastTime + "Z")).getTime();
-    const diffHours = Math.floor(diffMs / 36e5);
-    if (diffHours < 1) lastText = "< 1 hour ago";
-    else if (diffHours < 24) lastText = `${diffHours}h ago`;
-    else lastText = `${Math.floor(diffHours / 24)}d ago`;
-  }
-  const modelConfig = getReflectionModelConfig2(getDb(), reflectionChatId);
-  const modelLabel = modelConfig.mode === "pinned" && modelConfig.backend && modelConfig.model ? `Pinned: ${modelConfig.backend}/${modelConfig.model}` : modelConfig.mode === "cheap" ? "Cheap" : "Auto";
-  const dashText = [
+  const signals = getUnprocessedSignalCount2(getDb(), reflChatId);
+  const pending = getPendingInsightCount2(getDb(), reflChatId);
+  const lastTime = getLastAnalysisTime2(getDb(), reflChatId);
+  const lastText = lastTime ? relativeTime(lastTime) : "never";
+  const modelConfig = getReflectionModelConfig2(getDb(), reflChatId);
+  const modelLabel = modelConfig.mode === "pinned" && modelConfig.backend && modelConfig.model ? `${modelConfig.backend}/${modelConfig.model}` : modelConfig.mode === "cheap" ? "Cheap" : "Auto";
+  const text = [
     "Self-Learning & Evolution",
     "\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501",
     "",
-    `\u2705 Active`,
+    "\u2705 Active",
     `Signals: ${signals} pending  \xB7  Proposals: ${pending}`,
     `Last analysis: ${lastText}`,
     `Model: ${modelLabel}`
   ].join("\n");
-  if (typeof channel.sendKeyboard === "function") {
-    const { buildEvolveMenuKeyboard: buildEvolveMenuKeyboard2 } = await Promise.resolve().then(() => (init_propose(), propose_exports));
-    await channel.sendKeyboard(chatId, dashText, buildEvolveMenuKeyboard2({ pendingProposals: pending, unprocessedSignals: signals }));
+  const reviewLabel = pending > 0 ? `Review (${pending})` : "Review";
+  const buttons = [
+    [
+      { label: "\u{1F50D} Analyze Now", data: "evolve:analyze", style: "success" },
+      { label: reviewLabel, data: "evolve:review", ...pending > 0 ? { style: "primary" } : {} }
+    ],
+    [
+      { label: "Stats", data: "evolve:stats" },
+      { label: "History", data: "evolve:history" }
+    ],
+    [
+      { label: "Model", data: "evolve:model" },
+      { label: "Undo", data: "evolve:undo" },
+      { label: "\u23F8 Disable", data: "evolve:toggle", style: "danger" }
+    ]
+  ];
+  return { text, buttons };
+}
+async function sendEvolveDashboard(chatId, reflChatId, channel, messageId) {
+  const { text, buttons } = await buildDashboardView(chatId, reflChatId);
+  await sendOrEditKeyboard(chatId, channel, messageId, text, buttons);
+}
+function buildOnboardingView() {
+  const text = [
+    "Self-Learning & Evolution",
+    "\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501",
+    "",
+    "Teach your assistant to improve over time.",
+    "",
+    "CC-Claw watches for corrections, preferences,",
+    "and frustration in your messages, then proposes",
+    "changes to its personality files (SOUL.md, USER.md).",
+    "",
+    "You review and approve every change."
+  ].join("\n");
+  const buttons = [
+    [{ label: "\u2705 Enable Self-Learning", data: "evolve:toggle", style: "success" }],
+    [{ label: "One-Time Analysis", data: "evolve:analyze" }]
+  ];
+  return { text, buttons };
+}
+async function sendCurrentProposalInPlace(chatId, channel, messageId) {
+  const { getReviewSession: getReviewSession2, getInsightById: getInsightById2, deleteReviewSession: deleteReviewSession2, advanceReviewSession: advanceReviewSession2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
+  const { formatProposalCardWithProgress: formatProposalCardWithProgress2, buildProposalKeyboard: buildProposalKeyboard2, buildReviewCompleteMessage: buildReviewCompleteMessage3 } = await Promise.resolve().then(() => (init_propose(), propose_exports));
+  const reflChatId = await getReflectionChatId(chatId);
+  const session2 = getReviewSession2(getDb(), chatId);
+  if (!session2) {
+    await sendEvolveDashboard(chatId, reflChatId, channel, messageId);
+    return;
+  }
+  if (session2.currentIndex >= session2.insightIds.length) {
+    const summary = buildReviewCompleteMessage3(session2.results);
+    deleteReviewSession2(getDb(), chatId);
+    const buttons = [[{ label: "\u2190 Back to Dashboard", data: "evolve:menu" }]];
+    await sendOrEditKeyboard(chatId, channel, messageId, summary, buttons);
+    return;
+  }
+  const insightId = session2.insightIds[session2.currentIndex];
+  const insight = getInsightById2(getDb(), insightId);
+  if (!insight || insight.status !== "pending") {
+    advanceReviewSession2(getDb(), chatId, insightId, "skipped");
+    return sendCurrentProposalInPlace(chatId, channel, messageId);
+  }
+  const card = formatProposalCardWithProgress2(insight, session2.currentIndex, session2.insightIds.length);
+  const kb = [
+    ...buildProposalKeyboard2(insight.id, insight.category),
+    [{ label: "\u2190 Dashboard", data: "evolve:menu" }]
+  ];
+  await sendOrEditKeyboard(chatId, channel, messageId, card, kb);
+}
+async function handleEvolveCommand(chatId, channel) {
+  const { getReflectionStatus: getReflectionStatus2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
+  const reflChatId = await getReflectionChatId(chatId);
+  const isActive = getReflectionStatus2(getDb(), reflChatId) === "active";
+  if (typeof channel.sendKeyboard !== "function") {
+    await channel.sendText(chatId, isActive ? "Use /evolve buttons to manage self-learning." : "Self-learning disabled. Use /evolve enable.", { parseMode: "plain" });
+    return;
+  }
+  if (!isActive) {
+    const { text, buttons } = buildOnboardingView();
+    await channel.sendKeyboard(chatId, text, buttons);
   } else {
-    await channel.sendText(chatId, dashText, { parseMode: "plain" });
+    await sendEvolveDashboard(chatId, reflChatId, channel);
   }
 }
-async function handleEvolveCallback(chatId, data, channel) {
+async function handleEvolveCallback(chatId, data, channel, messageId) {
   const parts = data.split(":");
   const action = parts[1];
   const idStr = parts[2];
   if (action !== "discuss") {
-    const { clearDiscussionMode: clearStale } = await Promise.resolve().then(() => (init_store4(), store_exports4));
-    clearStale(chatId);
+    const { clearDiscussionMode: clearDiscussionMode2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
+    clearDiscussionMode2(chatId);
   }
+  const reflChatId = await getReflectionChatId(chatId);
   switch (action) {
     case "menu": {
-      const { getReflectionStatus: getRefStatus } = await Promise.resolve().then(() => (init_store4(), store_exports4));
-      const { getPrimaryChatId: getPrimaryChatId2 } = await Promise.resolve().then(() => (init_resolve(), resolve_exports));
-      const reflChatId = getPrimaryChatId2() || chatId;
-      const menuActive = getRefStatus(getDb(), reflChatId) === "active";
-      if (!menuActive) {
-        const { buildEvolveOnboardingKeyboard: buildEvolveOnboardingKeyboard2 } = await Promise.resolve().then(() => (init_propose(), propose_exports));
-        const text = [
-          "Self-Learning & Evolution",
-          "\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501",
-          "",
-          "Teach your assistant to improve over time.",
-          "",
-          "When enabled, CC-Claw watches for corrections,",
-          "preferences, and frustration in your messages,",
-          "then proposes changes to its personality and",
-          "behavior files (SOUL.md, USER.md).",
-          "",
-          "You review and approve every change."
-        ].join("\n");
-        await channel.sendKeyboard(chatId, text, buildEvolveOnboardingKeyboard2());
+      const { getReflectionStatus: getReflectionStatus2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
+      const isActive = getReflectionStatus2(getDb(), reflChatId) === "active";
+      if (!isActive) {
+        const { text, buttons } = buildOnboardingView();
+        await sendOrEditKeyboard(chatId, channel, messageId, text, buttons);
       } else {
-        await sendEvolveDashboard(chatId, reflChatId, channel);
+        await sendEvolveDashboard(chatId, reflChatId, channel, messageId);
       }
       break;
     }
     case "analyze": {
       const { runAnalysis: runAnalysis2 } = await Promise.resolve().then(() => (init_analyze(), analyze_exports));
-      const { formatNightlySummary: formatNightlySummary2 } = await Promise.resolve().then(() => (init_propose(), propose_exports));
-      await channel.sendText(chatId, "Analyzing recent interactions...", { parseMode: "plain" });
+      await sendOrEditKeyboard(
+        chatId,
+        channel,
+        messageId,
+        "\u{1F50D} Analyzing recent interactions...\n\nThis may take a moment.",
+        []
+      );
       try {
         const insights = await runAnalysis2(chatId, { force: true });
         if (insights.length === 0) {
-          await channel.sendText(chatId, "No new insights from recent interactions.", { parseMode: "plain" });
+          await sendOrEditKeyboard(
+            chatId,
+            channel,
+            messageId,
+            "\u2705 Analysis complete.\n\nNo new insights from recent interactions.",
+            [[{ label: "\u2190 Back to Dashboard", data: "evolve:menu" }]]
+          );
         } else {
-          const nightlyItems = insights.map((ins, i) => ({ id: i + 1, ...ins }));
-          await channel.sendText(chatId, formatNightlySummary2(nightlyItems), { parseMode: "plain" });
+          await sendOrEditKeyboard(
+            chatId,
+            channel,
+            messageId,
+            `\u2705 Analysis complete \u2014 ${insights.length} new proposal(s) ready.`,
+            [
+              [{ label: `Review (${insights.length})`, data: "evolve:review", style: "primary" }],
+              [{ label: "\u2190 Back to Dashboard", data: "evolve:menu" }]
+            ]
+          );
         }
       } catch (e) {
-        await channel.sendText(chatId, `Analysis failed: ${e}`, { parseMode: "plain" });
+        await sendOrEditKeyboard(
+          chatId,
+          channel,
+          messageId,
+          `\u274C Analysis failed: ${e}`,
+          [[{ label: "\u2190 Back to Dashboard", data: "evolve:menu" }]]
+        );
       }
       break;
     }
     case "review": {
       const { getPendingInsights: getPendingInsights2, createReviewSession: createReviewSession2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
-      const { getPrimaryChatId: getPrimary } = await Promise.resolve().then(() => (init_resolve(), resolve_exports));
-      const reflChatId = getPrimary() || chatId;
       const pending = getPendingInsights2(getDb(), reflChatId);
       if (pending.length === 0) {
-        await channel.sendText(chatId, "No pending proposals.", { parseMode: "plain" });
-      } else {
-        const insightIds = pending.map((p) => p.id);
-        createReviewSession2(getDb(), chatId, insightIds);
-        await channel.sendText(chatId, `${pending.length} proposal(s) ready. Let's review them one by one.`, { parseMode: "plain" });
-        await sendCurrentProposal(chatId, channel);
-      }
-      break;
-    }
-    case "preview": {
-      const { getInsightById: pvIns } = await Promise.resolve().then(() => (init_store4(), store_exports4));
-      const pvInsight = pvIns(getDb(), parseInt(idStr, 10));
-      if (!pvInsight) {
-        await channel.sendText(chatId, "Proposal not found.", { parseMode: "plain" });
-        break;
-      }
-      if (!pvInsight.targetFile || !pvInsight.proposedDiff) {
-        await channel.sendText(chatId, "No diff available for this proposal.", { parseMode: "plain" });
-        break;
-      }
-      const { readFileSync: pvRead, existsSync: pvExists } = await import("fs");
-      const { join: pvJoin } = await import("path");
-      const pvTargetPath = pvJoin(homedir6(), ".cc-claw", pvInsight.targetFile);
-      let previewLines;
-      if (pvExists(pvTargetPath)) {
-        const currentContent = pvRead(pvTargetPath, "utf-8");
-        const diffLines = pvInsight.proposedDiff.split("\n");
-        const additions = diffLines.filter((l) => l.startsWith("+")).map((l) => l.slice(1).trim());
-        const removals = diffLines.filter((l) => l.startsWith("-")).map((l) => l.slice(1).trim());
-        previewLines = [
-          `\u{1F4CB} Dry-run preview: ${pvInsight.targetFile}`,
-          `${"\u2500".repeat(40)}`,
-          ""
-        ];
-        if (removals.length > 0) {
-          previewLines.push("Lines to REMOVE:");
-          for (const r of removals) {
-            previewLines.push(`  - ${r}`);
-            const idx = currentContent.indexOf(r);
-            if (idx >= 0) {
-              const lineNum = currentContent.slice(0, idx).split("\n").length;
-              previewLines.push(`    (line ~${lineNum})`);
-            }
-          }
-          previewLines.push("");
-        }
-        if (additions.length > 0) {
-          previewLines.push("Lines to ADD:");
-          for (const a of additions) {
-            previewLines.push(`  + ${a}`);
-          }
-          previewLines.push("");
-        }
-        previewLines.push(`File size: ${currentContent.length} chars`);
+        await sendOrEditKeyboard(
+          chatId,
+          channel,
+          messageId,
+          "No pending proposals.",
+          [[{ label: "\u2190 Back to Dashboard", data: "evolve:menu" }]]
+        );
       } else {
-        previewLines = [
-          `\u{1F4CB} Dry-run preview: ${pvInsight.targetFile}`,
-          `${"\u2500".repeat(40)}`,
-          "",
-          "(File does not exist yet \u2014 will be created)",
-          "",
-          "Content to add:",
-          pvInsight.proposedDiff
-        ];
-      }
-      await channel.sendText(chatId, previewLines.join("\n"), { parseMode: "plain" });
-      break;
-    }
-    case "diff": {
-      const { getInsightById: getInsightById2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
-      const { formatDiffCodeBlock: formatDiffCodeBlock2 } = await Promise.resolve().then(() => (init_propose(), propose_exports));
-      const insight = getInsightById2(getDb(), parseInt(idStr, 10));
-      if (insight?.proposedDiff) {
-        await channel.sendText(chatId, formatDiffCodeBlock2(insight.proposedDiff), { parseMode: "plain" });
+        createReviewSession2(getDb(), chatId, pending.map((p) => p.id));
+        await sendCurrentProposalInPlace(chatId, channel, messageId);
       }
       break;
     }
     case "apply": {
       const { applyInsight: applyInsight2 } = await Promise.resolve().then(() => (init_apply(), apply_exports));
+      const { advanceReviewSession: advanceReviewSession2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
       const result = await applyInsight2(parseInt(idStr, 10));
-      await channel.sendText(chatId, result.message, { parseMode: "plain" });
-      const { advanceReviewSession: arAdvance } = await Promise.resolve().then(() => (init_store4(), store_exports4));
-      arAdvance(getDb(), chatId, parseInt(idStr, 10), "applied");
-      await sendCurrentProposal(chatId, channel);
+      advanceReviewSession2(getDb(), chatId, parseInt(idStr, 10), "applied");
+      await sendOrEditKeyboard(
+        chatId,
+        channel,
+        messageId,
+        `\u2705 ${result.message}`,
+        []
+      );
+      await new Promise((r) => setTimeout(r, 800));
+      await sendCurrentProposalInPlace(chatId, channel, messageId);
       break;
     }
     case "skip": {
-      await channel.sendText(chatId, "Skipped \u2014 will show again next review.", { parseMode: "plain" });
-      const { advanceReviewSession: skAdvance } = await Promise.resolve().then(() => (init_store4(), store_exports4));
-      skAdvance(getDb(), chatId, parseInt(idStr, 10), "skipped");
-      await sendCurrentProposal(chatId, channel);
+      const { advanceReviewSession: advanceReviewSession2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
+      advanceReviewSession2(getDb(), chatId, parseInt(idStr, 10), "skipped");
+      await sendCurrentProposalInPlace(chatId, channel, messageId);
+      break;
+    }
+    case "reject": {
+      const { updateInsightStatus: updateInsightStatus2, advanceReviewSession: advanceReviewSession2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
+      updateInsightStatus2(getDb(), parseInt(idStr, 10), "rejected");
+      advanceReviewSession2(getDb(), chatId, parseInt(idStr, 10), "rejected");
+      await sendCurrentProposalInPlace(chatId, channel, messageId);
       break;
     }
     case "discuss": {
-      const insId = parseInt(idStr, 10);
       const { setDiscussionMode: setDiscussionMode2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
-      setDiscussionMode2(chatId, insId);
-      await channel.sendText(chatId, [
-        "\u{1F4AC} Discussion mode \u2014 tell me what you'd like to change about this proposal.",
-        "",
-        'Examples: "Move this to a skill instead", "Rewrite the diff", "Why this file?", "Make it shorter"',
-        "",
-        "Type your reply and I'll handle it:"
-      ].join("\n"), { parseMode: "plain" });
+      setDiscussionMode2(chatId, parseInt(idStr, 10));
+      await sendOrEditKeyboard(
+        chatId,
+        channel,
+        messageId,
+        [
+          "\u{1F4AC} Discussion mode",
+          "",
+          "Tell me what you'd like to change about this proposal.",
+          "",
+          'Examples: "Move this to a skill instead", "Make it shorter", "Why this file?"',
+          "",
+          "Type your reply below \u2014 I'll revise and come back with a new proposal."
+        ].join("\n"),
+        [[{ label: "\u2190 Cancel discussion", data: `evolve:review` }]]
+      );
       break;
     }
-    case "reject": {
-      const { updateInsightStatus: updateInsightStatus2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
-      updateInsightStatus2(getDb(), parseInt(idStr, 10), "rejected");
-      await channel.sendText(chatId, "Rejected. Won't propose similar changes.", { parseMode: "plain" });
-      const { advanceReviewSession: rjAdvance } = await Promise.resolve().then(() => (init_store4(), store_exports4));
-      rjAdvance(getDb(), chatId, parseInt(idStr, 10), "rejected");
-      await sendCurrentProposal(chatId, channel);
+    case "preview": {
+      const { getInsightById: getInsightById2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
+      const insight = getInsightById2(getDb(), parseInt(idStr, 10));
+      if (!insight?.targetFile || !insight?.proposedDiff) {
+        await sendOrEditKeyboard(
+          chatId,
+          channel,
+          messageId,
+          "No diff available for this proposal.",
+          [[{ label: "\u2190 Back", data: `evolve:review` }]]
+        );
+        break;
+      }
+      const { readFileSync: readFileSync33, existsSync: existsSync62 } = await import("fs");
+      const { join: join41 } = await import("path");
+      const targetPath = join41(homedir6(), ".cc-claw", insight.targetFile);
+      let previewText;
+      if (existsSync62(targetPath)) {
+        const current = readFileSync33(targetPath, "utf-8");
+        const diffLines = insight.proposedDiff.split("\n");
+        const additions = diffLines.filter((l) => l.startsWith("+")).map((l) => `  + ${l.slice(1).trim()}`);
+        const removals = diffLines.filter((l) => l.startsWith("-")).map((l) => `  - ${l.slice(1).trim()}`);
+        const lines = [`\u{1F4CB} Preview: ${insight.targetFile}`, ""];
+        if (removals.length) lines.push("Lines to REMOVE:", ...removals, "");
+        if (additions.length) lines.push("Lines to ADD:", ...additions, "");
+        lines.push(`File: ${current.length} chars`);
+        previewText = lines.join("\n");
+      } else {
+        previewText = [`\u{1F4CB} Preview: ${insight.targetFile}`, "", "(File will be created)", "", insight.proposedDiff].join("\n");
+      }
+      await sendOrEditKeyboard(
+        chatId,
+        channel,
+        messageId,
+        previewText,
+        [[{ label: "\u2190 Back to Proposal", data: `evolve:review` }]]
+      );
       break;
     }
     case "stats": {
@@ -21538,46 +22244,49 @@ async function handleEvolveCallback(chatId, data, channel) {
       const { calculateDrift: calculateDrift2 } = await Promise.resolve().then(() => (init_apply(), apply_exports));
       const reportData = buildGrowthReportData2(getDb(), chatId, 30);
       const modelData = buildModelPerformanceData2(getDb(), chatId, 30);
-      const metricsForReport = {
+      let report = formatGrowthReport2({
         correctionsBefore: reportData.avgCorrectionsFirstHalf,
         correctionsAfter: reportData.avgCorrectionsSecondHalf,
         praiseRatio: reportData.praiseRatio,
         insightsApplied: reportData.totalInsightsApplied,
         pendingCount: reportData.pendingCount,
-        topInsight: reportData.topInsightId != null ? {
-          insight: `#${reportData.topInsightId}`,
-          effectiveness: reportData.topInsightEffectiveness ?? 0
-        } : null
-      };
-      let report = formatGrowthReport2(metricsForReport, modelData);
+        topInsight: reportData.topInsightId != null ? { insight: `#${reportData.topInsightId}`, effectiveness: reportData.topInsightEffectiveness ?? 0 } : null
+      }, modelData);
       const drift = calculateDrift2(chatId);
       if (drift && (drift.soulDrift > 0.5 || drift.userDrift > 0.5)) {
-        report += "\n\nSOUL.md has changed significantly since reflection started.\nTap History in /evolve to review all applied changes.";
+        report += "\n\nSOUL.md has changed significantly since reflection started.";
       }
-      await channel.sendText(chatId, report, { parseMode: "plain" });
+      await sendOrEditKeyboard(
+        chatId,
+        channel,
+        messageId,
+        report,
+        [[{ label: "\u2190 Back to Dashboard", data: "evolve:menu" }]]
+      );
       break;
     }
     case "history": {
       const { getAppliedInsights: getAppliedInsights2, getRejectedInsights: getRejectedInsights2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
       const applied = getAppliedInsights2(getDb(), chatId, 10);
       const rejected = getRejectedInsights2(getDb(), chatId, 10);
-      let msg = "Applied Insights:\n";
-      if (applied.length === 0) msg += "None yet.\n";
-      else applied.forEach((i) => {
-        msg += `#${i.id} [${i.category}] ${i.insight}
-`;
-      });
-      msg += "\nRejected Insights:\n";
-      if (rejected.length === 0) msg += "None yet.\n";
-      else rejected.forEach((i) => {
-        msg += `#${i.id} [${i.category}] ${i.insight}
-`;
-      });
-      await channel.sendText(chatId, msg, { parseMode: "plain" });
+      const lines = ["Applied Insights:", ""];
+      if (applied.length === 0) lines.push("None yet.");
+      else applied.forEach((i) => lines.push(`#${i.id} [${i.category}] ${i.insight}`));
+      lines.push("", "Rejected Insights:", "");
+      if (rejected.length === 0) lines.push("None yet.");
+      else rejected.forEach((i) => lines.push(`#${i.id} [${i.category}] ${i.insight}`));
+      await sendOrEditKeyboard(
+        chatId,
+        channel,
+        messageId,
+        lines.join("\n"),
+        [[{ label: "\u2190 Back to Dashboard", data: "evolve:menu" }]]
+      );
       break;
     }
     case "toggle": {
       const { getReflectionStatus: getReflectionStatus2, setReflectionStatus: setReflectionStatus2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
+      const { logActivity: logActivity2 } = await Promise.resolve().then(() => (init_store3(), store_exports3));
       const current = getReflectionStatus2(getDb(), chatId);
       if (current === "frozen") {
         const { readFileSync: readFileSync33, existsSync: existsSync62 } = await import("fs");
@@ -21588,14 +22297,13 @@ async function handleEvolveCallback(chatId, data, channel) {
         const soul = existsSync62(soulPath) ? readFileSync33(soulPath, "utf-8") : "";
         const user = existsSync62(userPath) ? readFileSync33(userPath, "utf-8") : "";
         setReflectionStatus2(getDb(), chatId, "active", soul, user);
-        const { logActivity: logActivity2 } = await Promise.resolve().then(() => (init_store3(), store_exports3));
         logActivity2(getDb(), { chatId, source: "telegram", eventType: "reflection_unfrozen", summary: "Reflection enabled" });
-        await channel.sendText(chatId, "\u2705 Self-learning enabled. Signal detection is now active.\nCreate a nightly cron job with /schedule to enable automatic analysis.", { parseMode: "plain" });
+        await sendEvolveDashboard(chatId, reflChatId, channel, messageId);
       } else {
         setReflectionStatus2(getDb(), chatId, "frozen", void 0, void 0);
-        const { logActivity: logActivity2 } = await Promise.resolve().then(() => (init_store3(), store_exports3));
         logActivity2(getDb(), { chatId, source: "telegram", eventType: "reflection_frozen", summary: "Reflection disabled" });
-        await channel.sendText(chatId, "\u26D4 Self-learning disabled. No signals will be collected.", { parseMode: "plain" });
+        const { text, buttons } = buildOnboardingView();
+        await sendOrEditKeyboard(chatId, channel, messageId, text, buttons);
       }
       break;
     }
@@ -21603,62 +22311,123 @@ async function handleEvolveCallback(chatId, data, channel) {
       if (idStr) {
         const { rollbackInsight: rollbackInsight2 } = await Promise.resolve().then(() => (init_apply(), apply_exports));
         const result = await rollbackInsight2(parseInt(idStr, 10));
-        await channel.sendText(chatId, result.message, { parseMode: "plain" });
+        await sendOrEditKeyboard(
+          chatId,
+          channel,
+          messageId,
+          result.message,
+          [[{ label: "\u2190 Back to Dashboard", data: "evolve:menu" }]]
+        );
       } else {
         const { getAppliedInsights: getAppliedInsights2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
-        const { buildUndoKeyboard: buildUndoKeyboard2 } = await Promise.resolve().then(() => (init_propose(), propose_exports));
         const applied = getAppliedInsights2(getDb(), chatId, 10);
         if (applied.length === 0) {
-          await channel.sendText(chatId, "No applied insights to undo.", { parseMode: "plain" });
+          await sendOrEditKeyboard(
+            chatId,
+            channel,
+            messageId,
+            "No applied insights to undo.",
+            [[{ label: "\u2190 Back to Dashboard", data: "evolve:menu" }]]
+          );
         } else {
-          const kb = buildUndoKeyboard2(applied);
-          await channel.sendKeyboard(chatId, "Select an insight to undo:", kb);
+          const buttons = [
+            ...applied.map((i) => [{ label: `Undo #${i.id}: ${i.insight}`, data: `evolve:undo:${i.id}`, style: "danger" }]),
+            [{ label: "\u2190 Back to Dashboard", data: "evolve:menu" }]
+          ];
+          await sendOrEditKeyboard(chatId, channel, messageId, "Select an insight to undo:", buttons);
         }
       }
       break;
     }
     case "model": {
+      const { getReflectionModelConfig: getReflectionModelConfig2, setReflectionModelConfig: setReflectionModelConfig2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
       if (idStr) {
-        const { setReflectionModelConfig: setReflectionModelConfig2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
         setReflectionModelConfig2(getDb(), chatId, idStr);
-        await channel.sendText(chatId, `Analysis model set to: ${idStr}`, { parseMode: "plain" });
+        await sendEvolveDashboard(chatId, reflChatId, channel, messageId);
       } else {
-        const { getReflectionModelConfig: getReflectionModelConfig2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
-        const { buildModelKeyboard: buildModelKeyboard2 } = await Promise.resolve().then(() => (init_propose(), propose_exports));
         const config2 = getReflectionModelConfig2(getDb(), chatId);
-        const kb = buildModelKeyboard2(config2.mode);
-        await channel.sendKeyboard(chatId, `Current analysis model: ${config2.mode}`, kb);
+        const modes = [
+          { label: "Auto", mode: "auto" },
+          { label: "Cheap", mode: "cheap" },
+          { label: "Pinned", mode: "pinned" }
+        ];
+        const buttons = [
+          modes.map((m) => ({
+            label: `${m.mode === config2.mode ? "\u2713 " : ""}${m.label}`,
+            data: `evolve:model:${m.mode}`,
+            ...m.mode === config2.mode ? { style: "primary" } : {}
+          })),
+          [{ label: "\u2190 Back to Dashboard", data: "evolve:menu" }]
+        ];
+        await sendOrEditKeyboard(
+          chatId,
+          channel,
+          messageId,
+          `Analysis model: ${config2.mode}`,
+          buttons
+        );
       }
       break;
     }
   }
 }
-async function handleReflectCallback(chatId, data, channel) {
+async function handleReflectCallback(chatId, data, channel, messageId) {
   const action = data.slice(8);
   if (action === "go") {
     const { runAnalysis: runAnalysis2 } = await Promise.resolve().then(() => (init_analyze(), analyze_exports));
-    const { formatNightlySummary: formatNightlySummary2 } = await Promise.resolve().then(() => (init_propose(), propose_exports));
-    await channel.sendText(chatId, "Analyzing recent interactions...", { parseMode: "plain" });
+    await sendOrEditKeyboard(
+      chatId,
+      channel,
+      messageId,
+      "\u{1F50D} Analyzing recent interactions...\n\nThis may take a moment.",
+      []
+    );
     try {
       const insights = await runAnalysis2(chatId, { force: true });
       if (insights.length === 0) {
-        await channel.sendText(chatId, "No new insights from recent interactions.", { parseMode: "plain" });
+        await sendOrEditKeyboard(
+          chatId,
+          channel,
+          messageId,
+          "\u2705 Analysis complete.\n\nNo new insights from recent interactions.",
+          [[{ label: "Review Dashboard", data: "evolve:menu" }]]
+        );
       } else {
-        const items = insights.map((ins, i) => ({ id: i + 1, category: ins.category, insight: ins.insight }));
-        await channel.sendText(chatId, formatNightlySummary2(items) + "\n\nUse /evolve to review and apply proposals.", { parseMode: "plain" });
+        await sendOrEditKeyboard(
+          chatId,
+          channel,
+          messageId,
+          `\u2705 Analysis complete \u2014 ${insights.length} new proposal(s) ready.`,
+          [
+            [{ label: `Review (${insights.length})`, data: "evolve:review", style: "primary" }],
+            [{ label: "Dashboard", data: "evolve:menu" }]
+          ]
+        );
       }
     } catch (e) {
-      await channel.sendText(chatId, `Analysis failed: ${e}`, { parseMode: "plain" });
+      await sendOrEditKeyboard(
+        chatId,
+        channel,
+        messageId,
+        `\u274C Analysis failed: ${e}`,
+        [[{ label: "Dashboard", data: "evolve:menu" }]]
+      );
     }
   } else if (action === "cancel") {
-    await channel.sendText(chatId, "Reflection cancelled.", { parseMode: "plain" });
+    await sendOrEditKeyboard(
+      chatId,
+      channel,
+      messageId,
+      "Reflection cancelled.",
+      [[{ label: "Dashboard", data: "evolve:menu" }]]
+    );
   }
 }
 var init_evolve2 = __esm({
   "src/router/evolve.ts"() {
     "use strict";
     init_store5();
-    init_ui();
+    init_helpers();
   }
 });
 
@@ -22304,8 +23073,8 @@ var init_analyze2 = __esm({
 });
 
 // src/optimizer/ui.ts
-var ui_exports = {};
-__export(ui_exports, {
+var ui_exports2 = {};
+__export(ui_exports2, {
   buildFindingKeyboard: () => buildFindingKeyboard,
   buildFindingMessage: () => buildFindingMessage,
   buildIdentityAuditKeyboard: () => buildIdentityAuditKeyboard,
@@ -22588,14 +23357,14 @@ __export(optimize_exports, {
 import { readFileSync as readFileSync17, writeFileSync as writeFileSync9, existsSync as existsSync28, readdirSync as readdirSync13, unlinkSync as unlinkSync7 } from "fs";
 import { join as join29, dirname as dirname4 } from "path";
 import { homedir as homedir8 } from "os";
-async function handleOptimizeCommand(chatId, channel, _args) {
+async function handleOptimizeCommand(chatId, channel, _args, messageId) {
   const { getModelDisplayInfo: getModelDisplayInfo2 } = await Promise.resolve().then(() => (init_analyze2(), analyze_exports2));
   const {
     buildMainMenuMessage: buildMainMenuMessage2,
     buildMainMenuKeyboard: buildMainMenuKeyboard2,
     buildModelRecommendationMessage: buildModelRecommendationMessage2,
     buildModelRecommendationKeyboard: buildModelRecommendationKeyboard2
-  } = await Promise.resolve().then(() => (init_ui2(), ui_exports));
+  } = await Promise.resolve().then(() => (init_ui2(), ui_exports2));
   const modelInfo = getModelDisplayInfo2(chatId);
   if (!modelInfo) {
     await channel.sendText(chatId, "No AI backend available. Configure one first.", { parseMode: "plain" });
@@ -22603,105 +23372,106 @@ async function handleOptimizeCommand(chatId, channel, _args) {
   }
   if (modelInfo.isWeak) {
     const msg2 = buildModelRecommendationMessage2(modelInfo.model);
-    if (typeof channel.sendKeyboard === "function") {
-      await channel.sendKeyboard(chatId, msg2, buildModelRecommendationKeyboard2());
-    } else {
-      await channel.sendText(chatId, msg2 + "\n\nSwitch to an advanced model for best results.", { parseMode: "plain" });
-    }
+    await sendOrEditKeyboard(chatId, channel, messageId, msg2, buildModelRecommendationKeyboard2());
     return;
   }
   const msg = buildMainMenuMessage2(modelInfo.backend, modelInfo.model, modelInfo.thinkingLevel);
-  if (typeof channel.sendKeyboard === "function") {
-    await channel.sendKeyboard(chatId, msg, buildMainMenuKeyboard2());
-  } else {
-    await channel.sendText(chatId, msg, { parseMode: "plain" });
-  }
+  await sendOrEditKeyboard(chatId, channel, messageId, msg, buildMainMenuKeyboard2());
 }
-async function handleOptimizeCallback(chatId, data, channel) {
+async function handleOptimizeCallback(chatId, data, channel, messageId) {
   const parts = data.split(":");
   const action = parts[1];
   switch (action) {
     case "identity": {
-      await runIdentityAuditFlow(chatId, channel);
+      await runIdentityAuditFlow(chatId, channel, messageId);
       break;
     }
     case "skill-menu": {
-      await showSkillPicker(chatId, channel, 0);
+      await showSkillPicker(chatId, channel, 0, messageId);
       break;
     }
     case "skill-page": {
       const page = parseInt(parts[2], 10) || 0;
-      await showSkillPicker(chatId, channel, page);
+      await showSkillPicker(chatId, channel, page, messageId);
       break;
     }
     case "skill-pick": {
       const skillName = parts.slice(2).join(":");
-      await runSkillAuditFlow(chatId, channel, skillName);
+      await runSkillAuditFlow(chatId, channel, skillName, messageId);
       break;
     }
     case "model-ok": {
       const { getModelDisplayInfo: getModelDisplayInfo2 } = await Promise.resolve().then(() => (init_analyze2(), analyze_exports2));
-      const { buildMainMenuMessage: buildMainMenuMessage2, buildMainMenuKeyboard: buildMainMenuKeyboard2 } = await Promise.resolve().then(() => (init_ui2(), ui_exports));
+      const { buildMainMenuMessage: buildMainMenuMessage2, buildMainMenuKeyboard: buildMainMenuKeyboard2 } = await Promise.resolve().then(() => (init_ui2(), ui_exports2));
       const modelInfo = getModelDisplayInfo2(chatId);
       if (!modelInfo) return;
       const msg = buildMainMenuMessage2(modelInfo.backend, modelInfo.model, modelInfo.thinkingLevel);
-      if (typeof channel.sendKeyboard === "function") {
-        await channel.sendKeyboard(chatId, msg, buildMainMenuKeyboard2());
-      }
+      await sendOrEditKeyboard(chatId, channel, messageId, msg, buildMainMenuKeyboard2());
       break;
     }
     case "model-switch": {
-      await channel.sendText(chatId, "Use /model or /backend to switch to a more powerful model, then run /optimize again.", { parseMode: "plain" });
+      await sendOrEditKeyboard(
+        chatId,
+        channel,
+        messageId,
+        "Use /model or /backend to switch to a more powerful model, then run /optimize again.",
+        [[{ label: "\u2190 Back", data: "opt:model-ok" }]]
+      );
       break;
     }
     case "review": {
       const index = parseInt(parts[2], 10) || 0;
-      await showFinding(chatId, channel, index);
+      const session2 = activeSessions.get(chatId);
+      if (session2 && messageId) session2.messageId = messageId;
+      await showFinding(chatId, channel, index, messageId);
       break;
     }
     case "fix": {
       const fixIndex = parseInt(parts[2], 10) || 0;
-      await applyFinding(chatId, channel, fixIndex);
+      const session2 = activeSessions.get(chatId);
+      await applyFinding(chatId, channel, fixIndex, messageId ?? session2?.messageId);
       break;
     }
     case "skip": {
       const skipIndex = parseInt(parts[2], 10) || 0;
-      await skipFinding(chatId, channel, skipIndex);
+      const session2 = activeSessions.get(chatId);
+      await skipFinding(chatId, channel, skipIndex, messageId ?? session2?.messageId);
       break;
     }
     case "stop": {
-      await stopReview(chatId, channel);
+      const session2 = activeSessions.get(chatId);
+      await stopReview(chatId, channel, messageId ?? session2?.messageId);
       break;
     }
     case "close": {
       activeSessions.delete(chatId);
-      await channel.sendText(chatId, "Optimizer closed.", { parseMode: "plain" });
+      if (messageId && channel.editText) {
+        await channel.editText(chatId, messageId, "Optimizer closed.", "plain");
+      } else {
+        await channel.sendText(chatId, "Optimizer closed.", { parseMode: "plain" });
+      }
       break;
     }
     default:
       break;
   }
 }
-async function runIdentityAuditFlow(chatId, channel) {
+async function runIdentityAuditFlow(chatId, channel, messageId) {
   const { getModelDisplayInfo: getModelDisplayInfo2, runIdentityAudit: runIdentityAudit2 } = await Promise.resolve().then(() => (init_analyze2(), analyze_exports2));
   const {
     buildProgressMessage: buildProgressMessage2,
     buildIdentityAuditSummary: buildIdentityAuditSummary2,
     buildIdentityAuditKeyboard: buildIdentityAuditKeyboard2
-  } = await Promise.resolve().then(() => (init_ui2(), ui_exports));
+  } = await Promise.resolve().then(() => (init_ui2(), ui_exports2));
   const modelInfo = getModelDisplayInfo2(chatId);
   if (!modelInfo) return;
-  const progressMsgId = typeof channel.sendTextReturningId === "function" ? await channel.sendTextReturningId(
-    chatId,
-    buildProgressMessage2("identity files", modelInfo.backend, modelInfo.model, modelInfo.thinkingLevel),
-    "plain"
-  ) : void 0;
-  if (!progressMsgId) {
-    await channel.sendText(
-      chatId,
-      buildProgressMessage2("identity files", modelInfo.backend, modelInfo.model, modelInfo.thinkingLevel),
-      { parseMode: "plain" }
-    );
+  const progressText = buildProgressMessage2("identity files", modelInfo.backend, modelInfo.model, modelInfo.thinkingLevel);
+  let progressMsgId = messageId;
+  if (messageId && channel.editKeyboard) {
+    await channel.editKeyboard(chatId, messageId, progressText + "\n\u23F3 Analyzing...", []);
+  } else {
+    progressMsgId = await channel.sendTextReturningId?.(chatId, progressText, "plain");
+    if (!progressMsgId) await channel.sendText(chatId, progressText, { parseMode: "plain" });
   }
   const startTime = Date.now();
   const progressInterval = setInterval(async () => {
@@ -22709,13 +23479,8 @@ async function runIdentityAuditFlow(chatId, channel) {
     try {
       if (channel.sendTyping) await channel.sendTyping(chatId);
       if (progressMsgId && channel.editText) {
-        await channel.editText(
-          chatId,
-          progressMsgId,
-          buildProgressMessage2("identity files", modelInfo.backend, modelInfo.model, modelInfo.thinkingLevel) + `
-\u23F3 Analyzing... (${elapsed}s)`,
-          "plain"
-        );
+        await channel.editText(chatId, progressMsgId, progressText + `
+\u23F3 Analyzing... (${elapsed}s)`, "plain");
       }
     } catch {
     }
@@ -22723,62 +23488,43 @@ async function runIdentityAuditFlow(chatId, channel) {
   try {
     const result = await runIdentityAudit2(chatId);
     clearInterval(progressInterval);
-    activeSessions.set(chatId, {
-      chatId,
-      result,
-      currentIndex: 0,
-      applied: [],
-      skipped: []
-    });
+    activeSessions.set(chatId, { chatId, result, currentIndex: 0, applied: [], skipped: [], messageId: progressMsgId });
     const summary = buildIdentityAuditSummary2(result);
-    if (typeof channel.sendKeyboard === "function") {
-      await channel.sendKeyboard(chatId, summary, buildIdentityAuditKeyboard2(result.findings.length));
-    } else {
-      await channel.sendText(chatId, summary, { parseMode: "plain" });
-    }
+    await sendOrEditKeyboard(chatId, channel, progressMsgId, summary, buildIdentityAuditKeyboard2(result.findings.length));
   } catch (e) {
     clearInterval(progressInterval);
-    await channel.sendText(chatId, `Identity audit failed: ${e}`, { parseMode: "plain" });
+    await sendOrEditKeyboard(chatId, channel, progressMsgId, `Identity audit failed: ${e}`, [[{ label: "\u2190 Back", data: "opt:model-ok" }]]);
   }
 }
-async function showSkillPicker(chatId, channel, page) {
+async function showSkillPicker(chatId, channel, page, messageId) {
   const { listCcClawSkills: listCcClawSkills2 } = await Promise.resolve().then(() => (init_analyze2(), analyze_exports2));
-  const { buildSkillPickerMessage: buildSkillPickerMessage2, buildSkillPickerKeyboard: buildSkillPickerKeyboard2 } = await Promise.resolve().then(() => (init_ui2(), ui_exports));
+  const { buildSkillPickerMessage: buildSkillPickerMessage2, buildSkillPickerKeyboard: buildSkillPickerKeyboard2 } = await Promise.resolve().then(() => (init_ui2(), ui_exports2));
   const skills2 = listCcClawSkills2();
   if (skills2.length === 0) {
-    await channel.sendText(chatId, "No CC-Claw skills found in ~/.cc-claw/workspace/skills/", { parseMode: "plain" });
+    await sendOrEditKeyboard(chatId, channel, messageId, "No CC-Claw skills found in ~/.cc-claw/workspace/skills/", [[{ label: "\u2190 Back", data: "opt:model-ok" }]]);
     return;
   }
   const totalPages = Math.ceil(skills2.length / 6);
   const msg = buildSkillPickerMessage2(page, totalPages);
-  if (typeof channel.sendKeyboard === "function") {
-    await channel.sendKeyboard(chatId, msg, buildSkillPickerKeyboard2(skills2, page));
-  } else {
-    const list = skills2.map((s) => `\u2022 ${s.name} \u2014 ${s.description}`).join("\n");
-    await channel.sendText(chatId, msg + "\n\n" + list, { parseMode: "plain" });
-  }
+  await sendOrEditKeyboard(chatId, channel, messageId, msg, buildSkillPickerKeyboard2(skills2, page));
 }
-async function runSkillAuditFlow(chatId, channel, skillName) {
+async function runSkillAuditFlow(chatId, channel, skillName, messageId) {
   const { getModelDisplayInfo: getModelDisplayInfo2, runSkillAudit: runSkillAudit2 } = await Promise.resolve().then(() => (init_analyze2(), analyze_exports2));
   const {
     buildProgressMessage: buildProgressMessage2,
     buildSkillAuditSummary: buildSkillAuditSummary2,
     buildSkillAuditKeyboard: buildSkillAuditKeyboard2
-  } = await Promise.resolve().then(() => (init_ui2(), ui_exports));
+  } = await Promise.resolve().then(() => (init_ui2(), ui_exports2));
   const modelInfo = getModelDisplayInfo2(chatId);
   if (!modelInfo) return;
   const skillPath = join29(homedir8(), ".cc-claw", "workspace", "skills", skillName, "SKILL.md");
-  const progressMsgId = typeof channel.sendTextReturningId === "function" ? await channel.sendTextReturningId(
-    chatId,
-    buildProgressMessage2(`skill: ${skillName}`, modelInfo.backend, modelInfo.model, modelInfo.thinkingLevel),
-    "plain"
-  ) : void 0;
-  if (!progressMsgId) {
-    await channel.sendText(
-      chatId,
-      buildProgressMessage2(`skill: ${skillName}`, modelInfo.backend, modelInfo.model, modelInfo.thinkingLevel),
-      { parseMode: "plain" }
-    );
+  const progressText = buildProgressMessage2(`skill: ${skillName}`, modelInfo.backend, modelInfo.model, modelInfo.thinkingLevel);
+  let progressMsgId = messageId;
+  if (messageId && channel.editKeyboard) {
+    await channel.editKeyboard(chatId, messageId, progressText + "\n\u23F3 Analyzing...", []);
+  } else {
+    progressMsgId = await channel.sendTextReturningId?.(chatId, progressText, "plain");
+    if (!progressMsgId) await channel.sendText(chatId, progressText, { parseMode: "plain" });
   }
   const startTime = Date.now();
   const progressInterval = setInterval(async () => {
@@ -22786,13 +23532,8 @@ async function runSkillAuditFlow(chatId, channel, skillName) {
     try {
       if (channel.sendTyping) await channel.sendTyping(chatId);
       if (progressMsgId && channel.editText) {
-        await channel.editText(
-          chatId,
-          progressMsgId,
-          buildProgressMessage2(`skill: ${skillName}`, modelInfo.backend, modelInfo.model, modelInfo.thinkingLevel) + `
-\u23F3 Analyzing... (${elapsed}s)`,
-          "plain"
-        );
+        await channel.editText(chatId, progressMsgId, progressText + `
+\u23F3 Analyzing... (${elapsed}s)`, "plain");
       }
     } catch {
     }
@@ -22800,66 +23541,47 @@ async function runSkillAuditFlow(chatId, channel, skillName) {
   try {
     const result = await runSkillAudit2(chatId, skillPath);
     clearInterval(progressInterval);
-    activeSessions.set(chatId, {
-      chatId,
-      result,
-      currentIndex: 0,
-      applied: [],
-      skipped: []
-    });
+    activeSessions.set(chatId, { chatId, result, currentIndex: 0, applied: [], skipped: [], messageId: progressMsgId });
     const summary = buildSkillAuditSummary2(result);
-    if (typeof channel.sendKeyboard === "function") {
-      await channel.sendKeyboard(chatId, summary, buildSkillAuditKeyboard2(result.findings.length));
-    } else {
-      await channel.sendText(chatId, summary, { parseMode: "plain" });
-    }
+    await sendOrEditKeyboard(chatId, channel, progressMsgId, summary, buildSkillAuditKeyboard2(result.findings.length));
   } catch (e) {
     clearInterval(progressInterval);
-    await channel.sendText(chatId, `Skill audit failed: ${e}`, { parseMode: "plain" });
+    await sendOrEditKeyboard(chatId, channel, progressMsgId, `Skill audit failed: ${e}`, [[{ label: "\u2190 Back", data: "opt:skill-menu" }]]);
   }
 }
-async function showFinding(chatId, channel, index) {
+async function showFinding(chatId, channel, index, messageId) {
   const session2 = activeSessions.get(chatId);
   if (!session2) {
-    await channel.sendText(chatId, "No active optimizer session. Run /optimize first.", { parseMode: "plain" });
+    await sendOrEditKeyboard(chatId, channel, messageId, "No active optimizer session. Run /optimize first.", [[{ label: "Run Optimizer", data: "opt:model-ok" }]]);
     return;
   }
+  const effectiveMsgId = messageId ?? session2.messageId;
   const { findings } = session2.result;
   if (index >= findings.length) {
-    await finishReview(chatId, channel);
+    await finishReview(chatId, channel, effectiveMsgId);
     return;
   }
   session2.currentIndex = index;
+  if (effectiveMsgId) session2.messageId = effectiveMsgId;
   const finding = findings[index];
-  const { buildFindingMessage: buildFindingMessage2, buildFindingKeyboard: buildFindingKeyboard2 } = await Promise.resolve().then(() => (init_ui2(), ui_exports));
+  const { buildFindingMessage: buildFindingMessage2, buildFindingKeyboard: buildFindingKeyboard2 } = await Promise.resolve().then(() => (init_ui2(), ui_exports2));
   const msg = buildFindingMessage2(finding, index, findings.length);
-  if (typeof channel.sendKeyboard === "function") {
-    await channel.sendKeyboard(chatId, msg, buildFindingKeyboard2(index, findings.length, !!finding.proposedDiff));
-  } else {
-    await channel.sendText(chatId, msg, { parseMode: "plain" });
-  }
+  await sendOrEditKeyboard(chatId, channel, effectiveMsgId, msg, buildFindingKeyboard2(index, findings.length, !!finding.proposedDiff));
 }
-async function applyFinding(chatId, channel, index) {
+async function applyFinding(chatId, channel, index, messageId) {
   const session2 = activeSessions.get(chatId);
   if (!session2) return;
+  const effectiveMsgId = messageId ?? session2.messageId;
   const finding = session2.result.findings[index];
   if (!finding || !finding.proposedDiff) {
-    await channel.sendText(chatId, "No diff to apply for this finding.", { parseMode: "plain" });
-    await showFinding(chatId, channel, index + 1);
+    await showFinding(chatId, channel, index + 1, effectiveMsgId);
     return;
   }
   try {
     const targetPath = resolveTargetFile(finding.location, session2.result.target);
-    if (!targetPath) {
-      await channel.sendText(chatId, `Cannot determine target file from location: ${finding.location}`, { parseMode: "plain" });
+    if (!targetPath || !existsSync28(targetPath)) {
       session2.skipped.push(index);
-      await showFinding(chatId, channel, index + 1);
-      return;
-    }
-    if (!existsSync28(targetPath)) {
-      await channel.sendText(chatId, `Target file not found: ${targetPath}`, { parseMode: "plain" });
-      session2.skipped.push(index);
-      await showFinding(chatId, channel, index + 1);
+      await showFinding(chatId, channel, index + 1, effectiveMsgId);
       return;
     }
     const original = readFileSync17(targetPath, "utf-8");
@@ -22869,13 +23591,7 @@ async function applyFinding(chatId, channel, index) {
     let newContent;
     try {
       const { applyWithAI: applyWithAI2 } = await Promise.resolve().then(() => (init_ai_apply(), ai_apply_exports));
-      const aiResult = await applyWithAI2(
-        chatId,
-        original,
-        finding.suggestion || finding.title,
-        finding.proposedDiff,
-        finding.location.split(":")[0] || "unknown"
-      );
+      const aiResult = await applyWithAI2(chatId, original, finding.suggestion || finding.title, finding.proposedDiff, finding.location.split(":")[0] || "unknown");
       if (aiResult.success) {
         newContent = aiResult.newContent;
       } else {
@@ -22889,9 +23605,8 @@ async function applyFinding(chatId, channel, index) {
       newContent = applyDiff2(original, finding.proposedDiff, "replace");
     }
     if (newContent === original) {
-      await channel.sendText(chatId, `\u26A0\uFE0F Diff produced no changes. The content may have already been modified.`, { parseMode: "plain" });
       session2.skipped.push(index);
-      await showFinding(chatId, channel, index + 1);
+      await showFinding(chatId, channel, index + 1, effectiveMsgId);
       return;
     }
     writeFileSync9(targetPath, newContent, "utf-8");
@@ -22904,34 +23619,32 @@ async function applyFinding(chatId, channel, index) {
         warn("[optimize] syncNativeCliFiles failed:", err instanceof Error ? err.message : err);
       }
     }
-    await channel.sendText(chatId, `\u2705 Applied: ${finding.title}`, { parseMode: "plain" });
   } catch (e) {
-    const errorMsg = e?.message ?? String(e);
-    await channel.sendText(chatId, `\u274C Failed to apply fix: ${errorMsg}`, { parseMode: "plain" });
     session2.skipped.push(index);
   }
-  await showFinding(chatId, channel, index + 1);
+  await showFinding(chatId, channel, index + 1, effectiveMsgId);
 }
-async function skipFinding(chatId, channel, index) {
+async function skipFinding(chatId, channel, index, messageId) {
   const session2 = activeSessions.get(chatId);
   if (!session2) return;
   session2.skipped.push(index);
-  await showFinding(chatId, channel, index + 1);
+  await showFinding(chatId, channel, index + 1, messageId ?? session2.messageId);
 }
-async function stopReview(chatId, channel) {
-  await finishReview(chatId, channel);
+async function stopReview(chatId, channel, messageId) {
+  await finishReview(chatId, channel, messageId);
 }
-async function finishReview(chatId, channel) {
+async function finishReview(chatId, channel, messageId) {
   const session2 = activeSessions.get(chatId);
   if (!session2) return;
-  const { buildReviewCompleteMessage: buildReviewCompleteMessage3, buildReviewCompleteKeyboard: buildReviewCompleteKeyboard2 } = await Promise.resolve().then(() => (init_ui2(), ui_exports));
+  const { buildReviewCompleteMessage: buildReviewCompleteMessage3, buildReviewCompleteKeyboard: buildReviewCompleteKeyboard2 } = await Promise.resolve().then(() => (init_ui2(), ui_exports2));
   const msg = buildReviewCompleteMessage3(
     session2.applied.length,
     session2.skipped.length,
     session2.result.findings.length
   );
-  if (typeof channel.sendKeyboard === "function") {
-    await channel.sendKeyboard(chatId, msg, buildReviewCompleteKeyboard2());
+  const effectiveMsgId = messageId ?? session2.messageId;
+  if (effectiveMsgId) {
+    await sendOrEditKeyboard(chatId, channel, effectiveMsgId, msg, buildReviewCompleteKeyboard2());
   } else {
     await channel.sendText(chatId, msg, { parseMode: "plain" });
   }
@@ -22971,6 +23684,7 @@ var init_optimize = __esm({
   "src/router/optimize.ts"() {
     "use strict";
     init_log();
+    init_helpers();
     activeSessions = /* @__PURE__ */ new Map();
   }
 });
@@ -23196,7 +23910,7 @@ __export(auto_create_exports, {
   storePendingDraft: () => storePendingDraft
 });
 import { join as join30 } from "path";
-import { writeFile as writeFile5, mkdir as mkdir5 } from "fs/promises";
+import { writeFile as writeFile5, mkdir as mkdir4 } from "fs/promises";
 function isSkillWorthy(signals) {
   const { toolUseCount, tokenOutput, elapsedMs, userMessage } = signals;
   if (toolUseCount < 12) return false;
@@ -23378,7 +24092,7 @@ async function saveSkill(name, content, opts = {}) {
     }
   }
   const dir = join30(SKILLS_PATH, name);
-  await mkdir5(dir, { recursive: true });
+  await mkdir4(dir, { recursive: true });
   const filePath = join30(dir, "SKILL.md");
   await writeFile5(filePath, withFrontmatter, "utf-8");
   invalidateSkillCache();
@@ -23558,34 +24272,10 @@ async function handleVoiceConfigCommand(chatId, commandArgs, msg, channel) {
   await sendVoiceConfigKeyboard(chatId, channel);
 }
 async function handleResponseStyleCommand(chatId, commandArgs, msg, channel) {
-  const currentStyle = getResponseStyle(chatId);
-  if (typeof channel.sendKeyboard === "function") {
-    await channel.sendKeyboard(chatId, "\u{1F5E3}\uFE0F AI Response Style:", [
-      [
-        { label: `${currentStyle === "concise" ? "\u2713 " : ""}Concise`, data: "style:concise", ...currentStyle === "concise" ? { style: "primary" } : {} },
-        { label: `${currentStyle === "normal" ? "\u2713 " : ""}Normal`, data: "style:normal", ...currentStyle === "normal" ? { style: "primary" } : {} },
-        { label: `${currentStyle === "detailed" ? "\u2713 " : ""}Detailed`, data: "style:detailed", ...currentStyle === "detailed" ? { style: "primary" } : {} }
-      ]
-    ]);
-  } else {
-    await channel.sendText(chatId, `Current Response Style: ${currentStyle}`, { parseMode: "plain" });
-  }
+  await sendResponseStyleKeyboard(chatId, channel);
 }
 async function handleModelSignatureCommand(chatId, commandArgs, msg, channel) {
-  const currentSig = getModelSignature(chatId);
-  if (typeof channel.sendKeyboard === "function") {
-    await channel.sendKeyboard(chatId, `Model Signature: ${currentSig === "on" ? "ON" : "OFF"}
-Appends model + thinking level to each response.`, [
-      [
-        { label: currentSig === "on" ? "\u2713 On" : "On", data: "model_sig:on", ...currentSig === "on" ? { style: "success" } : {} },
-        { label: currentSig !== "on" ? "\u2713 Off" : "Off", data: "model_sig:off", ...currentSig !== "on" ? { style: "danger" } : {} }
-      ]
-    ]);
-  } else {
-    const newSig = currentSig === "on" ? "off" : "on";
-    setModelSignature(chatId, newSig);
-    await channel.sendText(chatId, newSig === "on" ? "Model signature enabled." : "Model signature disabled.", { parseMode: "plain" });
-  }
+  await sendModelSigKeyboard(chatId, channel);
 }
 async function handleRememberCommand(chatId, commandArgs, msg, channel) {
   if (!commandArgs) {
@@ -23604,15 +24294,29 @@ async function handleRememberCommand(chatId, commandArgs, msg, channel) {
 }
 async function handleForgetCommand(chatId, commandArgs, msg, channel) {
   if (!commandArgs) {
-    await channel.sendText(chatId, "Usage: /forget <keyword>", { parseMode: "plain" });
+    await sendForgetPicker(chatId, channel, 1);
     return;
   }
-  const count = forgetMemory(commandArgs);
-  await channel.sendText(
-    chatId,
-    count > 0 ? `Forgot ${count} memory(ies) matching "${commandArgs}".` : `No memories found matching "${commandArgs}".`,
-    { parseMode: "plain" }
+  const keyword = commandArgs.trim();
+  const matching = listMemories().filter(
+    (m) => m.trigger.toLowerCase().includes(keyword.toLowerCase()) || m.content.toLowerCase().includes(keyword.toLowerCase())
   );
+  if (matching.length === 0) {
+    await channel.sendText(chatId, `No memories found matching "${keyword}".`, { parseMode: "plain" });
+    return;
+  }
+  const preview = matching.slice(0, 3).map((m) => `\u2022 ${m.trigger}: ${m.content.slice(0, 40)}`).join("\n");
+  const more = matching.length > 3 ? `
+\u2026and ${matching.length - 3} more` : "";
+  const confirmText = `Delete ${matching.length} memory(ies) matching "${keyword}"?
+
+${preview}${more}`;
+  await sendOrEditKeyboard(chatId, channel, void 0, confirmText, [
+    [
+      { label: `\u{1F5D1} Delete ${matching.length}`, data: `forget:keyword:${keyword}`, style: "danger" },
+      { label: "Cancel", data: "forget:cancel" }
+    ]
+  ]);
 }
 async function handleIntentCommand(chatId, commandArgs, msg, channel) {
   const testMsg = commandArgs?.trim() || "hey";
@@ -23835,72 +24539,13 @@ async function handleMenuCommand(chatId, commandArgs, msg, channel) {
   }
 }
 async function handlePermissionsCommand(chatId, commandArgs, msg, channel) {
-  const currentMode = getMode(chatId);
-  const currentExecMode = getExecMode(chatId);
-  if (typeof channel.sendKeyboard === "function") {
-    const permButtons = Object.entries(PERM_MODES).map(([id, label2]) => [{
-      label: `${id === currentMode ? "\u2713 " : ""}${label2}`,
-      data: `perms:${id}`,
-      ...id === currentMode ? { style: "primary" } : {}
-    }]);
-    const approvalOn = currentExecMode === "approved";
-    permButtons.push([{
-      label: `${approvalOn ? "\u2713 " : ""}\u{1F512} Approve Before Execute: ${approvalOn ? "ON" : "OFF"}`,
-      data: `execmode:${approvalOn ? "yolo" : "approved"}`,
-      ...approvalOn ? { style: "primary" } : {}
-    }]);
-    await channel.sendKeyboard(chatId, "Permission & Execution Settings:", permButtons);
-  } else {
-    const lines = ["Permission modes:", ""];
-    for (const [id, label2] of Object.entries(PERM_MODES)) {
-      lines.push(`${id === currentMode ? "\u2713 " : "  "}/permissions ${id} \u2014 ${label2}`);
-    }
-    lines.push("");
-    lines.push(`Approve Before Execute: ${currentExecMode === "approved" ? "ON" : "OFF"}`);
-    await channel.sendText(chatId, lines.join("\n"), { parseMode: "plain" });
-  }
+  await sendPermissionsKeyboard(chatId, channel);
 }
 async function handleVerboseCommand(chatId, commandArgs, msg, channel) {
-  const currentVerbose = getVerboseLevel(chatId);
-  const buttons = Object.entries(VERBOSE_LEVELS).map(([id, label2]) => [{
-    label: `${id === currentVerbose ? "\u2713 " : ""}${label2}`,
-    data: `verbose:${id}`,
-    ...id === currentVerbose ? { style: "primary" } : {}
-  }]);
-  if (typeof channel.sendKeyboard === "function") {
-    await channel.sendKeyboard(chatId, "Tool visibility level:", buttons);
-  } else {
-    const lines = Object.entries(VERBOSE_LEVELS).map(
-      ([id, label2]) => `${id === currentVerbose ? "\u2713 " : "  "}${id} \u2014 ${label2}`
-    );
-    await channel.sendText(chatId, ["Tool visibility:", "", ...lines].join("\n"), { parseMode: "plain" });
-  }
+  await sendVerboseKeyboard(chatId, channel);
 }
 async function handleToolsCommand(chatId, commandArgs, msg, channel) {
-  const toolsMap = getToolsMap(chatId);
-  const currentMode = getMode(chatId);
-  if (typeof channel.sendKeyboard === "function") {
-    const toolButtons = [];
-    const toolList = [...ALL_TOOLS];
-    for (let i = 0; i < toolList.length; i += 3) {
-      const row = toolList.slice(i, i + 3).map((t) => ({
-        label: `${toolsMap[t] ? "\u2705" : "\u274C"} ${t}`,
-        data: `tool:toggle:${t}`
-      }));
-      toolButtons.push(row);
-    }
-    toolButtons.push([{ label: "Reset to defaults (all on)", data: "tool:reset", style: "danger" }]);
-    const modeNote = currentMode === "plan" ? "\n\nNote: In plan mode, tool list is ignored (read-only)." : currentMode === "yolo" ? "\n\nNote: In YOLO mode, tool list is ignored (all tools allowed)." : "";
-    await channel.sendKeyboard(
-      chatId,
-      `Configure allowed tools (mode: ${currentMode})${modeNote}
-Tap to toggle:`,
-      toolButtons
-    );
-  } else {
-    const lines = ALL_TOOLS.map((t) => `${toolsMap[t] ? "[on] " : "[off]"} ${t}`);
-    await channel.sendText(chatId, ["Allowed tools:", "", ...lines].join("\n"), { parseMode: "plain" });
-  }
+  await sendToolsKeyboard(chatId, channel);
 }
 async function handleNewchatCommand(chatId, commandArgs, msg, channel) {
   stopAllSideQuests(chatId);
@@ -23940,14 +24585,22 @@ async function handleNewchatCommand(chatId, commandArgs, msg, channel) {
     const text = `\u2705 New session started. Previous session archived${exchangeCount > 0 ? ` (${exchangeCount} exchanges)` : ""}.
 
 \u{1F9E0} ${backendLabel} \xB7 ${modelLabel}`;
-    if (ackMsgId) await channel.editText?.(chatId, ackMsgId, text, "plain");
-    const kbMsgId = await channel.sendKeyboard(chatId, text, [
+    const kbButtons = [
       [
         { label: "Switch Backend", data: "menu:backend", style: "primary" },
         { label: "Switch Model", data: "menu:model", style: "primary" }
       ],
       [{ label: "Undo", data: "newchat:undo" }]
-    ]);
+    ];
+    let kbMsgId;
+    if (ackMsgId && typeof channel.editKeyboard === "function") {
+      const edited = await channel.editKeyboard(chatId, ackMsgId, text, kbButtons);
+      if (edited) kbMsgId = ackMsgId;
+    }
+    if (!kbMsgId) {
+      if (ackMsgId) await channel.editText?.(chatId, ackMsgId, text, "plain");
+      kbMsgId = await channel.sendKeyboard(chatId, text, kbButtons);
+    }
     if (kbMsgId) {
       const prev = pendingNewchatUndo.get(chatId);
       if (prev) clearTimeout(prev.timer);
@@ -23966,6 +24619,14 @@ async function handleNewchatCommand(chatId, commandArgs, msg, channel) {
     }
   }
 }
+async function handleClearCommand(chatId, _commandArgs, _msg, channel) {
+  stopAllSideQuests(chatId);
+  clearSession(chatId);
+  clearChatPaidSlots(chatId);
+  setSessionStartedAt(chatId);
+  logActivity(getDb(), { chatId, source: "telegram", eventType: "config_changed", summary: "Session cleared (no summary)", detail: { field: "session", action: "clear" } });
+  await channel.sendText(chatId, "\u{1F9FD} Session cleared. No summary saved.", { parseMode: "plain" });
+}
 async function handleSummarizeCommand(chatId, commandArgs, msg, channel) {
   if (commandArgs?.toLowerCase() === "all") {
     const pendingIds = getLoggedChatIds();
@@ -24154,25 +24815,13 @@ async function handleStatusCommand(chatId, commandArgs, msg, channel) {
 }
 async function handleBackendCommand2(chatId, commandArgs, msg, channel) {
   const requestedBackend = (commandArgs ?? "").trim().toLowerCase();
-  if (requestedBackend && getAllBackendIds().includes(requestedBackend)) {
+  const chatBackendIds = getAvailableChatBackendIds();
+  if (requestedBackend && chatBackendIds.includes(requestedBackend)) {
     await sendBackendSwitchConfirmation(chatId, requestedBackend, channel);
     return;
   }
-  const currentBackend = getBackend(chatId);
-  const adapters2 = getAvailableAdapters();
-  if (typeof channel.sendKeyboard === "function") {
-    const buttons = adapters2.map((a) => [{
-      label: `${a.id === currentBackend ? "\u2713 " : ""}${a.displayName}`,
-      data: `backend:${a.id}`,
-      ...a.id === currentBackend ? { style: "primary" } : {}
-    }]);
-    await channel.sendKeyboard(chatId, "Select AI backend:", buttons);
-  } else {
-    const lines = adapters2.map(
-      (a) => `${a.id === currentBackend ? "\u2713 " : "  "}${a.displayName} (/backend ${a.id})`
-    );
-    await channel.sendText(chatId, ["Available backends:", "", ...lines].join("\n"), { parseMode: "plain" });
-  }
+  const { sendBackendPicker: sendBackendPicker2 } = await Promise.resolve().then(() => (init_ui(), ui_exports));
+  await sendBackendPicker2(chatId, channel);
 }
 async function handleBackendShortcutCommand(chatId, commandArgs, msg, channel) {
   const command = msg.command;
@@ -24184,82 +24833,10 @@ async function handleBackendShortcutCommand(chatId, commandArgs, msg, channel) {
   }
 }
 async function handleModelCommand(chatId, commandArgs, msg, channel) {
-  let adapter;
-  try {
-    adapter = getAdapterForChat(chatId);
-  } catch {
-    await channel.sendText(chatId, "No backend set. Use /backend first.", { parseMode: "plain" });
-    return;
-  }
-  const models = adapter.availableModels;
-  const current = getModel(chatId) ?? adapter.defaultModel;
-  if (typeof channel.sendKeyboard === "function") {
-    const buttons = Object.entries(models).map(([id, info]) => {
-      const tag = info.thinking === "adjustable" ? " \u26A1" : "";
-      return [{
-        label: `${id === current ? "\u2713 " : ""}${info.label}${tag}`,
-        data: `model:${id}`,
-        ...id === current ? { style: "primary" } : {}
-      }];
-    });
-    const isAuto = getModel(chatId) === "auto";
-    buttons.unshift([{
-      label: `${isAuto ? "\u2713 " : ""}\u{1F916} Auto (smart routing)`,
-      data: "model:auto",
-      ...isAuto ? { style: "primary" } : {}
-    }]);
-    await channel.sendKeyboard(chatId, `Models for ${adapter.displayName}:`, buttons);
-  } else {
-    const lines = Object.entries(models).map(
-      ([id, info]) => `${id === current ? "\u2713 " : "  "}${id} \u2014 ${info.label}`
-    );
-    await channel.sendText(chatId, [`Models (${adapter.displayName}):`, "", ...lines].join("\n"), { parseMode: "plain" });
-  }
+  await sendModelKeyboard(chatId, channel);
 }
 async function handleThinkingCommand(chatId, commandArgs, msg, channel) {
-  let adapter;
-  try {
-    adapter = getAdapterForChat(chatId);
-  } catch {
-    await channel.sendText(chatId, "No backend set. Use /backend first.", { parseMode: "plain" });
-    return;
-  }
-  const currentModel = getModel(chatId) ?? adapter.defaultModel;
-  const modelInfo = adapter.availableModels[currentModel];
-  const currentLevel = getThinkingLevel(chatId) || "auto";
-  if (!modelInfo || modelInfo.thinking !== "adjustable" || !modelInfo.thinkingLevels) {
-    await channel.sendText(chatId, `Current model (${shortModelName(currentModel)}) doesn't support adjustable thinking.
-Use /model to pick a model with \u26A1 thinking support.`, { parseMode: "plain" });
-    return;
-  }
-  if (typeof channel.sendKeyboard === "function") {
-    const showThinkingUi = getShowThinkingUi(chatId);
-    const buttons = modelInfo.thinkingLevels.map((level) => [{
-      label: `${level === currentLevel ? "\u2713 " : ""}${level === "auto" ? "Auto" : capitalize(level)}`,
-      data: `thinking:${level}`,
-      ...level === currentLevel ? { style: "primary" } : {}
-    }]);
-    buttons.push([{
-      label: `${showThinkingUi ? "\u2713 " : ""}\u{1F4AD} Show Thinking`,
-      data: "thinking_show_ui:toggle",
-      ...showThinkingUi ? { style: "primary" } : {}
-    }]);
-    await channel.sendKeyboard(
-      chatId,
-      `\u{1F4AD} Thinking Level \u2014 ${shortModelName(currentModel)}
-Current: ${capitalize(currentLevel)}
-Show thinking tokens: ${showThinkingUi ? "On" : "Off"}${adapter.id !== "claude" ? `
-
-\u26A0\uFE0F ${adapter.displayName} CLI doesn't stream thinking tokens` : ""}`,
-      buttons
-    );
-  } else {
-    const showThinkingUi = getShowThinkingUi(chatId);
-    await channel.sendText(chatId, `Thinking: ${capitalize(currentLevel)}
-Levels: ${modelInfo.thinkingLevels.join(", ")}
-Show thinking tokens: ${showThinkingUi ? "On" : "Off"}
-Set via callback (keyboard required).`, { parseMode: "plain" });
-  }
+  await sendThinkingKeyboard(chatId, channel);
 }
 async function handleUsageCommand(chatId, commandArgs, msg, channel, command) {
   if (commandArgs && command === "limits") {
@@ -25359,6 +25936,9 @@ async function handleCommand(msg, channel) {
     case "newchat":
       await handleNewchatCommand(chatId, commandArgs, msg, channel);
       break;
+    case "clear":
+      await handleClearCommand(chatId, commandArgs, msg, channel);
+      break;
     case "summarize":
       await handleSummarizeCommand(chatId, commandArgs, msg, channel);
       break;
@@ -25565,25 +26145,45 @@ async function handleCallback(chatId, data, channel, messageId) {
       await channel.sendText(chatId, text, { parseMode: "plain" });
     }
   };
-  const MENU_COMMANDS = {
-    newchat: "newchat",
-    status: "status",
-    backend: "backend",
-    model: "model",
-    jobs: "jobs",
-    memory: "memory",
-    history: "history",
-    help: "help",
-    permissions: "permissions",
-    style: "response_style",
-    health: "health"
-  };
   if (data.startsWith("menu:")) {
     const action = data.slice(5);
-    const cmd = MENU_COMMANDS[action];
-    if (cmd) {
-      const synth = { chatId, messageId: "", text: "", senderName: "User", type: "command", source: "telegram", command: cmd, commandArgs: "" };
-      await handleCommand(synth, channel);
+    switch (action) {
+      case "backend":
+        await sendBackendPicker(chatId, channel, messageId);
+        break;
+      case "model":
+        await sendModelKeyboard(chatId, channel, messageId);
+        break;
+      case "memory":
+        await sendMemoryPage(chatId, channel, 1, messageId);
+        break;
+      case "history":
+        await sendHistoryView(chatId, channel, {}, messageId);
+        break;
+      case "help":
+        await sendHelpCategories(chatId, channel, messageId);
+        break;
+      case "permissions":
+        await sendPermissionsKeyboard(chatId, channel, messageId);
+        break;
+      case "style":
+        await sendResponseStyleKeyboard(chatId, channel, messageId);
+        break;
+      case "jobs":
+        await sendJobsBoard(chatId, channel, 1, messageId);
+        break;
+      default: {
+        const MENU_COMMANDS = {
+          newchat: "newchat",
+          status: "status",
+          health: "health"
+        };
+        const cmd = MENU_COMMANDS[action];
+        if (cmd) {
+          const synth = { chatId, messageId: "", text: "", senderName: "User", type: "command", source: "telegram", command: cmd, commandArgs: "" };
+          await handleCommand(synth, channel);
+        }
+      }
     }
     return;
   }
@@ -25592,32 +26192,79 @@ async function handleCallback(chatId, data, channel, messageId) {
     if (!getAllBackendIds().includes(chosen)) return;
     const previous = getBackend(chatId);
     if (chosen === previous) {
-      const adapter = getAdapter(chosen);
-      await channel.sendText(chatId, `Already using ${adapter.displayName}.`, { parseMode: "plain" });
+      await sendBackendConfigPanel(chatId, chosen, channel, messageId, false);
       return;
     }
-    await sendBackendSwitchConfirmation(chatId, chosen, channel);
+    await doBackendSwitch(chatId, chosen, channel, { messageId });
+  } else if (data.startsWith("bconf:")) {
+    const rest = data.slice(6);
+    if (rest === "back") {
+      await sendBackendPicker(chatId, channel, messageId);
+    } else if (rest.startsWith("panel:")) {
+      const backendId = rest.slice(6);
+      await sendBackendConfigPanel(chatId, backendId, channel, messageId, false);
+    } else if (rest.startsWith("model:")) {
+      const backendId = rest.slice(6);
+      await sendBackendModelPicker(chatId, backendId, channel, messageId);
+    } else if (rest.startsWith("thinking:")) {
+      const backendId = rest.slice(9);
+      await sendBackendThinkingPicker(chatId, backendId, channel, messageId);
+    } else if (rest.startsWith("account:")) {
+      const backendId = rest.slice(8);
+      await sendBackendAccountPicker(chatId, backendId, channel, messageId);
+    } else if (rest.startsWith("setmodel:")) {
+      const parts = rest.slice(9).split(":");
+      const backendId = parts[0];
+      const modelId = parts.slice(1).join(":");
+      setModel(chatId, modelId);
+      await sendBackendConfigPanel(chatId, backendId, channel, messageId, false);
+    } else if (rest.startsWith("setthinking:")) {
+      const parts = rest.slice(12).split(":");
+      const backendId = parts[0];
+      const level = parts[1];
+      setThinkingLevel(chatId, level);
+      await sendBackendConfigPanel(chatId, backendId, channel, messageId, false);
+    } else if (rest.startsWith("setaccount:")) {
+      const parts = rest.slice(11).split(":");
+      const backendId = parts[0];
+      const slotIdStr = parts[1];
+      if (slotIdStr === "auto") {
+        if (backendId === "gemini") {
+          clearChatGeminiSlot(chatId);
+        } else {
+          clearChatBackendSlot(chatId, backendId);
+        }
+      } else {
+        const slotId = parseInt(slotIdStr, 10);
+        if (backendId === "gemini") {
+          pinChatGeminiSlot(chatId, slotId);
+        } else {
+          pinChatBackendSlot(chatId, backendId, slotId);
+        }
+      }
+      await sendBackendConfigPanel(chatId, backendId, channel, messageId, false);
+    }
   } else if (data.startsWith("backend_confirm_clear:")) {
     const target = data.slice("backend_confirm_clear:".length);
     if (!getAllBackendIds().includes(target)) return;
     clearMessageLog(chatId);
-    await doBackendSwitch(chatId, target, channel);
+    await doBackendSwitch(chatId, target, channel, { skipContext: true, messageId });
   } else if (data.startsWith("backend_confirm:")) {
     const chosen = data.slice(16);
     if (!getAllBackendIds().includes(chosen)) return;
-    await doBackendSwitch(chatId, chosen, channel);
+    await doBackendSwitch(chatId, chosen, channel, { messageId });
   } else if (data.startsWith("backend_cancel:") || data === "backend_cancel") {
-    await channel.sendText(chatId, "Switch cancelled.", { parseMode: "plain" });
+    await sendBackendPicker(chatId, channel, messageId);
   } else if (data.startsWith("backend_dismiss:")) {
     const backendId = data.slice(16);
-    const adapter = getAdapter(backendId);
-    await channel.sendText(chatId, `Using ${adapter.displayName} with default model. Ready!`, { parseMode: "plain" });
+    await sendBackendConfigPanel(chatId, backendId, channel, messageId, false);
   } else if (data.startsWith("model:")) {
     const chosen = data.slice(6);
     if (chosen === "auto") {
       setModel(chatId, "auto");
       clearThinkingLevel(chatId);
-      await channel.sendText(chatId, "\u{1F916} Smart routing enabled \u2014 model and thinking level will be chosen per message based on complexity.", { parseMode: "plain" });
+      logActivity(getDb(), { chatId, source: "telegram", eventType: "config_changed", summary: "Smart routing enabled", detail: { field: "model", value: "auto" } });
+      await sendModelKeyboard(chatId, channel, messageId);
       return;
     }
     let adapter;
@@ -25633,45 +26280,19 @@ async function handleCallback(chatId, data, channel, messageId) {
     clearThinkingLevel(chatId);
     logActivity(getDb(), { chatId, source: "telegram", eventType: "config_changed", summary: `Model switched to ${modelInfo.label}`, detail: { field: "model", value: chosen } });
     if (modelInfo.thinking === "adjustable" && modelInfo.thinkingLevels) {
-      const thinkingButtons = modelInfo.thinkingLevels.map((level) => [{
-        label: level === "auto" ? "Auto (default)" : level.replace("_", " ").replace(/\b\w/g, (c) => c.toUpperCase()),
-        data: `thinking:${level}`
-      }]);
-      if (typeof channel.sendKeyboard === "function") {
-        await channel.sendKeyboard(
-          chatId,
-          `Model set to ${modelInfo.label}. Session continues.
-
-Select thinking/effort level:`,
-          thinkingButtons
-        );
-      } else {
-        await channel.sendText(chatId, `Model set to ${modelInfo.label}. Session continues.`, { parseMode: "plain" });
-      }
+      await sendThinkingKeyboard(chatId, channel, messageId, chosen);
     } else {
-      await channel.sendText(chatId, `Model switched to ${modelInfo.label}. Session continues.`, { parseMode: "plain" });
+      await sendModelKeyboard(chatId, channel, messageId);
     }
   } else if (data.startsWith("thinking:")) {
     const level = data.slice(9);
     setThinkingLevel(chatId, level);
     logActivity(getDb(), { chatId, source: "telegram", eventType: "config_changed", summary: `Thinking level set to ${level}`, detail: { field: "thinking", value: level } });
-    const label2 = level === "auto" ? "Auto" : level.replace("_", " ").replace(/\b\w/g, (c) => c.toUpperCase());
-    await channel.sendText(chatId, `Thinking level set to: ${label2}`, { parseMode: "plain" });
+    await sendThinkingKeyboard(chatId, channel, messageId);
   } else if (data === "thinking_show_ui:toggle") {
     const newState = toggleShowThinkingUi(chatId);
     logActivity(getDb(), { chatId, source: "telegram", eventType: "config_changed", summary: `Show thinking UI ${newState ? "enabled" : "disabled"}`, detail: { field: "show_thinking_ui", value: String(newState) } });
-    let msg;
-    if (newState) {
-      let backendId;
-      try {
-        backendId = getAdapterForChat(chatId).id;
-      } catch {
-      }
-      msg = backendId && backendId !== "claude" ? `\u{1F4AD} Thinking tokens enabled \u2014 but ${capitalize(backendId)} CLI doesn't stream them.` : "\u{1F4AD} Thinking tokens will now stream live in the status message.";
-    } else {
-      msg = "\u{1F4AD} Thinking tokens hidden. Toggle on again via /thinking.";
-    }
-    await channel.sendText(chatId, msg, { parseMode: "plain" });
+    await sendThinkingKeyboard(chatId, channel, messageId);
   } else if (data.startsWith("debug_log:")) {
     const value = data.slice(10) === "on";
     const { setSessionLogEnabled: setSessionLogEnabled2 } = await Promise.resolve().then(() => (init_chat_settings(), chat_settings_exports));
@@ -25698,19 +26319,9 @@ ${value ? "Full tool inputs/results will be saved to ~/.cc-claw/logs/sessions/"
     let chosen = data.slice(6);
     if (chosen === "readonly") chosen = "plan";
     if (!PERM_MODES[chosen]) return;
-    const previous = getMode(chatId);
-    if (chosen === previous) {
-      await channel.sendText(chatId, `Already in ${chosen} mode.`, { parseMode: "plain" });
-      return;
-    }
     setMode(chatId, chosen);
     logActivity(getDb(), { chatId, source: "telegram", eventType: "config_changed", summary: `Permission mode set to ${chosen}`, detail: { field: "permissions", value: chosen } });
-    await channel.sendText(
-      chatId,
-      `Permission mode: ${chosen}
-${PERM_MODES[chosen]}`,
-      { parseMode: "plain" }
-    );
+    await sendPermissionsKeyboard(chatId, channel, messageId);
   } else if (data.startsWith("perm:escalate:")) {
     const targetMode = data.slice(14);
     if (!PERM_MODES[targetMode]) return;
@@ -25730,33 +26341,20 @@ ${PERM_MODES[chosen]}`,
     const chosen = data.slice(8);
     if (!VERBOSE_LEVELS[chosen]) return;
     setVerboseLevel(chatId, chosen);
-    await channel.sendText(chatId, `Tool visibility: ${VERBOSE_LEVELS[chosen]}`, { parseMode: "plain" });
+    await sendVerboseKeyboard(chatId, channel, messageId);
   } else if (data.startsWith("tool:toggle:")) {
     const toolName = data.slice(12);
     if (!ALL_TOOLS.includes(toolName)) return;
-    const newState = toggleTool(chatId, toolName);
-    await channel.sendText(
-      chatId,
-      `${newState ? "\u2705" : "\u274C"} ${toolName} ${newState ? "enabled" : "disabled"}`,
-      { parseMode: "plain" }
-    );
+    toggleTool(chatId, toolName);
+    await sendToolsKeyboard(chatId, channel, messageId);
   } else if (data === "tool:reset") {
     resetTools(chatId);
-    await channel.sendText(chatId, "Tool configuration reset \u2014 all tools enabled.", { parseMode: "plain" });
+    await sendToolsKeyboard(chatId, channel, messageId);
   } else if (data.startsWith("style:")) {
     const selectedStyle = data.split(":")[1];
     if (selectedStyle === "concise" || selectedStyle === "normal" || selectedStyle === "detailed") {
       setResponseStyle(chatId, selectedStyle);
-      if (typeof channel.sendKeyboard === "function") {
-        await channel.sendKeyboard(chatId, "\u{1F5E3}\uFE0F AI Response Style:", [
-          [
-            { label: `${selectedStyle === "concise" ? "\u2713 " : ""}Concise`, data: "style:concise", ...selectedStyle === "concise" ? { style: "primary" } : {} },
-            { label: `${selectedStyle === "normal" ? "\u2713 " : ""}Normal`, data: "style:normal", ...selectedStyle === "normal" ? { style: "primary" } : {} },
-            { label: `${selectedStyle === "detailed" ? "\u2713 " : ""}Detailed`, data: "style:detailed", ...selectedStyle === "detailed" ? { style: "primary" } : {} }
-          ]
-        ]);
-      }
-      await channel.sendText(chatId, `Response style set to: ${selectedStyle}`, { parseMode: "plain" });
+      await sendResponseStyleKeyboard(chatId, channel, messageId);
     }
   } else if (data.startsWith("agentmode:")) {
     const mode = data.split(":")[1];
@@ -25825,25 +26423,20 @@ ${plan.originalMessage}`;
     const mode = data.split(":")[1];
     if (mode === "approved" || mode === "yolo") {
       setExecMode(chatId, mode);
-      const msg = mode === "approved" ? "\u{1F512} Approve Before Execute: <b>ON</b>\nAI will show a plan for your approval before acting." : "\u26A1 Approve Before Execute: <b>OFF</b>\nAI will execute immediately (YOLO mode).";
-      await channel.sendText(chatId, msg, { parseMode: "html" });
+      await sendPermissionsKeyboard(chatId, channel, messageId);
     }
     return;
   } else if (data.startsWith("model_sig:")) {
     const value = data.slice(10);
     setModelSignature(chatId, value);
-    await channel.sendText(
-      chatId,
-      value === "on" ? "\u{1F9E0} Model signature enabled. Each response will show the active model and thinking level." : "Model signature disabled.",
-      { parseMode: "plain" }
-    );
+    await sendModelSigKeyboard(chatId, channel, messageId);
   } else if (data.startsWith("voice:")) {
     const action = data.slice(6);
     if (action === "on" || action === "off") {
       const current = isVoiceEnabled(chatId);
       const desired = action === "on";
       if (current !== desired) toggleVoice(chatId);
-      await channel.sendText(chatId, desired ? "\u{1F50A} Voice responses enabled." : "\u{1F507} Voice responses disabled.", { parseMode: "plain" });
+      await sendVoiceConfigKeyboard(chatId, channel, messageId);
     }
   } else if (data.startsWith("vcfg:stt-model:")) {
     const model2 = data.slice(15);
@@ -25855,64 +26448,81 @@ ${plan.originalMessage}`;
     setSttModel(chatId, model2);
     const info = LOCAL_WHISPER_MODELS[model2];
     const downloaded = isWhisperModelDownloaded(model2);
-    const notice = downloaded ? `\u2705 Transcription model set to ${model2} (${info.size}, ${info.lang}). Already downloaded.` : `\u2705 Transcription model set to ${model2} (${info.size}, ${info.lang}).
-
-\u2B07\uFE0F Model will be downloaded on your first voice message (~${info.size}). This is a one-time download.`;
-    await channel.sendText(chatId, notice, { parseMode: "plain" });
-    await sendVoiceConfigKeyboard(chatId, channel);
-  } else if (data.startsWith("vcfg:stt:")) {
-    const provider = data.slice(9);
-    if (provider === "local-whisper") {
-      if (!isWhisperCliAvailable()) {
-        await channel.sendText(
+    if (downloaded) {
+      await sendVoiceConfigKeyboard(chatId, channel, messageId);
+    } else {
+      if (messageId && channel.editKeyboard) {
+        await channel.editKeyboard(
           chatId,
-          "\u26A0\uFE0F Local Whisper requires `whisper-cli` to be installed.\n\nInstall it:\n```\nbrew install whisper-cpp\n```\n(macOS/Linux with Homebrew)\n\nOr download from: https://github.com/ggml-org/whisper.cpp/releases\n\nOnce installed, select Local Whisper here and pick a model.",
-          { parseMode: "markdown" }
+          messageId,
+          `\u{1F399}\uFE0F Voice Settings
+
+\u2B07\uFE0F Downloading ${model2} (${info.size})\u2026
+This may take a moment.`,
+          []
         );
-        return;
+      } else {
+        await channel.sendText(chatId, `\u2B07\uFE0F Downloading ${model2} (${info.size})...`, { parseMode: "plain" });
+      }
+      try {
+        await downloadWhisperModel(model2, async (progressMsg) => {
+          if (messageId && channel.editKeyboard) {
+            await channel.editKeyboard(
+              chatId,
+              messageId,
+              `\u{1F399}\uFE0F Voice Settings
+
+${progressMsg}`,
+              []
+            );
+          }
+        });
+        await sendVoiceConfigKeyboard(chatId, channel, messageId);
+      } catch (err) {
+        const errMsg = err instanceof Error ? err.message : String(err);
+        const failMsg = `\u{1F399}\uFE0F Voice Settings
+
+\u274C Download failed: ${errMsg}
+
+Tap the model again to retry.`;
+        if (messageId && channel.editKeyboard) {
+          await sendVoiceConfigKeyboard(chatId, channel, messageId);
+        } else {
+          await channel.sendText(chatId, failMsg, { parseMode: "plain" });
+        }
       }
     }
-    if (provider === "groq" && !process.env.GROQ_API_KEY) {
-      await channel.sendText(
+  } else if (data.startsWith("vcfg:stt:")) {
+    const provider = data.slice(9);
+    if (provider === "local-whisper" && !isFfmpegAvailable()) {
+      await sendOrEditKeyboard(
         chatId,
-        "\u26A0\uFE0F Groq requires `GROQ_API_KEY` to be set.\n\nGet a free key at https://console.groq.com/keys, then add it:\n```\necho 'GROQ_API_KEY=your-key' >> ~/.cc-claw/.env\ncc-claw service restart\n```",
-        { parseMode: "markdown" }
+        channel,
+        messageId,
+        "\u{1F399}\uFE0F Voice Settings\n\n\u26A0\uFE0F Local Whisper requires ffmpeg to convert audio.\n\nInstall: brew install ffmpeg\n\nThen tap Local Whisper again.",
+        [[{ label: "\u2190 Back", data: "vcfg:stt:groq" }]]
       );
+      return;
+    }
+    if (provider === "groq" && !process.env.GROQ_API_KEY) {
     }
     setSttProvider(chatId, provider);
-    const label2 = provider === "groq" ? "Groq (cloud)" : "Local Whisper";
-    await channel.sendText(chatId, `\u2705 Transcription provider set to: ${label2}`, { parseMode: "plain" });
-    await sendVoiceConfigKeyboard(chatId, channel);
+    await sendVoiceConfigKeyboard(chatId, channel, messageId);
   } else if (data.startsWith("vcfg:")) {
     const parts = data.slice(5).split(":");
     const action = parts[0];
     if (action === "p") {
       const provider = parts[1];
       if (provider === "elevenlabs" || provider === "grok" || provider === "macos") {
-        if (provider === "grok" && !process.env.XAI_API_KEY) {
-          await channel.sendText(
-            chatId,
-            "\u26A0\uFE0F Grok requires `XAI_API_KEY` to be set.\n\nAdd it to your config:\n```\necho 'XAI_API_KEY=your-key-here' >> ~/.cc-claw/.env\ncc-claw service restart\n```\n\nGet a key at: https://console.x.ai/team/default/api-keys\n\nSetting Grok as your provider \u2014 it will activate once the key is added.",
-            { parseMode: "markdown" }
-          );
-        }
-        if (provider === "elevenlabs" && !process.env.ELEVENLABS_API_KEY) {
-          await channel.sendText(
-            chatId,
-            "\u26A0\uFE0F ElevenLabs requires `ELEVENLABS_API_KEY` to be set.\n\nAdd it to your config:\n```\necho 'ELEVENLABS_API_KEY=your-key-here' >> ~/.cc-claw/.env\ncc-claw service restart\n```\n\nGet a key at: https://elevenlabs.io/api\n\nSetting ElevenLabs as your provider \u2014 it will activate once the key is added.",
-            { parseMode: "markdown" }
-          );
-        }
         const defaultVoice = provider === "grok" ? "eve" : provider === "macos" ? "Samantha" : "21m00Tcm4TlvDq8ikWAM";
         setVoiceProvider(chatId, provider, defaultVoice);
-        await sendVoiceConfigKeyboard(chatId, channel);
+        await sendVoiceConfigKeyboard(chatId, channel, messageId);
       }
     } else if (action === "v") {
       const voiceId = parts.slice(1).join(":");
       const config2 = getVoiceConfig(chatId);
       setVoiceProvider(chatId, config2.provider, voiceId);
-      const voiceName = config2.provider === "elevenlabs" ? ELEVENLABS_VOICES[voiceId]?.name ?? voiceId : config2.provider === "macos" ? MACOS_VOICES[voiceId]?.name ?? voiceId : voiceId;
-      await channel.sendText(chatId, `\u2705 Voice set to: ${voiceName}`, { parseMode: "plain" });
+      await sendVoiceConfigKeyboard(chatId, channel, messageId);
     }
   } else if (data.startsWith("profile:")) {
     await handleProfileCallback(chatId, data, channel);
@@ -25970,14 +26580,14 @@ ${plan.originalMessage}`;
         try {
           const { askAgent: askAgent3 } = await Promise.resolve().then(() => (init_agent(), agent_exports));
           const { BACKEND: BACKEND2 } = await Promise.resolve().then(() => (init_types(), types_exports));
-          const { pinChatGeminiSlot: pinChatGeminiSlot4, pinChatBackendSlot: pinChatBackendSlot3 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+          const { pinChatGeminiSlot: pinChatGeminiSlot5, pinChatBackendSlot: pinChatBackendSlot4 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
           const testChatId = `cron:test:${id}:${Date.now()}`;
           const backend2 = testJob.backend ?? "claude";
           if (testJob.credentialSlotId) {
             if (backend2 === BACKEND2.GEMINI) {
-              pinChatGeminiSlot4(testChatId, testJob.credentialSlotId);
+              pinChatGeminiSlot5(testChatId, testJob.credentialSlotId);
             } else {
-              pinChatBackendSlot3(testChatId, backend2, testJob.credentialSlotId);
+              pinChatBackendSlot4(testChatId, backend2, testJob.credentialSlotId);
             }
           }
           const t0 = Date.now();
@@ -26305,74 +26915,73 @@ Result: ${task.result.slice(0, 500)}` : ""
   } else if (data.startsWith("grotation:")) {
     const mode = data.split(":")[1];
     await handleRotationModeChange(chatId, channel, "gemini", mode);
+    const slots = getGeminiSlots();
+    const rows = buildAccountSlotKeyboard(slots, getChatGeminiSlotId(chatId), getGeminiRotationMode(), "gslot:", "grotation:");
+    await sendOrEditKeyboard(chatId, channel, messageId, "\u{1F511} Gemini Accounts & Rotation:", rows);
     return;
   } else if (data.startsWith("brotation:")) {
     const parts = data.split(":");
     const backend2 = parts[1];
     const mode = parts[2];
     await handleRotationModeChange(chatId, channel, backend2, mode);
+    const { getBackendRotationMode: getBackendRotationMode2 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+    const slots = getBackendSlots(backend2);
+    const rows = buildAccountSlotKeyboard(slots, getChatBackendSlotId(chatId, backend2), getBackendRotationMode2(backend2), `bslot:${backend2}:`, `brotation:${backend2}:`);
+    const displayName = backend2 === BACKEND.CLAUDE ? "Claude" : "Codex";
+    await sendOrEditKeyboard(chatId, channel, messageId, `\u{1F511} ${displayName} Accounts & Rotation:`, rows);
     return;
   } else if (data.startsWith("gslot:")) {
     const val = data.split(":")[1];
     if (val === "auto") {
       clearChatGeminiSlot(chatId);
       clearSession(chatId);
-      await channel.sendText(chatId, "Gemini slot set to <b>\u{1F504} auto rotation</b>.", { parseMode: "html" });
     } else {
       const slotId = parseInt(val, 10);
-      const slots = getGeminiSlots();
-      const slot = slots.find((s) => s.id === slotId);
+      const slot = getGeminiSlots().find((s) => s.id === slotId);
       if (slot) {
         pinChatGeminiSlot(chatId, slotId);
         clearSession(chatId);
-        const label2 = slot.label || `slot-${slot.id}`;
-        const icon = slot.slotType === "oauth" ? "\u{1F468}\u{1F3FD}\u200D\u{1F4BB}" : "\u{1F511}";
-        const rotationMode = getGeminiRotationMode();
-        const rotationLabels = { off: "off", all: "all slots", accounts: "accounts only", keys: "keys only" };
-        const rotationNote = rotationMode === "off" ? "Rotation is off \u2014 only this account will be used." : `Rotation: ${rotationLabels[rotationMode]} (this is the starting slot).`;
-        await channel.sendText(chatId, `${icon} Account set to <b>${label2}</b>
-${rotationNote}`, { parseMode: "html" });
       }
     }
+    const slots = getGeminiSlots();
+    const rows = buildAccountSlotKeyboard(slots, getChatGeminiSlotId(chatId), getGeminiRotationMode(), "gslot:", "grotation:");
+    await sendOrEditKeyboard(chatId, channel, messageId, "\u{1F511} Gemini Accounts & Rotation:", rows);
     return;
   } else if (data === "gopen:accounts") {
     const slots = getGeminiSlots();
     if (slots.length === 0) {
-      await channel.sendText(chatId, "No Gemini credentials configured.\nAdd with: <code>cc-claw gemini add-key</code> or <code>cc-claw gemini add-account</code>", { parseMode: "html" });
-      return;
-    }
-    if (typeof channel.sendKeyboard === "function") {
-      const rows = buildAccountSlotKeyboard(
-        slots,
-        getChatGeminiSlotId(chatId),
-        getGeminiRotationMode(),
-        "gslot:",
-        "grotation:"
+      await sendOrEditKeyboard(
+        chatId,
+        channel,
+        messageId,
+        "No Gemini credentials configured.\nAdd with: cc-claw gemini add-key or cc-claw gemini add-account",
+        [[{ label: "\u2190 Back", data: "menu:backend" }]]
       );
-      await channel.sendKeyboard(chatId, "Gemini Accounts & Rotation:", rows);
+      return;
     }
+    const rows = buildAccountSlotKeyboard(slots, getChatGeminiSlotId(chatId), getGeminiRotationMode(), "gslot:", "grotation:");
+    await sendOrEditKeyboard(chatId, channel, messageId, "\u{1F511} Gemini Accounts & Rotation:", rows);
     return;
   } else if (data.startsWith("bslot:")) {
     const parts = data.split(":");
     const backend2 = parts[1];
     const val = parts[2];
-    const displayName = backend2 === BACKEND.CLAUDE ? "Claude" : "Codex";
     if (val === "auto") {
       clearChatBackendSlot(chatId, backend2);
       clearSession(chatId);
-      await channel.sendText(chatId, `${displayName} slot set to <b>\u{1F504} auto rotation</b>.`, { parseMode: "html" });
     } else {
       const slotId = parseInt(val, 10);
-      const slots = getBackendSlots(backend2);
-      const slot = slots.find((s) => s.id === slotId);
+      const slot = getBackendSlots(backend2).find((s) => s.id === slotId);
       if (slot) {
         pinChatBackendSlot(chatId, backend2, slotId);
         clearSession(chatId);
-        const label2 = slot.label || `slot-${slot.id}`;
-        const icon = slot.slotType === "oauth" ? "\u{1F468}\u{1F3FD}\u200D\u{1F4BB}" : "\u{1F511}";
-        await channel.sendText(chatId, `${icon} ${displayName} account set to <b>${label2}</b>`, { parseMode: "html" });
       }
     }
+    const { getBackendRotationMode: getBackendRotationMode2 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+    const slots = getBackendSlots(backend2);
+    const rows = buildAccountSlotKeyboard(slots, getChatBackendSlotId(chatId, backend2), getBackendRotationMode2(backend2), `bslot:${backend2}:`, `brotation:${backend2}:`);
+    const displayName = backend2 === BACKEND.CLAUDE ? "Claude" : "Codex";
+    await sendOrEditKeyboard(chatId, channel, messageId, `\u{1F511} ${displayName} Accounts & Rotation:`, rows);
     return;
   } else if (data.startsWith("paidslot:")) {
     const parts = data.split(":");
@@ -26517,10 +27126,10 @@ ${rotationNote}`, { parseMode: "html" });
       await channel.sendText(chatId, "Fallback expired. Use /backend to switch manually.", { parseMode: "plain" });
     }
   } else if (data.startsWith("evolve:")) {
-    await handleEvolveCallback(chatId, data, channel);
+    await handleEvolveCallback(chatId, data, channel, messageId);
     return;
   } else if (data.startsWith("reflect:")) {
-    await handleReflectCallback(chatId, data, channel);
+    await handleReflectCallback(chatId, data, channel, messageId);
     return;
   } else if (data.startsWith("council:")) {
     const parts = data.split(":");
@@ -26528,45 +27137,54 @@ ${rotationNote}`, { parseMode: "html" });
     if (action === "toggle") {
       const backend2 = parts[2];
       const model2 = parts[3];
-      const { getAdapter: getAdapter4 } = await Promise.resolve().then(() => (init_backends(), backends_exports));
-      const toggleAdapter = getAdapter4(backend2);
+      const toggleAdapter = getAdapter(backend2);
       const label2 = toggleAdapter.availableModels[model2]?.label ?? model2;
       const { toggleParticipant: toggleParticipant2, buildSelectKeyboard: buildSelectKeyboard2, hasPendingCouncil: hasPendingCouncil2 } = await Promise.resolve().then(() => (init_wizard2(), wizard_exports2));
       if (!hasPendingCouncil2(chatId)) {
-        await channel.sendText(chatId, "No council wizard active. Use /council to start.", { parseMode: "plain" });
+        await sendOrEditKeyboard(
+          chatId,
+          channel,
+          messageId,
+          "No council wizard active. Use /council to start.",
+          []
+        );
         return;
       }
       toggleParticipant2(chatId, backend2, model2, label2);
-      if (typeof channel.sendKeyboard === "function") {
-        const { text, buttons } = buildSelectKeyboard2(chatId);
-        await channel.sendKeyboard(chatId, text, buttons);
-      }
+      const { text, buttons } = buildSelectKeyboard2(chatId);
+      await sendOrEditKeyboard(chatId, channel, messageId, text, buttons);
       return;
     }
     if (action === "start") {
       const { getCouncilState: getCouncilState2 } = await Promise.resolve().then(() => (init_wizard2(), wizard_exports2));
       const state = getCouncilState2(chatId);
       if (!state || state.selected.size < 2) {
-        await channel.sendText(chatId, "Select at least 2 models first.", { parseMode: "plain" });
+        await sendOrEditKeyboard(chatId, channel, messageId, "Select at least 2 models first.", []);
         return;
       }
       state.step = "question";
       const names = [...state.selected.values()].map((p) => p.label).join(", ");
-      await channel.sendText(chatId, `\u{1F3DB}\uFE0F Council members: ${names}
+      await sendOrEditKeyboard(
+        chatId,
+        channel,
+        messageId,
+        `\u{1F3DB}\uFE0F Council members: ${names}
 
-Now type the question you want them to debate.`, { parseMode: "plain" });
+Now type the question you want them to debate.`,
+        [[{ label: "\u2715 Cancel", data: "council:cancel" }]]
+      );
       return;
     }
     if (action === "cancel") {
       const { cancelCouncil: cancelCouncil2 } = await Promise.resolve().then(() => (init_wizard2(), wizard_exports2));
       cancelCouncil2(chatId);
-      await channel.sendText(chatId, "Council cancelled.", { parseMode: "plain" });
+      await sendOrEditKeyboard(chatId, channel, messageId, "Council cancelled.", []);
       return;
     }
     if (action === "noop") return;
     return;
   } else if (data.startsWith("opt:")) {
-    await handleOptimizeCallback(chatId, data, channel);
+    await handleOptimizeCallback(chatId, data, channel, messageId);
     return;
   } else if (data.startsWith("ollama:")) {
     const { handleOllamaCallback: handleOllamaCallback2 } = await Promise.resolve().then(() => (init_ollama3(), ollama_exports2));
@@ -26648,14 +27266,14 @@ Now type the question you want them to debate.`, { parseMode: "plain" });
     const rest = data.slice(5);
     if (rest.startsWith("recent:")) {
       const limit = parseInt(rest.slice(7), 10) || 25;
-      await sendHistoryView(chatId, channel, { limit });
+      await sendHistoryView(chatId, channel, { limit }, messageId);
     } else if (rest === "today") {
-      await sendHistoryView(chatId, channel, { period: "today" });
+      await sendHistoryView(chatId, channel, { period: "today" }, messageId);
     } else if (rest === "week") {
-      await sendHistoryView(chatId, channel, { period: "week" });
+      await sendHistoryView(chatId, channel, { period: "week" }, messageId);
     } else if (rest.startsWith("backend:")) {
       const backend2 = rest.slice(8);
-      await sendHistoryView(chatId, channel, { backend: backend2 });
+      await sendHistoryView(chatId, channel, { backend: backend2 }, messageId);
     }
     return;
   } else if (data.startsWith("forget:")) {
@@ -26667,36 +27285,37 @@ Now type the question you want them to debate.`, { parseMode: "plain" });
       const id = parseInt(rest.slice(5), 10);
       const memory2 = getMemoryById(id);
       if (!memory2) {
-        if (typeof channel.sendKeyboard === "function") {
-          await channel.sendKeyboard(chatId, "This memory no longer exists.", [
-            [{ label: "Refresh List", data: "forget:page:1" }]
-          ]);
-        } else {
-          await channel.sendText(chatId, "This memory no longer exists.", { parseMode: "plain" });
-        }
+        await sendOrEditKeyboard(chatId, channel, messageId, "This memory no longer exists.", [
+          [{ label: "Refresh List", data: "forget:page:1" }]
+        ]);
         return;
       }
       const detail = `Delete this memory?
+
 "${memory2.trigger}: ${memory2.content}"
 Salience: ${memory2.salience.toFixed(2)} | Created: ${memory2.created_at.slice(0, 10)}`;
-      if (typeof channel.sendKeyboard === "function") {
-        await channel.sendKeyboard(chatId, detail, [
-          [
-            { label: "Confirm Delete", data: `forget:confirm:${id}`, style: "danger" },
-            { label: "Cancel", data: "forget:cancel" }
-          ]
-        ]);
-      }
+      await sendOrEditKeyboard(chatId, channel, messageId, detail, [
+        [
+          { label: "\u{1F5D1} Confirm Delete", data: `forget:confirm:${id}`, style: "danger" },
+          { label: "\u2190 Back", data: "forget:page:1" }
+        ]
+      ]);
     } else if (rest.startsWith("confirm:")) {
       const id = parseInt(rest.slice(8), 10);
       const deleted = deleteMemoryById(id);
-      await channel.sendText(
-        chatId,
-        deleted ? "Memory deleted." : "Memory not found \u2014 already deleted.",
-        { parseMode: "plain" }
-      );
+      const msg = deleted ? "\u2705 Memory deleted." : "Memory not found \u2014 already deleted.";
+      await sendOrEditKeyboard(chatId, channel, messageId, msg, [
+        [{ label: "\u2190 Back to List", data: "forget:page:1" }]
+      ]);
+    } else if (rest.startsWith("keyword:")) {
+      const keyword = rest.slice(8);
+      const count = (await Promise.resolve().then(() => (init_store5(), store_exports5))).forgetMemory(keyword);
+      const msg = count > 0 ? `\u2705 Deleted ${count} memory(ies) matching "${keyword}".` : `No memories found matching "${keyword}".`;
+      await sendOrEditKeyboard(chatId, channel, messageId, msg, [
+        [{ label: "\u2190 Back to List", data: "forget:page:1" }]
+      ]);
     } else if (rest === "cancel") {
-      await channel.sendText(chatId, "Cancelled.", { parseMode: "plain" });
+      await sendForgetPicker(chatId, channel, 1, messageId);
     }
     return;
   } else if (data.startsWith("mem:")) {
@@ -26706,60 +27325,17 @@ Salience: ${memory2.salience.toFixed(2)} | Created: ${memory2.created_at.slice(0
       await sendMemoryPage(chatId, channel, page, messageId);
     } else if (rest.startsWith("view:")) {
       const id = parseInt(rest.slice(5), 10);
-      const memory2 = getMemoryById(id);
-      if (!memory2) {
-        if (typeof channel.sendKeyboard === "function") {
-          await channel.sendKeyboard(chatId, "This memory no longer exists.", [
-            [{ label: "Refresh List", data: "mem:page:1" }]
-          ]);
-        } else {
-          await channel.sendText(chatId, "This memory no longer exists.", { parseMode: "plain" });
-        }
-        return;
-      }
-      const detail = [
-        buildSectionHeader(`Memory #${memory2.id}`),
-        `Trigger: ${memory2.trigger}`,
-        `Content: ${memory2.content}`,
-        `Salience: ${memory2.salience.toFixed(2)} | Created: ${memory2.created_at.slice(0, 10)}`
-      ].join("\n");
-      if (typeof channel.sendKeyboard === "function") {
-        await channel.sendKeyboard(chatId, detail, [
-          [
-            { label: "Edit", data: `mem:edit:${id}`, style: "primary" },
-            { label: "Forget", data: `mem:forget:${id}`, style: "danger" }
-          ],
-          [{ label: "Back to List", data: "mem:back" }]
-        ]);
-      }
+      await sendMemoryDetail(chatId, id, channel, messageId);
     } else if (rest.startsWith("forget:confirm:")) {
       const id = parseInt(rest.slice(15), 10);
       const deleted = deleteMemoryById(id);
-      await channel.sendText(
-        chatId,
-        deleted ? "Memory deleted." : "Memory not found \u2014 already deleted.",
-        { parseMode: "plain" }
-      );
+      const msg = deleted ? "\u2705 Memory deleted." : "Memory not found \u2014 already deleted.";
+      await sendOrEditKeyboard(chatId, channel, messageId, msg, [
+        [{ label: "\u2190 Back to List", data: "mem:back" }]
+      ]);
     } else if (rest.startsWith("forget:")) {
       const id = parseInt(rest.slice(7), 10);
-      const memory2 = getMemoryById(id);
-      if (!memory2) {
-        await channel.sendText(chatId, "Memory not found.", { parseMode: "plain" });
-        return;
-      }
-      if (typeof channel.sendKeyboard === "function") {
-        await channel.sendKeyboard(
-          chatId,
-          `Delete this memory?
-"${memory2.trigger}: ${memory2.content}"`,
-          [
-            [
-              { label: "Confirm Delete", data: `mem:forget:confirm:${id}`, style: "danger" },
-              { label: "Cancel", data: `mem:view:${id}` }
-            ]
-          ]
-        );
-      }
+      await sendMemoryForgetConfirm(chatId, id, channel, messageId);
     } else if (rest.startsWith("edit:")) {
       const id = parseInt(rest.slice(5), 10);
       await channel.sendText(chatId, `Type: /memory edit ${id} <new content>`, { parseMode: "plain" });
@@ -26772,6 +27348,7 @@ Salience: ${memory2.salience.toFixed(2)} | Created: ${memory2.created_at.slice(0
       );
       const buffer = Buffer.from(lines.join("\n"), "utf-8");
       await channel.sendFile(chatId, buffer, "memories.txt", "text/plain");
+    } else if (rest === "noop") {
     }
     return;
   } else if (data.startsWith("hb:")) {
@@ -26782,54 +27359,102 @@ Salience: ${memory2.salience.toFixed(2)} | Created: ${memory2.created_at.slice(0
       await sendHeartbeatKeyboard(chatId, channel, messageId);
     } else if (rest === "off") {
       disableHeartbeat2();
-      await channel.sendText(chatId, "\u26A0\uFE0F Heartbeat paused. Re-enable with /heartbeat on.", { parseMode: "plain" });
       await sendHeartbeatKeyboard(chatId, channel, messageId);
     } else if (rest.startsWith("interval:")) {
       const min = parseInt(rest.slice(9), 10);
       if (isNaN(min) || min < 1) return;
       updateHeartbeatConfig2({ intervalMs: min * 6e4 });
       await sendHeartbeatKeyboard(chatId, channel, messageId);
-    } else if (rest.startsWith("backend:")) {
-      const bid = rest.slice(8);
-      const newBackend = bid === "default" ? null : bid;
-      updateHeartbeatConfig2({ backend: newBackend, model: null });
-      updateHeartbeatField(chatId, "backend", newBackend);
-      updateHeartbeatField(chatId, "model", null);
-      await sendHeartbeatKeyboard(chatId, channel, messageId);
-    } else if (rest.startsWith("model:")) {
-      const model2 = rest.slice(6);
-      const newModel = model2 === "default" ? null : model2;
-      updateHeartbeatConfig2({ model: newModel });
-      updateHeartbeatField(chatId, "model", newModel);
-      await sendHeartbeatKeyboard(chatId, channel, messageId);
-    } else if (rest === "thinking") {
-      await channel.sendText(chatId, "Thinking level for heartbeat: use /editjob to configure.", { parseMode: "plain" });
     } else if (rest === "run") {
-      await channel.sendText(chatId, "\u23F3 Running heartbeat check...", { parseMode: "plain" });
+      if (messageId) {
+        await sendOrEditKeyboard(chatId, channel, messageId, "\u23F3 Running heartbeat check...", []);
+      }
       try {
         await triggerHb();
-        await channel.sendText(chatId, "\u2705 Heartbeat check complete.", { parseMode: "plain" });
+        if (messageId) {
+          await sendOrEditKeyboard(chatId, channel, messageId, "\u2705 Heartbeat check complete.", [
+            [{ label: "\u2190 Back to Heartbeat", data: "hb:back" }]
+          ]);
+        } else {
+          await channel.sendText(chatId, "\u2705 Heartbeat check complete.", { parseMode: "plain" });
+        }
       } catch (err) {
-        await channel.sendText(chatId, `\u274C Heartbeat failed: ${err instanceof Error ? err.message : String(err)}`, { parseMode: "plain" });
+        const errMsg = err instanceof Error ? err.message : String(err);
+        if (messageId) {
+          await sendOrEditKeyboard(chatId, channel, messageId, `\u274C Heartbeat failed: ${errMsg}`, [
+            [{ label: "\u2190 Back to Heartbeat", data: "hb:back" }]
+          ]);
+        } else {
+          await channel.sendText(chatId, `\u274C Heartbeat failed: ${errMsg}`, { parseMode: "plain" });
+        }
       }
-    } else if (rest === "watches" || rest === "addwatch") {
-      await channel.sendText(chatId, "Use /watch to manage awareness tasks.\n\nExamples:\n  /watch add Check my email for urgent messages\n  /watch add Check if Ollama is running\n  /watch list\n  /watch remove 1", { parseMode: "plain" });
+    } else if (rest === "back") {
+      await sendHeartbeatKeyboard(chatId, channel, messageId);
+    } else if (rest === "engine") {
+      await sendHeartbeatEngine(chatId, channel, messageId);
+    } else if (rest === "fallbacks") {
+      await sendHeartbeatFallbacks(chatId, channel, messageId);
+    } else if (rest === "hours") {
+      await sendHeartbeatHours(chatId, channel, messageId);
+    } else if (rest === "timeout") {
+      await sendHeartbeatTimeout(chatId, channel, messageId);
+    } else if (rest === "thinking") {
+      await sendHeartbeatThinking(chatId, channel, messageId);
+    } else if (rest === "watches") {
+      await sendHeartbeatWatches(chatId, channel, messageId);
+    } else if (rest.startsWith("backend:")) {
+      const bid = rest.slice(8);
+      let defaultModel = null;
+      try {
+        const adapter = getAdapter(bid);
+        defaultModel = adapter.defaultModel;
+      } catch {
+      }
+      updateHeartbeatConfig2({ backend: bid, model: defaultModel, credentialSlotId: null });
+      await sendHeartbeatEngine(chatId, channel, messageId);
+    } else if (rest.startsWith("model:")) {
+      const model2 = rest.slice(6);
+      updateHeartbeatConfig2({ model: model2 });
+      await sendHeartbeatEngine(chatId, channel, messageId);
+    } else if (rest.startsWith("slot:")) {
+      const val = rest.slice(5);
+      const slotId = val === "auto" ? null : parseInt(val, 10);
+      updateHeartbeatConfig2({ credentialSlotId: slotId });
+      await sendHeartbeatEngine(chatId, channel, messageId);
+    } else if (rest.startsWith("hstart:")) {
+      const hour = rest.slice(7);
+      updateHeartbeatField(chatId, "active_start", hour);
+      await sendHeartbeatHours(chatId, channel, messageId);
+    } else if (rest.startsWith("hend:")) {
+      const hour = rest.slice(5);
+      updateHeartbeatField(chatId, "active_end", hour);
+      await sendHeartbeatHours(chatId, channel, messageId);
+    } else if (rest.startsWith("tout:")) {
+      const seconds = parseInt(rest.slice(5), 10);
+      if (!isNaN(seconds)) updateHeartbeatConfig2({ timeout: seconds });
+      await sendHeartbeatTimeout(chatId, channel, messageId);
+    } else if (rest.startsWith("think:")) {
+      const level = rest.slice(6);
+      updateHeartbeatConfig2({ thinking: level === "auto" ? null : level });
+      await sendHeartbeatThinking(chatId, channel, messageId);
     } else if (rest.startsWith("fb:add:")) {
       const bid = rest.slice(7);
       try {
         const adapter = getAdapter(bid);
         const models = Object.entries(adapter.availableModels);
         const rows = [
-          [{ label: `Select model for ${capitalize(bid)} fallback:`, data: "hb:noop" }],
-          [{ label: "Default", data: `hb:fb:pick:${bid}:default`, style: "primary" }]
+          [{ label: `Select model for ${capitalize(bid)} fallback:`, data: "hb:noop" }]
         ];
+        rows.push([{ label: "Default", data: `hb:fb:pick:${bid}:default`, style: "primary" }]);
         if (models.length > 0) {
-          rows.push(models.slice(0, 4).map(([key]) => ({
-            label: shortModelName(key),
-            data: `hb:fb:pick:${bid}:${key}`
-          })));
+          for (let i = 0; i < models.length; i += 3) {
+            rows.push(models.slice(i, i + 3).map(([key]) => ({
+              label: shortModelName(key),
+              data: `hb:fb:pick:${bid}:${key}`
+            })));
+          }
         }
-        rows.push([{ label: "\u2190 Back", data: "hb:fb:back" }]);
+        rows.push([{ label: "\u2190 Back", data: "hb:fallbacks" }]);
         await sendOrEditKeyboard(
           chatId,
           channel,
@@ -26838,30 +27463,34 @@ Salience: ${memory2.salience.toFixed(2)} | Created: ${memory2.created_at.slice(0
           rows
         );
       } catch {
-        const config2 = getHeartbeatConfig(chatId);
-        const current = parseHeartbeatFallbacks(config2?.fallbacks ?? null);
+        const job = findHeartbeatJob2();
+        const current = job?.fallbacks ?? [];
         if (!current.some((f) => f.backend === bid)) {
-          current.push({ backend: bid });
-          updateHeartbeatField(chatId, "fallbacks", JSON.stringify(current));
+          let fbModel = "";
+          try {
+            fbModel = getAdapter(bid).defaultModel;
+          } catch {
+          }
+          current.push({ backend: bid, model: fbModel });
+          updateHeartbeatConfig2({ fallbacks: JSON.stringify(current) });
         }
-        await sendHeartbeatKeyboard(chatId, channel, messageId);
+        await sendHeartbeatFallbacks(chatId, channel, messageId);
       }
     } else if (rest.startsWith("fb:pick:")) {
       const parts = rest.slice(8).split(":");
       const bid = parts[0];
       const model2 = parts.slice(1).join(":");
-      const config2 = getHeartbeatConfig(chatId);
-      const current = parseHeartbeatFallbacks(config2?.fallbacks ?? null);
+      const job = findHeartbeatJob2();
+      const current = [...job?.fallbacks ?? []];
       if (!current.some((f) => f.backend === bid)) {
-        current.push(model2 === "default" ? { backend: bid } : { backend: bid, model: model2 });
-        updateHeartbeatField(chatId, "fallbacks", JSON.stringify(current));
+        const resolvedModel = model2 === "default" ? "" : model2;
+        current.push({ backend: bid, model: resolvedModel });
+        updateHeartbeatConfig2({ fallbacks: JSON.stringify(current) });
       }
-      await sendHeartbeatKeyboard(chatId, channel, messageId);
-    } else if (rest === "fb:back") {
-      await sendHeartbeatKeyboard(chatId, channel, messageId);
+      await sendHeartbeatFallbacks(chatId, channel, messageId);
     } else if (rest === "fb:clear") {
-      updateHeartbeatField(chatId, "fallbacks", null);
-      await sendHeartbeatKeyboard(chatId, channel, messageId);
+      updateHeartbeatConfig2({ fallbacks: null });
+      await sendHeartbeatFallbacks(chatId, channel, messageId);
     } else if (rest === "noop") {
     }
     return;
@@ -26882,32 +27511,37 @@ Salience: ${memory2.salience.toFixed(2)} | Created: ${memory2.created_at.slice(0
   } else if (data.startsWith("help:")) {
     const rest = data.slice(5);
     if (rest === "back") {
-      await sendHelpCategories(chatId, channel);
+      await sendHelpCategories(chatId, channel, messageId);
     } else {
-      await sendHelpCategory(chatId, rest, channel);
+      await sendHelpCategory(chatId, rest, channel, messageId);
     }
     return;
   } else if (data.startsWith("usage:")) {
     const rest = data.slice(6);
     if (rest === "session" || rest === "24h" || rest === "7d" || rest === "30d" || rest === "model") {
-      await sendUnifiedUsage(chatId, channel, rest);
+      await sendUnifiedUsage(chatId, channel, rest, messageId);
     } else if (rest === "limits") {
-      await sendUsageLimits(chatId, channel);
+      await sendUsageLimits(chatId, channel, messageId);
     } else if (rest === "back") {
-      await sendUnifiedUsage(chatId, channel, "session");
+      await sendUnifiedUsage(chatId, channel, "session", messageId);
     } else if (rest === "limits:clear") {
       for (const bid of getAllBackendIds()) {
         for (const win of ["hourly", "daily", "weekly"]) {
           clearBackendLimit(bid, win);
         }
       }
-      await channel.sendText(chatId, "All usage limits cleared.", { parseMode: "plain" });
-      await sendUnifiedUsage(chatId, channel, "session");
+      await sendUsageLimits(chatId, channel, messageId);
     } else if (rest.startsWith("limits:set:")) {
       const bid = rest.slice(11);
-      await channel.sendText(chatId, `Set limit for ${bid}:
+      await sendOrEditKeyboard(
+        chatId,
+        channel,
+        messageId,
+        `Set ${bid} limit via command:
 /limits ${bid} daily <tokens>
-Example: /limits ${bid} daily 500000`, { parseMode: "plain" });
+Example: /limits ${bid} daily 500000`,
+        [[{ label: "\u2190 Back to Limits", data: "usage:limits" }]]
+      );
     }
     return;
   } else if (data === "skills:toggle-extract") {
@@ -27078,9 +27712,10 @@ Use /skills to see all available skills.`, { parseMode: "plain" });
     if (messageId) await replaceWithText("\u{1F44C} Noted.");
     return;
   } else if (data === "imp:menu") {
-    if (typeof channel.sendKeyboard !== "function") return;
-    await channel.sendKeyboard(
+    await sendOrEditKeyboard(
       chatId,
+      channel,
+      messageId,
       "\u{1F4E5} Import Skill\n\nImport a skill from your coding CLIs into CC-Claw.",
       [
         [{ label: "\u{1F50D} From CLI Skills", data: "imp:cli", style: "primary" }],
@@ -27090,10 +27725,12 @@ Use /skills to see all available skills.`, { parseMode: "plain" });
     );
     return;
   } else if (data === "imp:search") {
-    await channel.sendText(
+    await sendOrEditKeyboard(
       chatId,
+      channel,
+      messageId,
       "Skill search via Universal Skills Manager is coming in v2.\n\nFor now, use /skill-install <github-url> to install from GitHub.",
-      { parseMode: "plain" }
+      [[{ label: "\u2190 Back", data: "imp:menu" }]]
     );
     return;
   } else if (data === "imp:cli" || data.startsWith("imp:cli:")) {
@@ -27103,18 +27740,16 @@ Use /skills to see all available skills.`, { parseMode: "plain" });
       (s) => !s.sources.includes("cc-claw") && s.status === "external"
     );
     if (importable.length === 0) {
-      if (typeof channel.sendKeyboard === "function") {
-        await channel.sendKeyboard(
-          chatId,
-          "No new skills found in your coding CLIs.\n\nSkills are scanned from:\n\u2022 ~/.claude/skills/\n\u2022 ~/.gemini/skills/\n\u2022 ~/.codex/skills/\n\u2022 ~/.cursor/skills/",
-          [[{ label: "\u2190 Back", data: "imp:menu" }]]
-        );
-      } else {
-        await channel.sendText(chatId, "No new skills found to import.", { parseMode: "plain" });
-      }
+      await sendOrEditKeyboard(
+        chatId,
+        channel,
+        messageId,
+        "No new skills found in your coding CLIs.\n\nSkills are scanned from:\n\u2022 ~/.claude/skills/\n\u2022 ~/.gemini/skills/\n\u2022 ~/.codex/skills/\n\u2022 ~/.cursor/skills/",
+        [[{ label: "\u2190 Back", data: "imp:menu" }]]
+      );
       return;
     }
-    if (typeof channel.sendKeyboard !== "function") {
+    if (typeof channel.sendKeyboard !== "function" && typeof channel.editKeyboard !== "function") {
       const lines = importable.map((s) => `\u2022 ${s.name} [${s.source}]`);
       await channel.sendText(chatId, `Found ${importable.length} importable skills:
 ${lines.join("\n")}`, { parseMode: "plain" });
@@ -27140,8 +27775,10 @@ ${lines.join("\n")}`, { parseMode: "plain" });
       buttons.push(navRow);
     }
     buttons.push([{ label: "\u2190 Back", data: "imp:menu" }]);
-    await channel.sendKeyboard(
+    await sendOrEditKeyboard(
       chatId,
+      channel,
+      messageId,
       `Found ${importable.length} skill${importable.length !== 1 ? "s" : ""} in your coding CLIs:`,
       buttons
     );
@@ -27164,21 +27801,21 @@ ${lines.join("\n")}`, { parseMode: "plain" });
     const preview = raw.length > 1500 ? raw.slice(0, 1500) + "\n...(truncated)" : raw;
     const escaped = preview.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
     const collisionNote = existingCcClaw ? "\n\n\u26A0\uFE0F A skill with this name already exists in CC-Claw. Importing will overwrite it." : "";
-    if (typeof channel.sendKeyboard === "function") {
-      await channel.sendKeyboard(
-        chatId,
-        `\u{1F4CB} <b>${skillName}</b> [${source}]${collisionNote}
+    await sendOrEditKeyboard(
+      chatId,
+      channel,
+      messageId,
+      `\u{1F4CB} <b>${skillName}</b> [${source}]${collisionNote}
 
 <pre>${escaped}</pre>`,
+      [
         [
-          [
-            { label: "\u2705 Import & Approve", data: `imp:go:${source}:${skillName}`, style: "success" },
-            { label: "\u{1F527} Import & Optimize", data: `imp:opt:${source}:${skillName}` }
-          ],
-          [{ label: "\u2190 Back", data: "imp:cli" }]
-        ]
-      );
-    }
+          { label: "\u2705 Import & Approve", data: `imp:go:${source}:${skillName}`, style: "success" },
+          { label: "\u{1F527} Import & Optimize", data: `imp:opt:${source}:${skillName}` }
+        ],
+        [{ label: "\u2190 Back", data: "imp:cli" }]
+      ]
+    );
     return;
   } else if (data.startsWith("imp:go:") || data.startsWith("imp:opt:")) {
     const doApprove = data.startsWith("imp:go:");
@@ -27190,12 +27827,12 @@ ${lines.join("\n")}`, { parseMode: "plain" });
     const allSkills = await discoverAllSkills();
     const skill = allSkills.find((s) => s.name === skillName && s.source === source);
     if (!skill) {
-      await channel.sendText(chatId, `Skill "${skillName}" not found.`, { parseMode: "plain" });
+      await sendOrEditKeyboard(chatId, channel, messageId, `Skill "${skillName}" not found.`, [[{ label: "\u2190 Back", data: "imp:cli" }]]);
       return;
     }
     try {
       const { readFile: readFileFs } = await import("fs/promises");
-      const { mkdir: mkdir7, writeFile: writeFileFs } = await import("fs/promises");
+      const { mkdir: mkdir6, writeFile: writeFileFs } = await import("fs/promises");
       const { join: join41 } = await import("path");
       const { SKILLS_PATH: SKILLS_PATH2 } = await Promise.resolve().then(() => (init_paths(), paths_exports));
       const { updateFrontmatter: updateFrontmatter2, ensureThreeTierFrontmatter: ensureThreeTierFrontmatter2 } = await Promise.resolve().then(() => (init_frontmatter(), frontmatter_exports));
@@ -27205,30 +27842,32 @@ ${lines.join("\n")}`, { parseMode: "plain" });
       const targetStatus = doApprove ? "approved" : "imported";
       updated = updateFrontmatter2(updated, { status: targetStatus });
       const targetDir = join41(SKILLS_PATH2, skillName);
-      await mkdir7(targetDir, { recursive: true });
+      await mkdir6(targetDir, { recursive: true });
       await writeFileFs(join41(targetDir, "SKILL.md"), updated, "utf-8");
       invalidateSkillCache2();
       if (doApprove) {
-        await channel.sendText(
+        await sendOrEditKeyboard(
           chatId,
+          channel,
+          messageId,
           `\u2705 Skill "${skillName}" imported and approved.
 
 It's now available in /skills.`,
-          { parseMode: "plain" }
+          [[{ label: "\u2190 Skills", data: "skills:page:1" }, { label: "Import Another", data: "imp:cli" }]]
         );
       } else {
-        await channel.sendText(
+        await sendOrEditKeyboard(
           chatId,
-          `\u{1F4E5} Skill "${skillName}" imported with status: imported.
-
-Opening optimizer...`,
-          { parseMode: "plain" }
+          channel,
+          messageId,
+          `\u{1F4E5} Skill "${skillName}" imported. Opening optimizer...`,
+          []
         );
         const { handleOptimizeCallback: routeOptimize } = await Promise.resolve().then(() => (init_optimize(), optimize_exports));
         await routeOptimize(chatId, `opt:skill-pick:${skillName}`, channel);
       }
     } catch (e) {
-      await channel.sendText(chatId, `Import failed: ${e.message}`, { parseMode: "plain" });
+      await sendOrEditKeyboard(chatId, channel, messageId, `Import failed: ${e.message}`, [[{ label: "\u2190 Back", data: "imp:cli" }]]);
     }
     return;
   } else if (data === "appr:list" || data.startsWith("appr:list:")) {
@@ -27238,18 +27877,16 @@ Opening optimizer...`,
       (s) => s.sources.includes("cc-claw") && s.status !== "approved"
     );
     if (unapproved.length === 0) {
-      if (typeof channel.sendKeyboard === "function") {
-        await channel.sendKeyboard(
-          chatId,
-          "All CC-Claw skills are approved.",
-          [[{ label: "\u2190 Back to Skills", data: "skills:page:1" }]]
-        );
-      } else {
-        await channel.sendText(chatId, "All CC-Claw skills are approved.", { parseMode: "plain" });
-      }
+      await sendOrEditKeyboard(
+        chatId,
+        channel,
+        messageId,
+        "\u2705 All CC-Claw skills are approved.",
+        [[{ label: "\u2190 Back to Skills", data: "skills:page:1" }]]
+      );
       return;
     }
-    if (typeof channel.sendKeyboard !== "function") {
+    if (typeof channel.sendKeyboard !== "function" && typeof channel.editKeyboard !== "function") {
       const lines = unapproved.map((s) => `\u2022 ${s.name} [${s.status}]`);
       await channel.sendText(chatId, `${unapproved.length} skills need approval:
 ${lines.join("\n")}`, { parseMode: "plain" });
@@ -27279,8 +27916,10 @@ ${lines.join("\n")}`, { parseMode: "plain" });
       { label: `\u2705 Approve All (${unapproved.length})`, data: "appr:all", style: "success" }
     ]);
     buttons.push([{ label: "\u2190 Back to Skills", data: "skills:page:1" }]);
-    await channel.sendKeyboard(
+    await sendOrEditKeyboard(
       chatId,
+      channel,
+      messageId,
       `${unapproved.length} CC-Claw skill${unapproved.length !== 1 ? "s" : ""} need approval.
 
 Select one to review, or approve all:`,
@@ -27292,11 +27931,11 @@ Select one to review, or approve all:`,
     const allSkills = await discoverAllSkills();
     const skill = allSkills.find((s) => s.name === skillName && s.sources.includes("cc-claw"));
     if (!skill) {
-      await channel.sendText(chatId, `Skill "${skillName}" not found.`, { parseMode: "plain" });
+      await sendOrEditKeyboard(chatId, channel, messageId, `Skill "${skillName}" not found.`, [[{ label: "\u2190 Back", data: "appr:list" }]]);
       return;
     }
     if (skill.status === "approved") {
-      await channel.sendText(chatId, `"${skillName}" is already approved.`, { parseMode: "plain" });
+      await sendOrEditKeyboard(chatId, channel, messageId, `"${skillName}" is already approved.`, [[{ label: "\u2190 Back", data: "appr:list" }]]);
       return;
     }
     const { readFile: readFileFs } = await import("fs/promises");
@@ -27310,28 +27949,28 @@ Select one to review, or approve all:`,
 \u{1F4CB} Quality check:
 ${formatValidationReport2(validation)}` : "\n\n\u2705 Quality checks passed.";
     const typeLabel = skill.type === "specialist" ? "\u{1F3AF} Specialist" : "\u{1F527} Tool";
-    if (typeof channel.sendKeyboard === "function") {
-      await channel.sendKeyboard(
-        chatId,
-        `${typeLabel} <b>${skillName}</b> [${skill.status}]${validationNote}
+    await sendOrEditKeyboard(
+      chatId,
+      channel,
+      messageId,
+      `${typeLabel} <b>${skillName}</b> [${skill.status}]${validationNote}
 
 <pre>${escaped}</pre>`,
+      [
         [
-          [
-            { label: "\u2705 Approve", data: `appr:do:${skillName}`, style: "success" },
-            { label: "\u{1F527} Optimize First", data: `appr:opt:${skillName}` }
-          ],
-          [{ label: "\u2190 Back", data: "appr:list" }]
-        ]
-      );
-    }
+          { label: "\u2705 Approve", data: `appr:do:${skillName}`, style: "success" },
+          { label: "\u{1F527} Optimize First", data: `appr:opt:${skillName}` }
+        ],
+        [{ label: "\u2190 Back", data: "appr:list" }]
+      ]
+    );
     return;
   } else if (data.startsWith("appr:do:")) {
     const skillName = data.slice(8);
     const allSkills = await discoverAllSkills();
     const skill = allSkills.find((s) => s.name === skillName && s.sources.includes("cc-claw"));
     if (!skill) {
-      await channel.sendText(chatId, `Skill "${skillName}" not found.`, { parseMode: "plain" });
+      await sendOrEditKeyboard(chatId, channel, messageId, `Skill "${skillName}" not found.`, [[{ label: "\u2190 Back", data: "appr:list" }]]);
       return;
     }
     try {
@@ -27343,40 +27982,40 @@ ${formatValidationReport2(validation)}` : "\n\n\u2705 Quality checks passed.";
       updated = updateFrontmatter2(updated, { status: "approved" });
       writeFileSync16(skill.filePath, updated, "utf-8");
       invalidateSkillCache2();
-      await channel.sendText(chatId, `\u2705 "${skillName}" approved.`, { parseMode: "plain" });
       const refreshedSkills = await discoverAllSkills();
       const stillUnapproved = refreshedSkills.filter(
         (s) => s.sources.includes("cc-claw") && s.status !== "approved"
       );
       if (stillUnapproved.length > 0) {
-        if (typeof channel.sendKeyboard === "function") {
-          await channel.sendKeyboard(
-            chatId,
-            `${stillUnapproved.length} more skill${stillUnapproved.length !== 1 ? "s" : ""} to review.`,
-            [[
-              { label: "Continue Reviewing", data: "appr:list", style: "primary" },
-              { label: "\u2190 Done", data: "skills:page:1" }
-            ]]
-          );
-        }
+        await sendOrEditKeyboard(
+          chatId,
+          channel,
+          messageId,
+          `\u2705 "${skillName}" approved.
+
+${stillUnapproved.length} more skill${stillUnapproved.length !== 1 ? "s" : ""} to review.`,
+          [[
+            { label: "Continue Reviewing", data: "appr:list", style: "primary" },
+            { label: "\u2190 Done", data: "skills:page:1" }
+          ]]
+        );
       } else {
-        if (typeof channel.sendKeyboard === "function") {
-          await channel.sendKeyboard(
-            chatId,
-            "All CC-Claw skills are now approved!",
-            [[{ label: "\u2190 Back to Skills", data: "skills:page:1" }]]
-          );
-        }
+        await sendOrEditKeyboard(
+          chatId,
+          channel,
+          messageId,
+          "\u2705 All CC-Claw skills are now approved!",
+          [[{ label: "\u2190 Back to Skills", data: "skills:page:1" }]]
+        );
       }
     } catch (e) {
-      await channel.sendText(chatId, `Approve failed: ${e.message}`, { parseMode: "plain" });
+      await sendOrEditKeyboard(chatId, channel, messageId, `Approve failed: ${e.message}`, [[{ label: "\u2190 Back", data: "appr:list" }]]);
     }
     return;
   } else if (data.startsWith("appr:opt:")) {
     const skillName = data.slice(9);
-    await channel.sendText(chatId, `Opening optimizer for "${skillName}"...`, { parseMode: "plain" });
     const { handleOptimizeCallback: routeOptimize } = await Promise.resolve().then(() => (init_optimize(), optimize_exports));
-    await routeOptimize(chatId, `opt:skill-pick:${skillName}`, channel);
+    await routeOptimize(chatId, `opt:skill-pick:${skillName}`, channel, messageId);
     return;
   } else if (data === "appr:all") {
     const allSkills = await discoverAllSkills();
@@ -27412,15 +28051,21 @@ ${formatValidationReport2(validation)}` : "\n\n\u2705 Quality checks passed.";
 \u26A0\uFE0F ${issues.length} failed:
 ${issues.join("\n")}`;
       }
-      if (typeof channel.sendKeyboard === "function") {
-        await channel.sendKeyboard(chatId, msg, [
-          [{ label: "\u2190 Back to Skills", data: "skills:page:1" }]
-        ]);
-      } else {
-        await channel.sendText(chatId, msg, { parseMode: "plain" });
-      }
+      await sendOrEditKeyboard(
+        chatId,
+        channel,
+        messageId,
+        msg,
+        [[{ label: "\u2190 Back to Skills", data: "skills:page:1" }]]
+      );
     } catch (e) {
-      await channel.sendText(chatId, `Bulk approve failed: ${e.message}`, { parseMode: "plain" });
+      await sendOrEditKeyboard(
+        chatId,
+        channel,
+        messageId,
+        `Bulk approve failed: ${e.message}`,
+        [[{ label: "\u2190 Back", data: "appr:list" }]]
+      );
     }
     return;
   } else if (data.startsWith("skill:")) {
@@ -27455,7 +28100,6 @@ ${issues.join("\n")}`;
 var init_callbacks = __esm({
   "src/router/callbacks.ts"() {
     "use strict";
-    init_format();
     init_log();
     init_agent();
     init_discover();
@@ -28393,7 +29037,8 @@ Debating: "${question.slice(0, 100)}${question.length > 100 ? "\u2026" : ""}"`,
       }
       responseText += `
 
-\u{1F9E0} [${shortModel} | ${capitalize(thinking2)}${slotTag}] \u23F1\uFE0F ${elapsedSec}s \xB7 \u{1F195}/new`;
+\u{1F9E0} [${shortModel} | ${capitalize(thinking2)}${slotTag}] \u23F1\uFE0F ${elapsedSec}s
+\u{1F195} /new | \u{1F9FD} /clear`;
     }
     if (observedSubagents.size > 0) {
       const names = [...observedSubagents].join(", ");
@@ -28876,8 +29521,8 @@ async function runWithRetry(job, model2, runId, t0) {
     }
     for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
       try {
-        const { getVerboseLevel: getVerboseLevel3 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
-        const vLevel = getVerboseLevel3(chatId);
+        const { getVerboseLevel: getVerboseLevel4 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+        const vLevel = getVerboseLevel4(chatId);
         let onToolAction;
         if (vLevel !== "off") {
           const { makeToolActionCallback: makeToolActionCallback2 } = await Promise.resolve().then(() => (init_router2(), router_exports));
@@ -29835,7 +30480,7 @@ var init_telegram2 = __esm({
     init_health3();
     init_store5();
     init_telegram_throttle();
-    FAST_PATH_COMMANDS = /* @__PURE__ */ new Set(["stop", "status", "new", "newchat"]);
+    FAST_PATH_COMMANDS = /* @__PURE__ */ new Set(["stop", "status", "new", "newchat", "clear"]);
     TelegramChannel = class _TelegramChannel {
       name = "telegram";
       bot;
@@ -29909,6 +30554,7 @@ var init_telegram2 = __esm({
           { command: "status", description: "Session, backend, model, and usage" },
           { command: "new", description: "Start a fresh conversation" },
           { command: "newchat", description: "Start a fresh conversation" },
+          { command: "clear", description: "Clear session without saving (no summary)" },
           { command: "summarize", description: "Save session to memory (or 'all' for pre-restart)" },
           { command: "stop", description: "Cancel the current running task" },
           // Backend & model
@@ -30264,17 +30910,25 @@ var init_telegram2 = __esm({
           }
         }
       }
-      async editKeyboard(chatId, messageId, text, buttons) {
+      buildInlineKeyboard(buttons) {
         const keyboard = new InlineKeyboard();
         for (const row of buttons) {
           for (const btn of row) {
-            keyboard.text(btn.label, btn.data);
+            if (btn.switchInlineQueryCurrentChat !== void 0) {
+              keyboard.switchInlineCurrent(btn.label, btn.switchInlineQueryCurrentChat);
+            } else {
+              keyboard.text(btn.label, btn.data);
+            }
             if (btn.style === "success") keyboard.success();
             else if (btn.style === "danger") keyboard.danger();
             else if (btn.style === "primary") keyboard.primary();
           }
           keyboard.row();
         }
+        return keyboard;
+      }
+      async editKeyboard(chatId, messageId, text, buttons) {
+        const keyboard = this.buildInlineKeyboard(buttons);
         const formatted = sanitizeForTelegram(formatForTelegram(text));
         try {
           await this.throttle.send(
@@ -30314,16 +30968,7 @@ var init_telegram2 = __esm({
         this.reactionHandlers.push(handler);
       }
       async sendKeyboard(chatId, text, buttons, threadId) {
-        const keyboard = new InlineKeyboard();
-        for (const row of buttons) {
-          for (const btn of row) {
-            keyboard.text(btn.label, btn.data);
-            if (btn.style === "success") keyboard.success();
-            else if (btn.style === "danger") keyboard.danger();
-            else if (btn.style === "primary") keyboard.primary();
-          }
-          keyboard.row();
-        }
+        const keyboard = this.buildInlineKeyboard(buttons);
         const MAX_KEYBOARD_TEXT = 4e3;
         const safeText = text.length > MAX_KEYBOARD_TEXT ? text.slice(0, MAX_KEYBOARD_TEXT) + "\n\n\u2026(truncated)" : text;
         const formatted = sanitizeForTelegram(formatForTelegram(safeText));
@@ -30550,6 +31195,9 @@ var init_telegram2 = __esm({
             caption: ctx.message.caption ?? "",
             fileName: ctx.message.document.file_id,
             mimeType: ctx.message.document.mime_type ?? "application/octet-stream",
+            metadata: {
+              originalName: ctx.message.document.file_name
+            },
             chatTitle,
             replyToText,
             forwardedFrom,
@@ -35103,9 +35751,9 @@ async function toolsList(globalOpts) {
   const chatId = resolveChatId2(globalOpts);
   const rows = readDb.prepare("SELECT tool, enabled FROM chat_tools WHERE chat_id = ?").all(chatId);
   readDb.close();
-  const ALL_TOOLS3 = ["Read", "Write", "Edit", "Bash", "Glob", "Grep", "WebFetch", "WebSearch", "Agent", "AskUserQuestion"];
+  const ALL_TOOLS4 = ["Read", "Write", "Edit", "Bash", "Glob", "Grep", "WebFetch", "WebSearch", "Agent", "AskUserQuestion"];
   const toolMap = new Map(rows.map((r) => [r.tool, !!r.enabled]));
-  const tools2 = ALL_TOOLS3.map((t) => ({ name: t, enabled: toolMap.get(t) ?? true }));
+  const tools2 = ALL_TOOLS4.map((t) => ({ name: t, enabled: toolMap.get(t) ?? true }));
   output(tools2, (d) => {
     const list = d;
     const lines = ["", divider("Tools"), ""];
@@ -35117,10 +35765,10 @@ async function toolsList(globalOpts) {
   });
 }
 async function toolsEnable(globalOpts, name) {
-  await toggleTool4(globalOpts, name, true);
+  await toggleTool5(globalOpts, name, true);
 }
 async function toolsDisable(globalOpts, name) {
-  await toggleTool4(globalOpts, name, false);
+  await toggleTool5(globalOpts, name, false);
 }
 async function toolsReset(globalOpts) {
   const { isDaemonRunning: isDaemonRunning2, apiPost: apiPost2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
@@ -35139,7 +35787,7 @@ async function toolsReset(globalOpts) {
     process.exit(1);
   }
 }
-async function toggleTool4(globalOpts, name, enabled) {
+async function toggleTool5(globalOpts, name, enabled) {
   const { isDaemonRunning: isDaemonRunning2, apiPost: apiPost2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
   if (!await isDaemonRunning2()) {
     outputError("DAEMON_OFFLINE", "CC-Claw daemon is not running.\n\n  Start it with: cc-claw service start");
@@ -36996,6 +37644,7 @@ async function validateBotToken(token) {
 }
 async function setup() {
   const TOTAL_STEPS = 6;
+  const DRY_RUN = process.env.CC_CLAW_SETUP_DRY_RUN === "1";
   console.log("");
   console.log(bold("  \u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557"));
   console.log(bold("  \u2551                                           \u2551"));
@@ -37003,6 +37652,10 @@ async function setup() {
   console.log(bold("  \u2551   Personal AI Assistant via Telegram      \u2551"));
   console.log(bold("  \u2551                                           \u2551"));
   console.log(bold("  \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D"));
+  if (DRY_RUN) {
+    console.log("");
+    console.log(yellow("  \u26A0\uFE0F  DRY RUN MODE \u2014 nothing will be saved or modified"));
+  }
   console.log("");
   console.log("  This wizard will walk you through setting up CC-Claw.");
   console.log("  It takes about 5 minutes. Let's go!\n");
@@ -37031,8 +37684,10 @@ async function setup() {
     console.log(yellow("  No backend CLIs found! Install at least one to use CC-Claw."));
   }
   console.log("");
-  for (const dir of [CC_CLAW_HOME, DATA_PATH, LOGS_PATH, SKILLS_PATH, RUNNERS_PATH, AGENTS_PATH]) {
-    if (!existsSync61(dir)) mkdirSync18(dir, { recursive: true });
+  if (!DRY_RUN) {
+    for (const dir of [CC_CLAW_HOME, DATA_PATH, LOGS_PATH, SKILLS_PATH, RUNNERS_PATH, AGENTS_PATH]) {
+      if (!existsSync61(dir)) mkdirSync18(dir, { recursive: true });
+    }
   }
   const env = {};
   const envSource = existsSync61(ENV_PATH) ? ENV_PATH : existsSync61(".env") ? ".env" : null;
@@ -37051,8 +37706,12 @@ async function setup() {
     console.log(yellow(`  Found existing database at ${cwdDb} (${(size / 1024).toFixed(0)}KB)`));
     const migrate = await confirm("Copy database to ~/.cc-claw/? (preserves memories & history)", true);
     if (migrate) {
-      copyFileSync5(cwdDb, DB_PATH);
-      console.log(green(`  Database copied to ${DB_PATH}`));
+      if (DRY_RUN) {
+        console.log(dim(`  [dry-run] Would copy database to ${DB_PATH}`));
+      } else {
+        copyFileSync5(cwdDb, DB_PATH);
+        console.log(green(`  Database copied to ${DB_PATH}`));
+      }
     }
     console.log("");
   }
@@ -37190,8 +37849,8 @@ async function setup() {
     console.log("");
     console.log(dim("  Choose your transcription provider:\n"));
     console.log("  1. Local Whisper \u2014 free, works offline, runs on your machine");
-    console.log("     Requires: whisper-cli (brew install whisper-cpp on macOS)");
-    console.log("     Models downloaded on first use (~75MB\u20131.5GB depending on quality)");
+    console.log("     No external tools needed \u2014 runs natively in Node.js");
+    console.log("     Models downloaded once (~75MB\u20131.5GB depending on quality)");
     console.log("");
     console.log("  2. Groq \u2014 free cloud API, fast, no local install needed");
     console.log("     Requires: free Groq API key from https://console.groq.com/keys");
@@ -37213,7 +37872,22 @@ async function setup() {
       const modelMap = { "1": "tiny.en", "2": "base.en", "3": "small.en", "4": "small", "5": "medium.en", "6": "medium" };
       env.STT_PROVIDER = "local-whisper";
       env.STT_MODEL = modelMap[modelChoice] ?? "small.en";
-      console.log(green(`  Local Whisper selected (${env.STT_MODEL}). Model will download on first voice message.`));
+      const selectedModel = env.STT_MODEL;
+      console.log(green(`  Local Whisper selected (${selectedModel}).`));
+      if (!DRY_RUN) {
+        console.log(dim(`  Model download started in the background. It will be ready by the time you finish setup.`));
+        Promise.resolve().then(() => (init_stt(), stt_exports)).then(({ downloadWhisperModel: downloadWhisperModel2 }) => {
+          downloadWhisperModel2(selectedModel, (msg) => {
+            if (msg.startsWith("\u2705")) console.log(green(`  ${msg}`));
+          }).catch((err) => {
+            console.log(yellow(`  Background model download failed: ${err.message}`));
+            console.log(dim(`  The model will download when you first send a voice message.`));
+          });
+        }).catch(() => {
+        });
+      } else {
+        console.log(dim(`  [dry-run] Skipping model download.`));
+      }
     } else if (sttChoice === "2") {
       const groqKey = await requiredInput("Groq API key", env.GROQ_API_KEY);
       env.GROQ_API_KEY = groqKey;
@@ -37293,14 +37967,29 @@ async function setup() {
     envLines.push("", "# Video Analysis", `GEMINI_API_KEY=${env.GEMINI_API_KEY}`);
   }
   const envContent = envLines.join("\n") + "\n";
-  writeFileSync15(ENV_PATH, envContent, { mode: 384 });
-  console.log(green(`  Config saved to ${ENV_PATH} (permissions: owner-only)`));
+  if (DRY_RUN) {
+    console.log(dim(`  [dry-run] Would save config to ${ENV_PATH}`));
+    console.log(dim("  [dry-run] Generated config:"));
+    for (const line of envLines) {
+      if (line.includes("TOKEN") || line.includes("KEY") || line.includes("API")) {
+        const masked = line.replace(/=(.+)$/, "=***");
+        console.log(dim(`    ${masked}`));
+      } else {
+        console.log(dim(`    ${line}`));
+      }
+    }
+  } else {
+    writeFileSync15(ENV_PATH, envContent, { mode: 384 });
+    console.log(green(`  Config saved to ${ENV_PATH} (permissions: owner-only)`));
+  }
   header(6, TOTAL_STEPS, "Run on Startup (Daemon)");
   console.log("  CC-Claw can run automatically in the background, starting");
   console.log("  when your Mac boots. No terminal window needed.\n");
   const installDaemon = await confirm("Install CC-Claw as a background service?", true);
   if (installDaemon) {
-    try {
+    if (DRY_RUN) {
+      console.log(dim("  [dry-run] Would install background service"));
+    } else try {
       const { installService: installService2 } = await Promise.resolve().then(() => (init_service2(), service_exports2));
       installService2();
       console.log("");
@@ -37322,7 +38011,7 @@ async function setup() {
   }
   console.log("");
   divider2();
-  console.log(bold("  Setup Complete!"));
+  console.log(bold(DRY_RUN ? "  Dry Run Complete! (nothing was saved)" : "  Setup Complete!"));
   divider2();
   console.log("");
   console.log("  " + green("[ok]") + ` Telegram bot: @${env.TELEGRAM_BOT_TOKEN ? "configured" : "missing"}`);
@@ -37964,7 +38653,8 @@ program.command("uninstall", { hidden: true }).description("Remove background se
   const { uninstallService: uninstallService2 } = await Promise.resolve().then(() => (init_service2(), service_exports2));
   uninstallService2();
 });
-program.command("setup").description("Interactive configuration wizard").action(async () => {
+program.command("setup").description("Interactive configuration wizard").option("--dry-run", "Run the wizard without saving anything (demo/test mode)").action(async (opts) => {
+  if (opts.dryRun) process.env.CC_CLAW_SETUP_DRY_RUN = "1";
   await Promise.resolve().then(() => (init_setup(), setup_exports));
 });
 async function run(argv = process.argv) {