jinzd-ai-cli 0.4.222 → 0.4.224

package/dist/{server-QGZYDDZW.js → server-LQFHSFN4.js}

@@ -3,11 +3,11 @@ import {
   DiscussionOrchestrator,
   getPreset,
   resolveRoleProviders
-} from "./chunk-Q3ZUDA6S.js";
-import "./chunk-NZ4X6GUC.js";
+} from "./chunk-VT6NRDD2.js";
+import "./chunk-3ARPAVNV.js";
 import {
   persistDiscussion
-} from "./chunk-QT5FA2ZY.js";
+} from "./chunk-DEHVRQWW.js";
 import {
   AuthManager,
   TOKEN_EXPIRY_MS
@@ -23,7 +23,7 @@ import {
   scanDirTree,
   scanProject,
   setupProxy
-} from "./chunk-FBK7NSIK.js";
+} from "./chunk-4CZZJQXJ.js";
 import {
   buildReviewPrompt,
   buildSecurityReviewPrompt
@@ -36,6 +36,7 @@ import {
   checkNetworkPolicy,
   checkPermissionWithProfile,
   cleanupRejectedTeeFile,
+  clearBashSession,
   clearRecentlyDeniedAutoActions,
   defaultActionClassifier,
   deleteMemoryEntry,
@@ -66,7 +67,7 @@ import {
   truncateOutput,
   undoStack,
   updateMemoryApproval
-} from "./chunk-5EE4GRGG.js";
+} from "./chunk-4RQPCOEE.js";
 import "./chunk-K3CF65QH.js";
 import "./chunk-UUSRWSSX.js";
 import "./chunk-CKH4KQ4E.js";
@@ -74,7 +75,7 @@ import "./chunk-BXP6YZ2P.js";
 import {
   SessionManager,
   getContentText
-} from "./chunk-5GTWZ4QF.js";
+} from "./chunk-QYQCCIBT.js";
 import {
   computeCost,
   formatCost
@@ -83,7 +84,7 @@ import {
   buildDoctorReport,
   formatDoctorReport,
   loadContextFiles
-} from "./chunk-VBRCWH55.js";
+} from "./chunk-6FEZAWH5.js";
 import {
   ProviderRegistry
 } from "./chunk-PUBCJF7E.js";
@@ -101,7 +102,7 @@ import {
   runTool,
   setPluginEnabled,
   trustPlugin
-} from "./chunk-SISFAT6W.js";
+} from "./chunk-A2AVDSXJ.js";
 import {
   CONTENT_ONLY_STREAM_REMINDER,
   TEE_FINAL_USER_NUDGE,
@@ -120,7 +121,7 @@ import {
 } from "./chunk-XPBEJB27.js";
 import {
   ConfigManager
-} from "./chunk-UWUTLIOH.js";
+} from "./chunk-35OPVVEK.js";
 import "./chunk-5ULLIOVC.js";
 import {
   formatGitContextForPrompt,
@@ -128,7 +129,7 @@ import {
   getGitRoot
 } from "./chunk-HOSJZMQS.js";
 import "./chunk-4BKXL7SM.js";
-import "./chunk-S6L5R6SS.js";
+import "./chunk-JU7OI4BN.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   AUTHOR,
@@ -145,12 +146,12 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-NNWWMGYK.js";
-import "./chunk-TB4W4Y4T.js";
+} from "./chunk-QJUAQKH2.js";
+import "./chunk-NVUCDUXE.js";
 import "./chunk-KHYD3WXE.js";
 import {
   scanString
-} from "./chunk-SLSWPBK3.js";
+} from "./chunk-B5TYJO7V.js";
 import {
   atomicWriteFileSync
 } from "./chunk-IW3Q7AE5.js";
@@ -159,8 +160,8 @@ import {
 import express from "express";
 import { createServer } from "http";
 import { WebSocketServer } from "ws";
-import { join as join5, dirname as dirname5, resolve as resolve5, relative, sep } from "path";
-import { existsSync as existsSync6, readFileSync as readFileSync6, readdirSync as readdirSync5, statSync as statSync5, realpathSync } from "fs";
+import { join as join4, dirname as dirname4, resolve as resolve4, relative, sep } from "path";
+import { existsSync as existsSync5, readFileSync as readFileSync5, readdirSync as readdirSync4, statSync as statSync4, realpathSync } from "fs";
 import { networkInterfaces } from "os";
 
 // src/web/tool-executor-web.ts
@@ -236,33 +237,33 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
   }
   /** Resolve a pending confirm from client response */
   resolveConfirm(requestId, approved) {
-    const resolve6 = this.pendingConfirms.get(requestId);
-    if (resolve6) {
+    const resolve5 = this.pendingConfirms.get(requestId);
+    if (resolve5) {
       this.clearPendingTimer(requestId);
       this.pendingConfirms.delete(requestId);
       this.confirming = false;
-      resolve6(approved);
+      resolve5(approved);
     }
   }
   /** Resolve a pending batch confirm from client response */
   resolveBatchConfirm(requestId, decision) {
-    const resolve6 = this.pendingBatchConfirms.get(requestId);
-    if (resolve6) {
+    const resolve5 = this.pendingBatchConfirms.get(requestId);
+    if (resolve5) {
       this.clearPendingTimer(requestId);
       this.pendingBatchConfirms.delete(requestId);
       this.confirming = false;
       if (decision === "all" || decision === "none") {
-        resolve6(decision);
+        resolve5(decision);
       } else {
-        resolve6(new Set(decision));
+        resolve5(new Set(decision));
       }
     }
   }
   /** Cancel all pending confirms (e.g., on disconnect) */
   cancelAll() {
-    for (const resolve6 of this.pendingConfirms.values()) resolve6(false);
+    for (const resolve5 of this.pendingConfirms.values()) resolve5(false);
     this.pendingConfirms.clear();
-    for (const resolve6 of this.pendingBatchConfirms.values()) resolve6("none");
+    for (const resolve5 of this.pendingBatchConfirms.values()) resolve5("none");
     this.pendingBatchConfirms.clear();
     this.confirming = false;
   }
@@ -338,8 +339,8 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
       diff: this.getDiffPreview(call)
     };
     this.send(msg);
-    return new Promise((resolve6) => {
-      this.pendingConfirms.set(requestId, resolve6);
+    return new Promise((resolve5) => {
+      this.pendingConfirms.set(requestId, resolve5);
       this.pendingTimers.set(requestId, setTimeout(() => {
         if (this.pendingConfirms.has(requestId)) {
           this.resolveConfirm(requestId, false);
@@ -363,8 +364,8 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
       files
     };
     this.send(msg);
-    return new Promise((resolve6) => {
-      this.pendingBatchConfirms.set(requestId, resolve6);
+    return new Promise((resolve5) => {
+      this.pendingBatchConfirms.set(requestId, resolve5);
       this.pendingTimers.set(requestId, setTimeout(() => {
         if (this.pendingBatchConfirms.has(requestId)) {
           this.resolveBatchConfirm(requestId, "none");
@@ -667,103 +668,113 @@ function loadMemoryContent(configDir) {
 }
 
 // src/web/session-handler.ts
-import { mkdirSync as mkdirSync4, createWriteStream as createWriteStream4 } from "fs";
-import { join as join4, dirname as dirname4 } from "path";
+import { mkdirSync as mkdirSync3, createWriteStream as createWriteStream3 } from "fs";
+import { join as join3, dirname as dirname3 } from "path";
 
 // src/web/commands/provider-commands.ts
 async function handleProvider(args, ctx) {
-  {
-    const id = args[0];
-    if (!id) {
-      ctx.send({ type: "error", message: "Usage: /provider <id>" });
-      return;
-    }
-    const p = ctx.providers.get(id);
-    if (!p) {
-      ctx.send({ type: "error", message: `Provider "${id}" not available` });
-      return;
-    }
-    ctx.currentProvider = id;
-    ctx.currentModel = p.info.defaultModel;
-    ctx.updateContextWindow();
-    ctx.send({ type: "info", message: `Switched to provider: ${id} (${ctx.currentModel})` });
-    ctx.sendStatus();
+  const id = args[0];
+  if (!id) {
+    ctx.send({ type: "error", message: "Usage: /provider <id>" });
+    return;
   }
+  const p = ctx.providers.get(id);
+  if (!p) {
+    ctx.send({ type: "error", message: `Provider "${id}" not available` });
+    return;
+  }
+  ctx.currentProvider = id;
+  ctx.currentModel = p.info.defaultModel;
+  ctx.updateContextWindow();
+  ctx.send({ type: "info", message: `Switched to provider: ${id} (${ctx.currentModel})` });
+  ctx.sendStatus();
 }
 async function handleModel(args, ctx) {
-  {
-    const sub = args[0];
-    if (!sub) {
-      ctx.send({ type: "error", message: "Usage: /model <id>|refresh [provider]|cache [clear [provider]]" });
-      return;
-    }
-    if (sub === "refresh") {
-      const providerId = args[1] ?? ctx.currentProvider;
-      try {
-        const models2 = await ctx.providers.refreshModels(providerId);
-        ctx.send({ type: "info", message: `Refreshed ${models2.length} model(s) for ${providerId}.` });
-        ctx.sendStatus();
-      } catch (err) {
-        ctx.send({ type: "error", message: `Model refresh failed: ${err instanceof Error ? err.message : String(err)}` });
-      }
-      return;
-    }
-    if (sub === "cache") {
-      if ((args[1] ?? "").toLowerCase() === "clear") {
-        const providerId = args[2];
-        ctx.providers.clearModelCache(providerId);
-        ctx.send({ type: "info", message: providerId ? `Cleared model cache for ${providerId}.` : "Cleared model cache." });
-        return;
-      }
-      const rows = ctx.providers.getModelCacheStatus();
-      ctx.send({
-        type: "info",
-        message: rows.length === 0 ? "Model cache is empty. Use /model refresh to populate it." : rows.map((row) => `${row.providerId}: ${row.count} model(s), fetched ${row.fetchedAt}`).join("\n")
-      });
-      return;
+  const sub = args[0];
+  if (!sub) {
+    ctx.send({ type: "error", message: "Usage: /model <id>|refresh [provider]|cache [clear [provider]]" });
+    return;
+  }
+  if (sub === "refresh") {
+    const providerId = args[1] ?? ctx.currentProvider;
+    try {
+      const models2 = await ctx.providers.refreshModels(providerId);
+      ctx.send({ type: "info", message: `Refreshed ${models2.length} model(s) for ${providerId}.` });
+      ctx.sendStatus();
+    } catch (err) {
+      ctx.send({ type: "error", message: `Model refresh failed: ${err instanceof Error ? err.message : String(err)}` });
     }
-    const modelId = sub;
-    const models = await ctx.providers.listModels(ctx.currentProvider);
-    const found = models.find((m) => m.id === modelId);
-    if (!found) {
-      ctx.send({ type: "error", message: `Model "${modelId}" not found` });
+    return;
+  }
+  if (sub === "cache") {
+    if ((args[1] ?? "").toLowerCase() === "clear") {
+      const providerId = args[2];
+      ctx.providers.clearModelCache(providerId);
+      ctx.send({ type: "info", message: providerId ? `Cleared model cache for ${providerId}.` : "Cleared model cache." });
       return;
     }
-    ctx.currentModel = modelId;
-    ctx.updateContextWindow();
-    ctx.send({ type: "info", message: `Switched to model: ${modelId}` });
-    ctx.sendStatus();
+    const rows = ctx.providers.getModelCacheStatus();
+    ctx.send({
+      type: "info",
+      message: rows.length === 0 ? "Model cache is empty. Use /model refresh to populate it." : rows.map((row) => `${row.providerId}: ${row.count} model(s), fetched ${row.fetchedAt}`).join("\n")
+    });
+    return;
+  }
+  const modelId = sub;
+  const models = await ctx.providers.listModels(ctx.currentProvider);
+  const found = models.find((m) => m.id === modelId);
+  if (!found) {
+    ctx.send({ type: "error", message: `Model "${modelId}" not found` });
+    return;
   }
+  ctx.currentModel = modelId;
+  ctx.updateContextWindow();
+  ctx.send({ type: "info", message: `Switched to model: ${modelId}` });
+  ctx.sendStatus();
 }
 async function handleThink(args, ctx) {
-  {
-    const sub = args[0];
-    if (sub === "on") ctx.runtimeThinking = true;
-    else if (sub === "off") ctx.runtimeThinking = false;
-    else ctx.runtimeThinking = !ctx.runtimeThinking;
-    ctx.send({ type: "info", message: `Thinking mode: ${ctx.runtimeThinking ? "ON" : "OFF"}` });
-    ctx.sendStatus();
-  }
+  const sub = args[0];
+  if (sub === "on") ctx.runtimeThinking = true;
+  else if (sub === "off") ctx.runtimeThinking = false;
+  else ctx.runtimeThinking = !ctx.runtimeThinking;
+  ctx.send({ type: "info", message: `Thinking mode: ${ctx.runtimeThinking ? "ON" : "OFF"}` });
+  ctx.sendStatus();
 }
 async function handlePlan(args, ctx) {
-  {
-    const sub = args[0];
-    if (sub === "exit" || sub === "cancel") {
-      ctx.planMode = false;
-      ctx.send({ type: "info", message: "Plan mode OFF." });
-    } else if (sub === "execute") {
-      ctx.planMode = false;
-      ctx.send({ type: "info", message: "Plan mode OFF. Executing with all tools enabled." });
-    } else {
-      ctx.planMode = !ctx.planMode;
-      ctx.send({ type: "info", message: `Plan mode: ${ctx.planMode ? "ON (read-only tools only)" : "OFF"}` });
+  const sub = args[0];
+  if (sub === "exit" || sub === "cancel") {
+    ctx.planMode = false;
+    ctx.send({ type: "info", message: "Plan mode OFF." });
+  } else if (sub === "execute") {
+    ctx.planMode = false;
+    ctx.send({ type: "info", message: "Plan mode OFF. Executing with all tools enabled." });
+  } else {
+    ctx.planMode = !ctx.planMode;
+    ctx.send({ type: "info", message: `Plan mode: ${ctx.planMode ? "ON (read-only tools only)" : "OFF"}` });
+  }
+  ctx.sendStatus();
+}
+
+// src/web/commands/_shared.ts
+import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync, mkdirSync, readdirSync, statSync, createWriteStream } from "fs";
+import { join, resolve, dirname } from "path";
+function lastAssistantText(messages) {
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const m = messages[i];
+    if (!m || m.role !== "assistant") continue;
+    const c = m.content;
+    if (typeof c === "string") return c;
+    if (Array.isArray(c)) {
+      const text = c.filter((p) => p && p.type === "text" && typeof p.text === "string").map((p) => p.text).join("");
+      if (text) return text;
     }
-    ctx.sendStatus();
+    return void 0;
   }
+  return void 0;
 }
 
 // src/web/commands/session-commands.ts
-async function handleClear(args, ctx) {
+async function handleClear(_args, ctx) {
   ctx.saveIfNeeded();
   ctx.sessions.createSession(ctx.currentProvider, ctx.currentModel);
   ctx.resetWebSessionUsage();
@@ -774,1207 +785,1215 @@ async function handleClear(args, ctx) {
 async function handleCompact(args, ctx) {
   await ctx.compactSession(args.join(" ") || void 0);
 }
-async function handleStatus(args, ctx) {
-  {
-    const session = ctx.sessions.current;
-    const cacheRead = ctx.sessionTokenUsage.cacheReadTokens;
-    const cacheCreate = ctx.sessionTokenUsage.cacheCreationTokens;
-    const cost = computeCost(ctx.currentProvider, ctx.currentModel, ctx.sessionTokenUsage);
-    const cacheLine = cacheRead > 0 || cacheCreate > 0 ? `
+async function handleStatus(_args, ctx) {
+  const session = ctx.sessions.current;
+  const cacheRead = ctx.sessionTokenUsage.cacheReadTokens;
+  const cacheCreate = ctx.sessionTokenUsage.cacheCreationTokens;
+  const cost = computeCost(ctx.currentProvider, ctx.currentModel, ctx.sessionTokenUsage);
+  const cacheLine = cacheRead > 0 || cacheCreate > 0 ? `
 Cache:  write=${cacheCreate} read=${cacheRead}` : "";
-    const costLine = cost != null ? `
+  const costLine = cost != null ? `
 Cost:   ${formatCost(cost)}` : "";
-    ctx.send({
-      type: "info",
-      message: `Provider: ${ctx.currentProvider}
+  ctx.send({
+    type: "info",
+    message: `Provider: ${ctx.currentProvider}
 Model: ${ctx.currentModel}
 Session: ${session?.id ?? "none"} (${session?.messages.length ?? 0} messages)
 Tokens: in=${ctx.sessionTokenUsage.inputTokens} out=${ctx.sessionTokenUsage.outputTokens}${cacheLine}${costLine}`
-    });
-  }
+  });
 }
 async function handleSession(args, ctx) {
-  {
-    const sub = args[0];
-    if (sub === "new") {
-      ctx.saveIfNeeded();
-      const created = ctx.sessions.createSession(ctx.currentProvider, ctx.currentModel);
-      ctx.unsavedSessions.set(created.id, created);
+  const sub = args[0];
+  if (sub === "new") {
+    ctx.saveIfNeeded();
+    const created = ctx.sessions.createSession(ctx.currentProvider, ctx.currentModel);
+    ctx.unsavedSessions.set(created.id, created);
+    ctx.resetWebSessionUsage();
+    ctx.send({ type: "info", message: "New session created." });
+    ctx.sendStatus();
+    ctx.sendSessionList();
+    return;
+  }
+  if (sub === "load" && args[1]) {
+    const targetId = args[1];
+    ctx.saveIfNeeded();
+    const cachedExact = ctx.unsavedSessions.get(targetId);
+    const cached = cachedExact ?? [...ctx.unsavedSessions.values()].find((s) => s.id.startsWith(targetId));
+    if (cached) {
+      ctx.sessions.setCurrent(cached);
       ctx.resetWebSessionUsage();
-      ctx.send({ type: "info", message: "New session created." });
+      ctx.send({
+        type: "info",
+        message: `Loaded session: ${cached.id.slice(0, 8)} "${cached.title ?? ""}" (${cached.messages.length} messages)`
+      });
+      ctx.sendSessionMessages();
       ctx.sendStatus();
       ctx.sendSessionList();
-    } else if (sub === "load" && args[1]) {
-      const targetId = args[1];
-      ctx.saveIfNeeded();
-      const cachedExact = ctx.unsavedSessions.get(targetId);
-      const cached = cachedExact ?? [...ctx.unsavedSessions.values()].find((s) => s.id.startsWith(targetId));
-      if (cached) {
-        ctx.sessions.setCurrent(cached);
-        ctx.resetWebSessionUsage();
-        ctx.send({
-          type: "info",
-          message: `Loaded session: ${cached.id.slice(0, 8)} "${cached.title ?? ""}" (${cached.messages.length} messages)`
-        });
-        ctx.sendSessionMessages();
-        ctx.sendStatus();
-        ctx.sendSessionList();
-      }
-      const list = ctx.sessions.listSessions();
-      const found = list.find((s) => s.id.startsWith(targetId));
-      if (found) {
-        ctx.sessions.loadSession(found.id);
-        ctx.resetWebSessionUsage();
-        ctx.send({ type: "info", message: `Loaded session: ${found.id.slice(0, 8)} "${found.title ?? ""}" (${found.messageCount} messages)` });
-        const loadedSession = ctx.sessions.current;
-        if (loadedSession && loadedSession.messages.length > 0) {
-          const lastMsg = loadedSession.messages[loadedSession.messages.length - 1];
-          const isIncomplete = lastMsg.role === "tool" || lastMsg.role === "assistant" && lastMsg.toolCalls && lastMsg.toolCalls.length > 0;
-          if (isIncomplete) {
-            ctx.send({
-              type: "info",
-              message: '\u26A0 This session appears to have been interrupted mid-task. The AI will see the tool history and can continue where it left off. Type "continue where you left off" to resume.'
-            });
-          }
+      return;
+    }
+    const list = ctx.sessions.listSessions();
+    const found = list.find((s) => s.id.startsWith(targetId));
+    if (found) {
+      ctx.sessions.loadSession(found.id);
+      ctx.resetWebSessionUsage();
+      ctx.send({ type: "info", message: `Loaded session: ${found.id.slice(0, 8)} "${found.title ?? ""}" (${found.messageCount} messages)` });
+      const loadedSession = ctx.sessions.current;
+      if (loadedSession && loadedSession.messages.length > 0) {
+        const lastMsg = loadedSession.messages[loadedSession.messages.length - 1];
+        const isIncomplete = lastMsg.role === "tool" || lastMsg.role === "assistant" && lastMsg.toolCalls && lastMsg.toolCalls.length > 0;
+        if (isIncomplete) {
+          ctx.send({
+            type: "info",
+            message: '\u26A0 This session appears to have been interrupted mid-task. The AI will see the tool history and can continue where it left off. Type "continue where you left off" to resume.'
+          });
         }
-        ctx.sendSessionMessages();
-        ctx.sendStatus();
-        ctx.sendSessionList();
-      } else {
-        const recreated = ctx.sessions.createSession(ctx.currentProvider, ctx.currentModel);
-        ctx.unsavedSessions.set(recreated.id, recreated);
-        ctx.resetWebSessionUsage();
-        ctx.send({
-          type: "info",
-          message: `Previous session (${targetId.slice(0, 8)}) is no longer available \u2014 started a new one.`
-        });
-        ctx.sendStatus();
-        ctx.sendSessionList();
       }
-    } else if (sub === "list") {
+      ctx.sendSessionMessages();
+      ctx.sendStatus();
+      ctx.sendSessionList();
+      return;
+    }
+    const recreated = ctx.sessions.createSession(ctx.currentProvider, ctx.currentModel);
+    ctx.unsavedSessions.set(recreated.id, recreated);
+    ctx.resetWebSessionUsage();
+    ctx.send({
+      type: "info",
+      message: `Previous session (${targetId.slice(0, 8)}) is no longer available \u2014 started a new one.`
+    });
+    ctx.sendStatus();
+    ctx.sendSessionList();
+    return;
+  }
+  if (sub === "list") {
+    ctx.sendSessionList();
+    return;
+  }
+  if (sub === "delete" && args[1]) {
+    const targetId = args[1];
+    const cachedKey = ctx.unsavedSessions.has(targetId) ? targetId : [...ctx.unsavedSessions.keys()].find((k) => k.startsWith(targetId));
+    if (cachedKey) {
+      ctx.unsavedSessions.delete(cachedKey);
+      if (ctx.sessions.current?.id === cachedKey) {
+        ctx.sessions.clearCurrent();
+      }
+      ctx.send({ type: "info", message: `Deleted session: ${cachedKey.slice(0, 8)}` });
       ctx.sendSessionList();
-    } else if (sub === "delete" && args[1]) {
-      const targetId = args[1];
+      return;
+    }
+    const list = ctx.sessions.listSessions();
+    const found = list.find((s) => s.id.startsWith(targetId));
+    if (found) {
+      ctx.sessions.deleteSession(found.id);
+      ctx.send({ type: "info", message: `Deleted session: ${found.id.slice(0, 8)}` });
+      ctx.sendSessionList();
+    } else {
+      ctx.send({ type: "error", message: `Session not found: ${targetId}` });
+    }
+    return;
+  }
+  if (sub === "batch-delete") {
+    const ids = args.slice(1).filter(Boolean);
+    if (ids.length === 0) {
+      ctx.send({ type: "error", message: "No session IDs provided." });
+      return;
+    }
+    const list = ctx.sessions.listSessions();
+    let deleted = 0;
+    for (const targetId of ids) {
       const cachedKey = ctx.unsavedSessions.has(targetId) ? targetId : [...ctx.unsavedSessions.keys()].find((k) => k.startsWith(targetId));
       if (cachedKey) {
         ctx.unsavedSessions.delete(cachedKey);
-        if (ctx.sessions.current?.id === cachedKey) {
-          ctx.sessions.clearCurrent();
-        }
-        ctx.send({ type: "info", message: `Deleted session: ${cachedKey.slice(0, 8)}` });
-        ctx.sendSessionList();
+        deleted++;
+        continue;
       }
-      const list = ctx.sessions.listSessions();
       const found = list.find((s) => s.id.startsWith(targetId));
       if (found) {
         ctx.sessions.deleteSession(found.id);
-        ctx.send({ type: "info", message: `Deleted session: ${found.id.slice(0, 8)}` });
-        ctx.sendSessionList();
-      } else {
-        ctx.send({ type: "error", message: `Session not found: ${targetId}` });
+        deleted++;
       }
-    } else if (sub === "batch-delete") {
-      const ids = args.slice(1).filter(Boolean);
-      if (ids.length === 0) {
-        ctx.send({ type: "error", message: "No session IDs provided." });
-      }
-      const list = ctx.sessions.listSessions();
-      let deleted = 0;
-      for (const targetId of ids) {
-        const cachedKey = ctx.unsavedSessions.has(targetId) ? targetId : [...ctx.unsavedSessions.keys()].find((k) => k.startsWith(targetId));
-        if (cachedKey) {
-          ctx.unsavedSessions.delete(cachedKey);
-          deleted++;
-          continue;
-        }
-        const found = list.find((s) => s.id.startsWith(targetId));
-        if (found) {
-          ctx.sessions.deleteSession(found.id);
-          deleted++;
-        }
-      }
-      ctx.send({ type: "info", message: `Deleted ${deleted} session(s).` });
+    }
+    ctx.send({ type: "info", message: `Deleted ${deleted} session(s).` });
+    ctx.sendSessionList();
+    return;
+  }
+  if (sub === "rename" && args[1] && args.length >= 3) {
+    const targetId = args[1];
+    const newTitle = args.slice(2).join(" ").trim();
+    if (!newTitle) {
+      ctx.send({ type: "error", message: "Title cannot be empty." });
+      return;
+    }
+    const cachedKey = ctx.unsavedSessions.has(targetId) ? targetId : [...ctx.unsavedSessions.keys()].find((k) => k.startsWith(targetId));
+    if (cachedKey) {
+      const session = ctx.unsavedSessions.get(cachedKey);
+      session.title = newTitle;
+      ctx.send({ type: "info", message: `Renamed session: "${newTitle}"` });
+      ctx.sendSessionList();
+      return;
+    }
+    const list = ctx.sessions.listSessions();
+    const found = list.find((s) => s.id.startsWith(targetId));
+    if (found) {
+      const session = ctx.sessions.loadSession(found.id);
+      session.title = newTitle;
+      ctx.sessions.save();
+      ctx.send({ type: "info", message: `Renamed session: "${newTitle}"` });
       ctx.sendSessionList();
-    } else if (sub === "rename" && args[1] && args.length >= 3) {
-      const targetId = args[1];
-      const newTitle = args.slice(2).join(" ").trim();
-      if (!newTitle) {
-        ctx.send({ type: "error", message: "Title cannot be empty." });
-      }
-      const cachedKey = ctx.unsavedSessions.has(targetId) ? targetId : [...ctx.unsavedSessions.keys()].find((k) => k.startsWith(targetId));
-      if (cachedKey) {
-        const session = ctx.unsavedSessions.get(cachedKey);
-        session.title = newTitle;
-        ctx.send({ type: "info", message: `Renamed session: "${newTitle}"` });
-        ctx.sendSessionList();
-      }
-      const list = ctx.sessions.listSessions();
-      const found = list.find((s) => s.id.startsWith(targetId));
-      if (found) {
-        const session = ctx.sessions.loadSession(found.id);
-        session.title = newTitle;
-        ctx.sessions.save();
-        ctx.send({ type: "info", message: `Renamed session: "${newTitle}"` });
-        ctx.sendSessionList();
-      } else {
-        ctx.send({ type: "error", message: `Session not found: ${targetId}` });
-      }
     } else {
-      ctx.send({ type: "info", message: "Usage: /session new | list | load <id> | delete <id> | rename <id> <title>" });
+      ctx.send({ type: "error", message: `Session not found: ${targetId}` });
     }
+    return;
   }
+  ctx.send({ type: "info", message: "Usage: /session new | list | load <id> | delete <id> | rename <id> <title>" });
 }
 async function handleExport(args, ctx) {
-  {
-    const format = args[0] === "json" ? "json" : "md";
-    ctx.exportConversation(format);
-  }
+  const format = args[0] === "json" ? "json" : "md";
+  ctx.exportConversation(format);
 }
-async function handleCost(args, ctx) {
-  {
-    const u = ctx.sessionTokenUsage;
-    const total = u.inputTokens + u.outputTokens + u.cacheCreationTokens + u.cacheReadTokens;
-    const cost = computeCost(ctx.currentProvider, ctx.currentModel, u);
-    let savings = null;
-    if (cost != null && u.cacheReadTokens > 0) {
-      const withoutCache = computeCost(ctx.currentProvider, ctx.currentModel, {
-        inputTokens: u.inputTokens + u.cacheReadTokens,
-        outputTokens: u.outputTokens,
-        cacheCreationTokens: u.cacheCreationTokens,
-        cacheReadTokens: 0
-      });
-      if (withoutCache != null) savings = withoutCache - cost;
-    }
-    const lines = [
-      "\u{1F4B0} Session Cost & Token Usage",
-      `  Provider        : ${ctx.currentProvider}`,
-      `  Model           : ${ctx.currentModel}`,
-      `  Input (uncached): ${u.inputTokens.toLocaleString()}`,
-      `  Output          : ${u.outputTokens.toLocaleString()}`
-    ];
-    if (u.cacheCreationTokens > 0) lines.push(`  Cache write     : ${u.cacheCreationTokens.toLocaleString()}`);
-    if (u.cacheReadTokens > 0) {
-      const pct = Math.round(u.cacheReadTokens / (u.cacheReadTokens + u.inputTokens) * 100);
-      lines.push(`  Cache read      : ${u.cacheReadTokens.toLocaleString()} (${pct}% hit rate)`);
-    }
-    lines.push(`  Total tokens    : ${total.toLocaleString()}`);
-    if (cost != null) {
-      lines.push(`  Cost            : ${formatCost(cost)}`);
-      if (savings != null && savings > 0) {
-        lines.push(`  Cache savings   : -${formatCost(savings)} (vs no cache)`);
-      }
-    } else {
-      lines.push(`  Cost            : \u2014 (pricing unknown for this model)`);
+async function handleCost(_args, ctx) {
+  const u = ctx.sessionTokenUsage;
+  const total = u.inputTokens + u.outputTokens + u.cacheCreationTokens + u.cacheReadTokens;
+  const cost = computeCost(ctx.currentProvider, ctx.currentModel, u);
+  let savings = null;
+  if (cost != null && u.cacheReadTokens > 0) {
+    const withoutCache = computeCost(ctx.currentProvider, ctx.currentModel, {
+      inputTokens: u.inputTokens + u.cacheReadTokens,
+      outputTokens: u.outputTokens,
+      cacheCreationTokens: u.cacheCreationTokens,
+      cacheReadTokens: 0
+    });
+    if (withoutCache != null) savings = withoutCache - cost;
+  }
+  const lines = [
+    "\u{1F4B0} Session Cost & Token Usage",
+    `  Provider        : ${ctx.currentProvider}`,
+    `  Model           : ${ctx.currentModel}`,
+    `  Input (uncached): ${u.inputTokens.toLocaleString()}`,
+    `  Output          : ${u.outputTokens.toLocaleString()}`
+  ];
+  if (u.cacheCreationTokens > 0) lines.push(`  Cache write     : ${u.cacheCreationTokens.toLocaleString()}`);
+  if (u.cacheReadTokens > 0) {
+    const pct = Math.round(u.cacheReadTokens / (u.cacheReadTokens + u.inputTokens) * 100);
+    lines.push(`  Cache read      : ${u.cacheReadTokens.toLocaleString()} (${pct}% hit rate)`);
+  }
+  lines.push(`  Total tokens    : ${total.toLocaleString()}`);
+  if (cost != null) {
+    lines.push(`  Cost            : ${formatCost(cost)}`);
+    if (savings != null && savings > 0) {
+      lines.push(`  Cache savings   : -${formatCost(savings)} (vs no cache)`);
     }
-    ctx.send({ type: "info", message: lines.join("\n") });
+  } else {
+    lines.push(`  Cost            : \u2014 (pricing unknown for this model)`);
   }
+  ctx.send({ type: "info", message: lines.join("\n") });
 }
 async function handleCheckpoint(args, ctx) {
-  {
-    const session = ctx.sessions.current;
-    if (!session) {
-      ctx.send({ type: "error", message: "No active session." });
-    }
-    const sub = args[0]?.toLowerCase();
-    if (!sub || sub === "list") {
-      const cps = session.checkpoints;
-      if (cps.length === 0) {
-        ctx.send({ type: "info", message: "No checkpoints. Use /checkpoint save <name> to create one." });
-      } else {
-        const lines = [`\u{1F4CC} Checkpoints (${cps.length}):`, ""];
-        for (const cp of cps) {
-          const ts = cp.timestamp.toLocaleString();
-          lines.push(`  ${cp.name.padEnd(20)} msg #${cp.messageIndex}  ${ts}`);
-        }
-        ctx.send({ type: "info", message: lines.join("\n") });
+  const session = ctx.sessions.current;
+  if (!session) {
+    ctx.send({ type: "error", message: "No active session." });
+    return;
+  }
+  const sub = args[0]?.toLowerCase();
+  if (!sub || sub === "list") {
+    const cps = session.checkpoints;
+    if (cps.length === 0) {
+      ctx.send({ type: "info", message: "No checkpoints. Use /checkpoint save <name> to create one." });
+    } else {
+      const lines = [`\u{1F4CC} Checkpoints (${cps.length}):`, ""];
+      for (const cp of cps) {
+        const ts = cp.timestamp.toLocaleString();
+        lines.push(`  ${cp.name.padEnd(20)} msg #${cp.messageIndex}  ${ts}`);
       }
+      ctx.send({ type: "info", message: lines.join("\n") });
     }
-    const cpName = args.slice(1).join(" ").trim();
-    if (sub === "save") {
-      if (!cpName) {
-        ctx.send({ type: "error", message: "Usage: /checkpoint save <name>" });
-      }
-      session.createCheckpoint(cpName);
-      ctx.send({ type: "info", message: `\u2713 Checkpoint "${cpName}" saved at message #${session.messages.length}` });
-    } else if (sub === "restore") {
-      if (!cpName) {
-        ctx.send({ type: "error", message: "Usage: /checkpoint restore <name>" });
-      }
-      const ok = session.restoreCheckpoint(cpName);
-      if (ok) {
-        ctx.send({ type: "info", message: `\u2713 Restored to checkpoint "${cpName}" (${session.messages.length} messages)` });
-        ctx.sendSessionMessages();
-        ctx.sendStatus();
-      } else {
-        ctx.send({ type: "error", message: `Checkpoint "${cpName}" not found.` });
-      }
-    } else if (sub === "delete") {
-      if (!cpName) {
-        ctx.send({ type: "error", message: "Usage: /checkpoint delete <name>" });
-      }
-      const ok = session.deleteCheckpoint(cpName);
-      if (ok) {
-        ctx.send({ type: "info", message: `\u2713 Deleted checkpoint "${cpName}"` });
-      } else {
-        ctx.send({ type: "error", message: `Checkpoint "${cpName}" not found.` });
-      }
+    return;
+  }
+  const cpName = args.slice(1).join(" ").trim();
+  if (sub === "save") {
+    if (!cpName) {
+      ctx.send({ type: "error", message: "Usage: /checkpoint save <name>" });
+      return;
+    }
+    session.createCheckpoint(cpName);
+    ctx.send({ type: "info", message: `\u2713 Checkpoint "${cpName}" saved at message #${session.messages.length}` });
+  } else if (sub === "restore") {
+    if (!cpName) {
+      ctx.send({ type: "error", message: "Usage: /checkpoint restore <name>" });
+      return;
+    }
+    const ok = session.restoreCheckpoint(cpName);
+    if (ok) {
+      ctx.send({ type: "info", message: `\u2713 Restored to checkpoint "${cpName}" (${session.messages.length} messages)` });
+      ctx.sendSessionMessages();
+      ctx.sendStatus();
     } else {
-      ctx.send({ type: "error", message: `Unknown subcommand: ${sub}. Use save/restore/list/delete.` });
+      ctx.send({ type: "error", message: `Checkpoint "${cpName}" not found.` });
     }
+  } else if (sub === "delete") {
+    if (!cpName) {
+      ctx.send({ type: "error", message: "Usage: /checkpoint delete <name>" });
+      return;
+    }
+    const ok = session.deleteCheckpoint(cpName);
+    if (ok) {
+      ctx.send({ type: "info", message: `\u2713 Deleted checkpoint "${cpName}"` });
+    } else {
+      ctx.send({ type: "error", message: `Checkpoint "${cpName}" not found.` });
+    }
+  } else {
+    ctx.send({ type: "error", message: `Unknown subcommand: ${sub}. Use save/restore/list/delete.` });
   }
 }
 async function handleBranch(args, ctx) {
-  {
-    const session = ctx.sessions.current;
-    if (!session) {
-      ctx.send({ type: "error", message: "No active session." });
-    }
-    const sub = args[0]?.toLowerCase();
-    const resolve6 = (ref) => {
-      const r = session.resolveBranchRef(ref);
-      if (r.ok) return r.id;
-      if (r.reason === "ambiguous") {
-        const list = r.matches.map((m) => `${m.id} (${m.title})`).join(", ");
-        ctx.send({ type: "error", message: `Ambiguous branch reference "${ref}". Matches: ${list}. Use the 6-char id.` });
-      } else {
-        ctx.send({ type: "error", message: `Branch "${ref}" not found. Use /branch list to see all branches.` });
-      }
-      return null;
-    };
-    if (!sub || sub === "list") {
-      const branches = session.listBranches();
-      const lines = [`\u{1F33F} Branches (${branches.length}):`, ""];
-      for (const b of branches) {
-        const marker = b.id === session.activeBranchId ? "\u25CF " : "  ";
-        const count = b.id === session.activeBranchId ? session.messages.length : session.getBranchMessages(b.id)?.length ?? 0;
-        const parent = b.parentBranchId ? ` \u2190 ${b.parentBranchId}@${b.parentMessageIndex}` : "";
-        lines.push(`  ${marker}${b.id.padEnd(10)} ${b.title.padEnd(20)} (${count} msgs)${parent}`);
-      }
-      lines.push("");
-      lines.push("Usage: /branch new <msgIndex> [title] | switch <id|title> | delete <id|title> | rename <id|title> <new title> | diff <id|title> | cherry-pick <id|title> <msgIndex>");
-      ctx.send({ type: "info", message: lines.join("\n") });
+  const session = ctx.sessions.current;
+  if (!session) {
+    ctx.send({ type: "error", message: "No active session." });
+    return;
+  }
+  const sub = args[0]?.toLowerCase();
+  const resolve5 = (ref) => {
+    const r = session.resolveBranchRef(ref);
+    if (r.ok) return r.id;
+    if (r.reason === "ambiguous") {
+      const list = r.matches.map((m) => `${m.id} (${m.title})`).join(", ");
+      ctx.send({ type: "error", message: `Ambiguous branch reference "${ref}". Matches: ${list}. Use the 6-char id.` });
+    } else {
+      ctx.send({ type: "error", message: `Branch "${ref}" not found. Use /branch list to see all branches.` });
     }
-    if (sub === "new") {
-      const idxArg = args[1];
-      if (!idxArg) {
-        ctx.send({ type: "error", message: "Usage: /branch new <msgIndex> [title]" });
-      }
-      const fromIndex = parseInt(idxArg, 10);
-      if (isNaN(fromIndex) || fromIndex < 0 || fromIndex > session.messages.length) {
-        ctx.send({ type: "error", message: `Invalid msgIndex: ${idxArg}. Range: 0-${session.messages.length}` });
-      }
-      const title = args.slice(2).join(" ").trim() || void 0;
-      try {
-        const newId = session.createBranch(fromIndex, title);
-        await ctx.sessions.save();
-        ctx.send({ type: "info", message: `\u2713 Created branch "${newId}" from message #${fromIndex}. Now active (${session.messages.length} messages).` });
-        ctx.sendSessionMessages();
-        ctx.sendStatus();
-      } catch (err) {
-        ctx.send({ type: "error", message: err.message });
-      }
+    return null;
+  };
+  if (!sub || sub === "list") {
+    const branches = session.listBranches();
+    const lines = [`\u{1F33F} Branches (${branches.length}):`, ""];
+    for (const b of branches) {
+      const marker = b.id === session.activeBranchId ? "\u25CF " : "  ";
+      const count = b.id === session.activeBranchId ? session.messages.length : session.getBranchMessages(b.id)?.length ?? 0;
+      const parent = b.parentBranchId ? ` \u2190 ${b.parentBranchId}@${b.parentMessageIndex}` : "";
+      lines.push(`  ${marker}${b.id.padEnd(10)} ${b.title.padEnd(20)} (${count} msgs)${parent}`);
     }
-    if (sub === "switch") {
-      const ref = args[1];
-      if (!ref) {
-        ctx.send({ type: "error", message: "Usage: /branch switch <id|title>" });
-      }
-      const id = resolve6(ref);
-      if (!id) {
-      }
-      const ok = session.switchBranch(id);
-      if (ok) {
-        await ctx.sessions.save();
-        const b = session.getActiveBranch();
-        ctx.send({ type: "info", message: `\u2713 Switched to branch "${b.id}" \u2014 ${b.title} (${session.messages.length} messages)` });
-        ctx.sendSessionMessages();
-        ctx.sendStatus();
-      } else {
-        ctx.send({ type: "error", message: `Cannot switch to "${id}" (already active).` });
-      }
+    lines.push("");
+    lines.push("Usage: /branch new <msgIndex> [title] | switch <id|title> | delete <id|title> | rename <id|title> <new title> | diff <id|title> | cherry-pick <id|title> <msgIndex>");
+    ctx.send({ type: "info", message: lines.join("\n") });
+    return;
+  }
+  if (sub === "new") {
+    const idxArg = args[1];
+    if (!idxArg) {
+      ctx.send({ type: "error", message: "Usage: /branch new <msgIndex> [title]" });
+      return;
     }
-    if (sub === "delete") {
-      const ref = args[1];
-      if (!ref) {
-        ctx.send({ type: "error", message: "Usage: /branch delete <id|title>" });
-      }
-      const id = resolve6(ref);
-      if (!id) {
-      }
-      const ok = session.deleteBranch(id);
-      if (ok) {
-        await ctx.sessions.save();
-        ctx.send({ type: "info", message: `\u2713 Deleted branch "${id}"` });
-        ctx.sendStatus();
-      } else {
-        ctx.send({ type: "error", message: `Cannot delete "${id}" (active, or last remaining branch).` });
-      }
+    const fromIndex = parseInt(idxArg, 10);
+    if (isNaN(fromIndex) || fromIndex < 0 || fromIndex > session.messages.length) {
+      ctx.send({ type: "error", message: `Invalid msgIndex: ${idxArg}. Range: 0-${session.messages.length}` });
+      return;
     }
-    if (sub === "rename") {
-      const ref = args[1];
-      const title = args.slice(2).join(" ").trim();
-      if (!ref || !title) {
-        ctx.send({ type: "error", message: "Usage: /branch rename <id|title> <new title>" });
-      }
-      const id = resolve6(ref);
-      if (!id) {
-      }
-      const ok = session.renameBranch(id, title);
-      if (ok) {
-        await ctx.sessions.save();
-        ctx.send({ type: "info", message: `\u2713 Renamed branch "${id}" \u2192 "${title}"` });
-        ctx.sendStatus();
-      } else {
-        ctx.send({ type: "error", message: `Branch "${id}" not found.` });
-      }
+    const title = args.slice(2).join(" ").trim() || void 0;
+    try {
+      const newId = session.createBranch(fromIndex, title);
+      await ctx.sessions.save();
+      ctx.send({ type: "info", message: `\u2713 Created branch "${newId}" from message #${fromIndex}. Now active (${session.messages.length} messages).` });
+      ctx.sendSessionMessages();
+      ctx.sendStatus();
+    } catch (err) {
+      ctx.send({ type: "error", message: err.message });
     }
-    if (sub === "diff") {
-      const ref = args[1];
-      if (!ref) {
-        ctx.send({ type: "error", message: "Usage: /branch diff <id|title>" });
-      }
-      const id = resolve6(ref);
-      if (!id) {
-      }
-      const d = session.diffBranches(id);
-      if (!d) {
-        ctx.send({ type: "error", message: `Branch "${id}" not found.` });
-      }
-      const preview = (m) => {
-        const text = typeof m.content === "string" ? m.content : "[complex content]";
-        return text.replace(/\s+/g, " ").trim().slice(0, 70);
-      };
-      const lines = [
-        `\u{1F500} diff  ${id} (source) \u2194 ${session.activeBranchId} (active)`,
-        `Common prefix: ${d.commonPrefix} message(s)`
-      ];
-      if (d.sourceOnly.length === 0 && d.targetOnly.length === 0) {
-        lines.push("Branches are identical.");
-      } else {
-        if (d.sourceOnly.length > 0) {
-          lines.push("", `Only in ${id} (${d.sourceOnly.length}):`);
-          d.sourceOnly.forEach(
-            (m, i) => lines.push(`  [${d.commonPrefix + i}] ${m.role}: ${preview(m)}`)
-          );
-        }
-        if (d.targetOnly.length > 0) {
-          lines.push("", `Only in ${session.activeBranchId} (active) (${d.targetOnly.length}):`);
-          d.targetOnly.forEach(
-            (m, i) => lines.push(`  [${d.commonPrefix + i}] ${m.role}: ${preview(m)}`)
-          );
-        }
-        lines.push("", `Use /branch cherry-pick ${id} <index> to copy a message into the active branch.`);
-      }
-      ctx.send({ type: "info", message: lines.join("\n") });
+    return;
+  }
+  if (sub === "switch") {
+    const ref = args[1];
+    if (!ref) {
+      ctx.send({ type: "error", message: "Usage: /branch switch <id|title>" });
+      return;
     }
-    if (sub === "cherry-pick") {
-      const ref = args[1];
-      const idxStr = args[2];
-      if (!ref || !idxStr) {
-        ctx.send({ type: "error", message: "Usage: /branch cherry-pick <source-id|title> <msg-index>" });
-      }
-      const id = resolve6(ref);
-      if (!id) {
-      }
-      const idx = parseInt(idxStr, 10);
-      if (Number.isNaN(idx)) {
-        ctx.send({ type: "error", message: `Invalid message index: "${idxStr}"` });
-      }
-      const picked = session.cherryPickMessage(id, idx);
-      if (!picked) {
-        ctx.send({ type: "error", message: `Cherry-pick failed \u2014 index ${idx} out of range for branch "${id}".` });
-      }
+    const id = resolve5(ref);
+    if (!id) return;
+    const ok = session.switchBranch(id);
+    if (ok) {
       await ctx.sessions.save();
-      const preview = typeof picked.content === "string" ? picked.content.replace(/\s+/g, " ").trim().slice(0, 60) : "[complex content]";
-      ctx.send({ type: "info", message: `\u2713 Cherry-picked ${picked.role} message from "${id}"[${idx}] \u2192 active branch (${session.messages.length} msgs): ${preview}` });
+      const b = session.getActiveBranch();
+      ctx.send({ type: "info", message: `\u2713 Switched to branch "${b.id}" \u2014 ${b.title} (${session.messages.length} messages)` });
       ctx.sendSessionMessages();
       ctx.sendStatus();
+    } else {
+      ctx.send({ type: "error", message: `Cannot switch to "${id}" (already active).` });
+    }
+    return;
+  }
+  if (sub === "delete") {
+    const ref = args[1];
+    if (!ref) {
+      ctx.send({ type: "error", message: "Usage: /branch delete <id|title>" });
+      return;
+    }
+    const id = resolve5(ref);
+    if (!id) return;
+    const ok = session.deleteBranch(id);
+    if (ok) {
+      await ctx.sessions.save();
+      ctx.send({ type: "info", message: `\u2713 Deleted branch "${id}"` });
+      ctx.sendStatus();
+    } else {
+      ctx.send({ type: "error", message: `Cannot delete "${id}" (active, or last remaining branch).` });
+    }
+    return;
+  }
+  if (sub === "rename") {
+    const ref = args[1];
+    const title = args.slice(2).join(" ").trim();
+    if (!ref || !title) {
+      ctx.send({ type: "error", message: "Usage: /branch rename <id|title> <new title>" });
+      return;
+    }
+    const id = resolve5(ref);
+    if (!id) return;
+    const ok = session.renameBranch(id, title);
+    if (ok) {
+      await ctx.sessions.save();
+      ctx.send({ type: "info", message: `\u2713 Renamed branch "${id}" \u2192 "${title}"` });
+      ctx.sendStatus();
+    } else {
+      ctx.send({ type: "error", message: `Branch "${id}" not found.` });
+    }
+    return;
+  }
+  if (sub === "diff") {
+    const ref = args[1];
+    if (!ref) {
+      ctx.send({ type: "error", message: "Usage: /branch diff <id|title>" });
+      return;
+    }
+    const id = resolve5(ref);
+    if (!id) return;
+    const d = session.diffBranches(id);
+    if (!d) {
+      ctx.send({ type: "error", message: `Branch "${id}" not found.` });
+      return;
+    }
+    const preview = (m) => {
+      const text = typeof m.content === "string" ? m.content : "[complex content]";
+      return text.replace(/\s+/g, " ").trim().slice(0, 70);
+    };
+    const lines = [
+      `\u{1F500} diff  ${id} (source) \u2194 ${session.activeBranchId} (active)`,
+      `Common prefix: ${d.commonPrefix} message(s)`
+    ];
+    if (d.sourceOnly.length === 0 && d.targetOnly.length === 0) {
+      lines.push("Branches are identical.");
+    } else {
+      if (d.sourceOnly.length > 0) {
+        lines.push("", `Only in ${id} (${d.sourceOnly.length}):`);
+        d.sourceOnly.forEach(
+          (m, i) => lines.push(`  [${d.commonPrefix + i}] ${m.role}: ${preview(m)}`)
+        );
+      }
+      if (d.targetOnly.length > 0) {
+        lines.push("", `Only in ${session.activeBranchId} (active) (${d.targetOnly.length}):`);
+        d.targetOnly.forEach(
+          (m, i) => lines.push(`  [${d.commonPrefix + i}] ${m.role}: ${preview(m)}`)
+        );
+      }
+      lines.push("", `Use /branch cherry-pick ${id} <index> to copy a message into the active branch.`);
+    }
+    ctx.send({ type: "info", message: lines.join("\n") });
+    return;
+  }
+  if (sub === "cherry-pick") {
+    const ref = args[1];
+    const idxStr = args[2];
+    if (!ref || !idxStr) {
+      ctx.send({ type: "error", message: "Usage: /branch cherry-pick <source-id|title> <msg-index>" });
+      return;
     }
-    ctx.send({ type: "error", message: `Unknown subcommand: ${sub}. Use list/new/switch/delete/rename/diff/cherry-pick.` });
+    const id = resolve5(ref);
+    if (!id) return;
+    const idx = parseInt(idxStr, 10);
+    if (Number.isNaN(idx)) {
+      ctx.send({ type: "error", message: `Invalid message index: "${idxStr}"` });
+      return;
+    }
+    const picked = session.cherryPickMessage(id, idx);
+    if (!picked) {
+      ctx.send({ type: "error", message: `Cherry-pick failed \u2014 index ${idx} out of range for branch "${id}".` });
+      return;
+    }
+    await ctx.sessions.save();
+    const pickPreview = typeof picked.content === "string" ? picked.content.replace(/\s+/g, " ").trim().slice(0, 60) : "[complex content]";
+    ctx.send({ type: "info", message: `\u2713 Cherry-picked ${picked.role} message from "${id}"[${idx}] \u2192 active branch (${session.messages.length} msgs): ${pickPreview}` });
+    ctx.sendSessionMessages();
+    ctx.sendStatus();
+    return;
   }
+  ctx.send({ type: "error", message: `Unknown subcommand: ${sub}. Use list/new/switch/delete/rename/diff/cherry-pick.` });
 }
 async function handleFork(args, ctx) {
-  {
-    const session = ctx.sessions.current;
-    if (!session) {
-      ctx.send({ type: "info", message: "No active session to fork." });
-    }
-    const sub = args.join(" ").trim();
-    let messageCount = session.messages.length;
-    let fromLabel = "current position";
-    if (sub) {
-      const cp = session.checkpoints.find((c) => c.name === sub);
-      if (!cp) {
-        const available = session.checkpoints.map((c) => c.name);
-        ctx.send({ type: "error", message: available.length > 0 ? `Checkpoint "${sub}" not found. Available: ${available.join(", ")}` : `Checkpoint "${sub}" not found. No checkpoints saved.` });
-      }
-      messageCount = cp.messageIndex;
-      fromLabel = `checkpoint "${cp.name}" (${cp.messageIndex} messages)`;
+  const session = ctx.sessions.current;
+  if (!session) {
+    ctx.send({ type: "info", message: "No active session to fork." });
+    return;
+  }
+  const sub = args.join(" ").trim();
+  let messageCount = session.messages.length;
+  let fromLabel = "current position";
+  if (sub) {
+    const cp = session.checkpoints.find((c) => c.name === sub);
+    if (!cp) {
+      const available = session.checkpoints.map((c) => c.name);
+      ctx.send({ type: "error", message: available.length > 0 ? `Checkpoint "${sub}" not found. Available: ${available.join(", ")}` : `Checkpoint "${sub}" not found. No checkpoints saved.` });
+      return;
     }
-    try {
-      const originalId = session.id.slice(0, 8);
-      const forked = await ctx.sessions.forkSession(messageCount);
-      ctx.send({ type: "info", message: `\u{1F500} Session Forked
+    messageCount = cp.messageIndex;
+    fromLabel = `checkpoint "${cp.name}" (${cp.messageIndex} messages)`;
+  }
+  try {
+    const originalId = session.id.slice(0, 8);
+    const forked = await ctx.sessions.forkSession(messageCount);
+    ctx.send({ type: "info", message: `\u{1F500} Session Forked
   Original: ${originalId}
   Forked:   ${forked.id.slice(0, 8)} "${forked.title ?? "(untitled)"}"
   From:     ${fromLabel}
   Messages: ${forked.messages.length} copied` });
-      ctx.sendSessionMessages();
-      ctx.sendStatus();
-      ctx.sendSessionList();
-    } catch (err) {
-      ctx.send({ type: "error", message: `Fork failed: ${err.message}` });
-    }
+    ctx.sendSessionMessages();
+    ctx.sendStatus();
+    ctx.sendSessionList();
+  } catch (err) {
+    ctx.send({ type: "error", message: `Fork failed: ${err.message}` });
   }
 }
 async function handleRewind(args, ctx) {
-  {
-    const session = ctx.sessions.current;
-    if (!session || session.messages.length === 0) {
-      ctx.send({ type: "info", message: "No messages to rewind." });
-    }
-    const rewindSub = args[0];
-    if (rewindSub === "list" || !rewindSub) {
-      const lines = [`Conversation messages (${session.messages.length} total):
+  const session = ctx.sessions.current;
+  if (!session || session.messages.length === 0) {
+    ctx.send({ type: "info", message: "No messages to rewind." });
+    return;
+  }
+  const rewindSub = args[0];
+  if (rewindSub === "list" || !rewindSub) {
+    const lines = [`Conversation messages (${session.messages.length} total):
 `];
-      const cpIndices = (await import("./file-checkpoint-NKBHGC7L.js")).fileCheckpoints.getMessageIndices();
-      for (let i = 0; i < session.messages.length; i++) {
-        const m = session.messages[i];
-        const text = getContentText(m.content).replace(/\n/g, " ").slice(0, 60);
-        const pin = cpIndices.includes(i) ? " \u{1F4CC}" : "";
-        lines.push(`  [${i + 1}] ${m.role.padEnd(10)} ${text}${pin}`);
-      }
-      lines.push("", "Usage: /rewind <n> \u2014 rewind to message N", "\u{1F4CC} = file checkpoint");
-      ctx.send({ type: "info", message: lines.join("\n") });
-    }
-    const rewindN = parseInt(rewindSub, 10);
-    if (isNaN(rewindN) || rewindN < 1 || rewindN > session.messages.length) {
-      ctx.send({ type: "error", message: `Invalid message number: ${rewindSub}. Range: 1-${session.messages.length}` });
-    }
-    const { fileCheckpoints: fc } = await import("./file-checkpoint-NKBHGC7L.js");
-    const rewindRemoved = session.messages.length - rewindN;
-    const rewindResult = fc.restoreToMessageIndex(rewindN);
-    session.messages = session.messages.slice(0, rewindN);
-    session.checkpoints = session.checkpoints.filter((c) => c.messageIndex <= rewindN);
-    session.updated = /* @__PURE__ */ new Date();
-    ctx.sessions.save();
-    const rewindLines = [`\u2713 Rewound to message ${rewindN}`, `  Messages removed: ${rewindRemoved}`];
-    if (rewindResult.restored > 0 || rewindResult.deleted > 0) {
-      rewindLines.push(`  Files restored: ${rewindResult.restored}, deleted: ${rewindResult.deleted}`);
-      for (const f of rewindResult.files) rewindLines.push(`    ${f}`);
-    } else {
-      rewindLines.push("  No file changes to revert.");
-    }
-    ctx.send({ type: "info", message: rewindLines.join("\n") });
-    ctx.sendSessionMessages();
-    ctx.sendStatus();
+    const cpIndices = (await import("./file-checkpoint-NKBHGC7L.js")).fileCheckpoints.getMessageIndices();
+    for (let i = 0; i < session.messages.length; i++) {
+      const m = session.messages[i];
+      const text = getContentText(m.content).replace(/\n/g, " ").slice(0, 60);
+      const pin = cpIndices.includes(i) ? " \u{1F4CC}" : "";
+      lines.push(`  [${i + 1}] ${m.role.padEnd(10)} ${text}${pin}`);
+    }
+    lines.push("", "Usage: /rewind <n> \u2014 rewind to message N", "\u{1F4CC} = file checkpoint");
+    ctx.send({ type: "info", message: lines.join("\n") });
+    return;
   }
+  const rewindN = parseInt(rewindSub, 10);
+  if (isNaN(rewindN) || rewindN < 1 || rewindN > session.messages.length) {
+    ctx.send({ type: "error", message: `Invalid message number: ${rewindSub}. Range: 1-${session.messages.length}` });
+    return;
+  }
+  const { fileCheckpoints: fc } = await import("./file-checkpoint-NKBHGC7L.js");
+  const rewindRemoved = session.messages.length - rewindN;
+  const rewindResult = fc.restoreToMessageIndex(rewindN);
+  session.messages = session.messages.slice(0, rewindN);
+  session.checkpoints = session.checkpoints.filter((c) => c.messageIndex <= rewindN);
+  session.updated = /* @__PURE__ */ new Date();
+  ctx.sessions.save();
+  const rewindLines = [`\u2713 Rewound to message ${rewindN}`, `  Messages removed: ${rewindRemoved}`];
+  if (rewindResult.restored > 0 || rewindResult.deleted > 0) {
+    rewindLines.push(`  Files restored: ${rewindResult.restored}, deleted: ${rewindResult.deleted}`);
+    for (const f of rewindResult.files) rewindLines.push(`    ${f}`);
+  } else {
+    rewindLines.push("  No file changes to revert.");
+  }
+  ctx.send({ type: "info", message: rewindLines.join("\n") });
+  ctx.sendSessionMessages();
+  ctx.sendStatus();
 }
 
 // src/web/commands/tooling-commands.ts
-import { existsSync as existsSync2, readdirSync } from "fs";
-import { join } from "path";
-async function handleTools(args, ctx) {
+async function handleTools(_args, ctx) {
   ctx.sendToolsList();
 }
-async function handlePlugins(args, ctx) {
-  {
-    const configDir = ctx.config.getConfigDir();
-    const pluginsDir = join(configDir, PLUGINS_DIR_NAME);
-    const pluginTools = ctx.toolRegistry.listPluginTools();
-    const pluginPackages = listInstalledPlugins(configDir);
-    const lines = [`\u{1F50C} **Plugins:**`, `Dir: ${pluginsDir}`, ""];
-    if (pluginTools.length === 0 && pluginPackages.length === 0) {
-      lines.push("No plugins loaded.");
-      lines.push("Use /plugin install <path>, /plugin trust <name>, then /plugin enable <name>.");
-    } else {
-      if (pluginPackages.length > 0) {
-        lines.push(`Package plugins (${pluginPackages.length}):`);
-        for (const p of pluginPackages) lines.push(`  \u2022 ${p.name}@${p.manifest.version} \u2014 ${p.enabled ? "enabled" : "disabled"} / ${p.trusted ? "trusted" : "untrusted"}`);
-        lines.push("");
-      }
-      if (pluginTools.length > 0) {
-        lines.push(`Legacy JS plugin tools (${pluginTools.length}):`);
-        for (const t of pluginTools) lines.push(`  \u2022 ${t.definition.name} \u2014 ${t.definition.description}`);
-      }
+async function handlePlugins(_args, ctx) {
+  const configDir = ctx.config.getConfigDir();
+  const pluginsDir = join(configDir, PLUGINS_DIR_NAME);
+  const pluginTools = ctx.toolRegistry.listPluginTools();
+  const pluginPackages = listInstalledPlugins(configDir);
+  const lines = [`\u{1F50C} **Plugins:**`, `Dir: ${pluginsDir}`, ""];
+  if (pluginTools.length === 0 && pluginPackages.length === 0) {
+    lines.push("No plugins loaded.");
+    lines.push("Use /plugin install <path>, /plugin trust <name>, then /plugin enable <name>.");
+  } else {
+    if (pluginPackages.length > 0) {
+      lines.push(`Package plugins (${pluginPackages.length}):`);
+      for (const p of pluginPackages) lines.push(`  \u2022 ${p.name}@${p.manifest.version} \u2014 ${p.enabled ? "enabled" : "disabled"} / ${p.trusted ? "trusted" : "untrusted"}`);
+      lines.push("");
+    }
+    if (pluginTools.length > 0) {
+      lines.push(`Legacy JS plugin tools (${pluginTools.length}):`);
+      for (const t of pluginTools) lines.push(`  \u2022 ${t.definition.name} \u2014 ${t.definition.description}`);
     }
-    ctx.send({ type: "info", message: lines.join("\n") });
   }
+  ctx.send({ type: "info", message: lines.join("\n") });
 }
 async function handlePlugin(args, ctx) {
-  {
-    const configDir = ctx.config.getConfigDir();
-    const sub = args[0] ?? "list";
-    try {
-      if (sub === "list") {
-        const plugins = listInstalledPlugins(configDir);
-        const lines = [`\u{1F50C} **Package Plugins**`, `Dir: ${pluginRoot(configDir)}`, ""];
-        if (plugins.length === 0) lines.push("No package plugins installed.");
-        for (const p of plugins) lines.push(`  \u2022 ${p.name}@${p.manifest.version} \u2014 ${p.enabled ? "enabled" : "disabled"} / ${p.trusted ? "trusted" : "untrusted"}`);
-        ctx.send({ type: "info", message: lines.join("\n") });
-      }
-      if (sub === "install") {
-        const input = args[1];
-        if (!input) throw new Error("Usage: /plugin install <path>");
-        const plugin = installPlugin(configDir, input);
-        ctx.send({ type: "info", message: `Installed plugin ${plugin.name}@${plugin.manifest.version}. Run /plugin trust ${plugin.name}, then /plugin enable ${plugin.name}.` });
-      }
-      if (sub === "trust") {
-        const name = args[1];
-        if (!name) throw new Error("Usage: /plugin trust <name>");
-        const state = trustPlugin(configDir, name);
-        ctx.send({ type: "info", message: `Trusted plugin ${state.name}.` });
-      }
-      if (sub === "enable" || sub === "disable") {
-        const name = args[1];
-        if (!name) throw new Error(`Usage: /plugin ${sub} <name>`);
-        const state = setPluginEnabled(configDir, name, sub === "enable");
-        ctx.send({ type: "info", message: `${sub === "enable" ? "Enabled" : "Disabled"} plugin ${state.name}. Restart Web UI for changes to take effect.` });
-      }
-      if (sub === "inspect") {
-        const name = args[1];
-        if (!name) throw new Error("Usage: /plugin inspect <name>");
-        ctx.send({ type: "info", message: describePlugin(getInstalledPlugin(configDir, name)).join("\n") });
-      }
-      throw new Error("Usage: /plugin [list|install|enable|disable|inspect|trust]");
-    } catch (err) {
-      ctx.send({ type: "error", message: err instanceof Error ? err.message : String(err) });
+  const configDir = ctx.config.getConfigDir();
+  const sub = args[0] ?? "list";
+  try {
+    if (sub === "list") {
+      const plugins = listInstalledPlugins(configDir);
+      const lines = [`\u{1F50C} **Package Plugins**`, `Dir: ${pluginRoot(configDir)}`, ""];
+      if (plugins.length === 0) lines.push("No package plugins installed.");
+      for (const p of plugins) lines.push(`  \u2022 ${p.name}@${p.manifest.version} \u2014 ${p.enabled ? "enabled" : "disabled"} / ${p.trusted ? "trusted" : "untrusted"}`);
+      ctx.send({ type: "info", message: lines.join("\n") });
+      return;
     }
-  }
-}
-async function handleMcp(args, ctx) {
-  {
-    if (!ctx.mcpManager) {
-      ctx.send({ type: "info", message: "MCP not configured. Add mcpServers to config.json." });
-    }
-    const sub = args[0];
-    if (sub === "reconnect") {
-      ctx.send({ type: "info", message: "\u{1F504} Reconnecting MCP servers..." });
-      try {
-        await ctx.mcpManager.reconnectAll();
-        ctx.send({ type: "info", message: "\u2713 MCP reconnect complete." });
-      } catch (err) {
-        ctx.send({ type: "error", message: `Reconnect failed: ${err.message}` });
-      }
-      ctx.sendToolsList();
+    if (sub === "install") {
+      const input = args[1];
+      if (!input) throw new Error("Usage: /plugin install <path>");
+      const plugin = installPlugin(configDir, input);
+      ctx.send({ type: "info", message: `Installed plugin ${plugin.name}@${plugin.manifest.version}. Run /plugin trust ${plugin.name}, then /plugin enable ${plugin.name}.` });
+      return;
+    }
+    if (sub === "trust") {
+      const name = args[1];
+      if (!name) throw new Error("Usage: /plugin trust <name>");
+      const state = trustPlugin(configDir, name);
+      ctx.send({ type: "info", message: `Trusted plugin ${state.name}.` });
+      return;
     }
-    const statuses = ctx.mcpManager.getStatus();
-    if (statuses.length === 0) {
-      ctx.send({ type: "info", message: "No MCP servers configured." });
+    if (sub === "enable" || sub === "disable") {
+      const name = args[1];
+      if (!name) throw new Error(`Usage: /plugin ${sub} <name>`);
+      const state = setPluginEnabled(configDir, name, sub === "enable");
+      ctx.send({ type: "info", message: `${sub === "enable" ? "Enabled" : "Disabled"} plugin ${state.name}. Restart Web UI for changes to take effect.` });
+      return;
     }
-    const lines = [`\u{1F50C} **MCP Servers (${statuses.length}):**`, ""];
-    for (const s of statuses) {
-      const state = s.connected ? `\u2713 connected \xB7 ${s.serverName} \xB7 ${s.toolCount} tools` : `\u2717 disconnected${s.error ? ` \xB7 ${s.error}` : ""}`;
-      lines.push(`  ${s.serverId}: ${state}`);
+    if (sub === "inspect") {
+      const name = args[1];
+      if (!name) throw new Error("Usage: /plugin inspect <name>");
+      ctx.send({ type: "info", message: describePlugin(getInstalledPlugin(configDir, name)).join("\n") });
+      return;
     }
-    lines.push("");
-    lines.push("Use /mcp reconnect to reconnect.");
-    ctx.send({ type: "info", message: lines.join("\n") });
+    throw new Error("Usage: /plugin [list|install|enable|disable|inspect|trust]");
+  } catch (err) {
+    ctx.send({ type: "error", message: err instanceof Error ? err.message : String(err) });
   }
 }
-async function handleSkill(args, ctx) {
-  {
-    const sub = args[0];
-    if (!ctx.skillManager) {
-      ctx.send({ type: "error", message: "Skill system not available." });
-    }
-    if (!sub || sub === "list") {
-      const skills = ctx.skillManager.listSkills();
-      const active = ctx.skillManager.getActive();
-      if (skills.length === 0) {
-        ctx.send({ type: "info", message: "No skills available. Add .md files to ~/.aicli/skills/" });
-      } else {
-        const lines = skills.map((s) => {
-          const isActive = active?.meta.name === s.meta.name;
-          const marker = isActive ? " \u2705 (active)" : "";
-          return `  ${s.meta.name}${marker} \u2014 ${s.meta.description || "(no description)"}`;
-        });
-        ctx.send({ type: "info", message: `\u{1F4DA} Skills:
-${lines.join("\n")}` });
-      }
-    } else if (sub === "off") {
-      ctx.skillManager.deactivate();
-      ctx.send({ type: "info", message: "\u{1F50C} Skill deactivated." });
-      ctx.sendToolsList();
-      ctx.sendStatus();
-    } else if (sub === "reload") {
-      ctx.skillManager.loadSkills(getActivePluginAssets(ctx.config.getConfigDir()).skillDirs);
-      ctx.send({ type: "info", message: `\u{1F504} Reloaded ${ctx.skillManager.listSkills().length} skill(s).` });
-      ctx.sendToolsList();
+async function handleMcp(_args, ctx) {
+  if (!ctx.mcpManager) {
+    ctx.send({ type: "info", message: "MCP not configured. Add mcpServers to config.json." });
+    return;
+  }
+  const sub = _args[0];
+  if (sub === "reconnect") {
+    ctx.send({ type: "info", message: "\u{1F504} Reconnecting MCP servers..." });
+    try {
+      await ctx.mcpManager.reconnectAll();
+      ctx.send({ type: "info", message: "\u2713 MCP reconnect complete." });
+    } catch (err) {
+      ctx.send({ type: "error", message: `Reconnect failed: ${err.message}` });
+    }
+    ctx.sendToolsList();
+    return;
+  }
+  const statuses = ctx.mcpManager.getStatus();
+  if (statuses.length === 0) {
+    ctx.send({ type: "info", message: "No MCP servers configured." });
+    return;
+  }
+  const lines = [`\u{1F50C} **MCP Servers (${statuses.length}):**`, ""];
+  for (const s of statuses) {
+    const state = s.connected ? `\u2713 connected \xB7 ${s.serverName} \xB7 ${s.toolCount} tools` : `\u2717 disconnected${s.error ? ` \xB7 ${s.error}` : ""}`;
+    lines.push(`  ${s.serverId}: ${state}`);
+  }
+  lines.push("");
+  lines.push("Use /mcp reconnect to reconnect.");
+  ctx.send({ type: "info", message: lines.join("\n") });
+}
+async function handleSkill(args, ctx) {
+  const sub = args[0];
+  if (!ctx.skillManager) {
+    ctx.send({ type: "error", message: "Skill system not available." });
+    return;
+  }
+  if (!sub || sub === "list") {
+    const skills = ctx.skillManager.listSkills();
+    const active = ctx.skillManager.getActive();
+    if (skills.length === 0) {
+      ctx.send({ type: "info", message: "No skills available. Add .md files to ~/.aicli/skills/" });
     } else {
-      const activated = ctx.skillManager.activate(sub);
-      if (activated) {
-        ctx.send({ type: "info", message: `\u2705 Skill activated: ${activated.meta.name}
-${activated.meta.description || ""}` });
-        ctx.sendToolsList();
-        ctx.sendStatus();
-      } else {
-        const available = ctx.skillManager.listSkills().map((s) => s.meta.name).join(", ");
-        ctx.send({ type: "error", message: `Skill "${sub}" not found. Available: ${available}` });
-      }
+      const lines = skills.map((s) => {
+        const isActive = active?.meta.name === s.meta.name;
+        const marker = isActive ? " \u2705 (active)" : "";
+        return `  ${s.meta.name}${marker} \u2014 ${s.meta.description || "(no description)"}`;
+      });
+      ctx.send({ type: "info", message: `\u{1F4DA} Skills:
+${lines.join("\n")}` });
     }
+    return;
+  }
+  if (sub === "off") {
+    ctx.skillManager.deactivate();
+    ctx.send({ type: "info", message: "\u{1F50C} Skill deactivated." });
+    ctx.sendToolsList();
+    ctx.sendStatus();
+    return;
+  }
+  if (sub === "reload") {
+    ctx.skillManager.loadSkills(getActivePluginAssets(ctx.config.getConfigDir()).skillDirs);
+    ctx.send({ type: "info", message: `\u{1F504} Reloaded ${ctx.skillManager.listSkills().length} skill(s).` });
+    ctx.sendToolsList();
+    return;
+  }
+  const activated = ctx.skillManager.activate(sub);
+  if (activated) {
+    ctx.send({ type: "info", message: `\u2705 Skill activated: ${activated.meta.name}
+${activated.meta.description || ""}` });
+    ctx.sendToolsList();
+    ctx.sendStatus();
+  } else {
+    const available = ctx.skillManager.listSkills().map((s) => s.meta.name).join(", ");
+    ctx.send({ type: "error", message: `Skill "${sub}" not found. Available: ${available}` });
   }
 }
-async function handleCommands(args, ctx) {
-  {
-    const configDir = ctx.config.getConfigDir();
-    const commandsDir = join(configDir, CUSTOM_COMMANDS_DIR_NAME);
-    if (!existsSync2(commandsDir)) {
-      ctx.send({ type: "info", message: `No custom commands directory.
+async function handleCommands(_args, ctx) {
+  const configDir = ctx.config.getConfigDir();
+  const commandsDir = join(configDir, CUSTOM_COMMANDS_DIR_NAME);
+  if (!existsSync2(commandsDir)) {
+    ctx.send({ type: "info", message: `No custom commands directory.
 Create: ${commandsDir}/ with .md files.` });
-    }
-    try {
-      const files = readdirSync(commandsDir).filter((f) => f.endsWith(".md"));
-      if (files.length === 0) {
-        ctx.send({ type: "info", message: `No custom commands found in ${commandsDir}
+    return;
+  }
+  try {
+    const files = readdirSync(commandsDir).filter((f) => f.endsWith(".md"));
+    if (files.length === 0) {
+      ctx.send({ type: "info", message: `No custom commands found in ${commandsDir}
 Add .md files to create commands.` });
-      } else {
-        const lines = [`\u{1F4CB} **Custom Commands (${files.length}):**`, `Dir: ${commandsDir}`, ""];
-        for (const f of files) {
-          const name = f.replace(/\.md$/, "");
-          lines.push(`  /${name}`);
-        }
-        ctx.send({ type: "info", message: lines.join("\n") });
+    } else {
+      const lines = [`\u{1F4CB} **Custom Commands (${files.length}):**`, `Dir: ${commandsDir}`, ""];
+      for (const f of files) {
+        const name = f.replace(/\.md$/, "");
+        lines.push(`  /${name}`);
       }
-    } catch {
-      ctx.send({ type: "info", message: `Cannot read: ${commandsDir}` });
+      ctx.send({ type: "info", message: lines.join("\n") });
     }
+  } catch {
+    ctx.send({ type: "info", message: `Cannot read: ${commandsDir}` });
   }
 }
 
 // src/web/commands/review-commands.ts
-import { existsSync as existsSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
-import { join as join2 } from "path";
 async function handleReview(args, ctx) {
-  {
-    const gitCtx = getGitContext();
-    if (!gitCtx) {
-      ctx.send({ type: "error", message: "Not a git repository." });
-    }
-    const staged = args.includes("--staged");
-    const detailed = args.includes("--detailed");
-    let diff;
-    try {
-      diff = readGitDiff({ staged });
-    } catch {
-      ctx.send({ type: "error", message: "Failed to run git diff." });
-    }
-    if (!diff) {
-      ctx.send({ type: "info", message: "No changes to review." + (staged ? "" : " Try --staged for staged changes.") });
-    }
-    const MAX_DIFF = 8e3;
-    let truncated = false;
-    if (diff.length > MAX_DIFF) {
-      const head = diff.slice(0, Math.floor(MAX_DIFF * 0.7));
-      const tail = diff.slice(diff.length - Math.floor(MAX_DIFF * 0.2));
-      diff = head + "\n\n... [diff truncated, " + diff.length + " chars total] ...\n\n" + tail;
-      truncated = true;
-    }
-    const reviewPrompt = buildReviewPrompt(diff, formatGitContextForPrompt(gitCtx), detailed);
-    ctx.send({ type: "info", message: "\u{1F50D} Analyzing changes..." });
-    try {
-      const review = await ctx.chatOnce(reviewPrompt, { temperature: 0.3, maxTokens: 8192 });
-      const msg = truncated ? review + "\n\n\u26A0 Diff was truncated. Consider reviewing smaller changesets." : review;
-      ctx.send({ type: "info", message: msg });
-    } catch (err) {
-      ctx.send({ type: "error", message: `Review failed: ${err.message}` });
-    }
+  const gitCtx = getGitContext();
+  if (!gitCtx) {
+    ctx.send({ type: "error", message: "Not a git repository." });
+    return;
+  }
+  const staged = args.includes("--staged");
+  const detailed = args.includes("--detailed");
+  let diff;
+  try {
+    diff = readGitDiff({ staged });
+  } catch {
+    ctx.send({ type: "error", message: "Failed to run git diff." });
+    return;
+  }
+  if (!diff) {
+    ctx.send({ type: "info", message: "No changes to review." + (staged ? "" : " Try --staged for staged changes.") });
+    return;
+  }
+  const MAX_DIFF = 8e3;
+  let truncated = false;
+  if (diff.length > MAX_DIFF) {
+    const head = diff.slice(0, Math.floor(MAX_DIFF * 0.7));
+    const tail = diff.slice(diff.length - Math.floor(MAX_DIFF * 0.2));
+    diff = head + "\n\n... [diff truncated, " + diff.length + " chars total] ...\n\n" + tail;
+    truncated = true;
+  }
+  const reviewPrompt = buildReviewPrompt(diff, formatGitContextForPrompt(gitCtx), detailed);
+  ctx.send({ type: "info", message: "\u{1F50D} Analyzing changes..." });
+  try {
+    const review = await ctx.chatOnce(reviewPrompt, { temperature: 0.3, maxTokens: 8192 });
+    const msg = truncated ? review + "\n\n\u26A0 Diff was truncated. Consider reviewing smaller changesets." : review;
+    ctx.send({ type: "info", message: msg });
+  } catch (err) {
+    ctx.send({ type: "error", message: `Review failed: ${err.message}` });
   }
 }
 async function handleSecurityReview(args, ctx) {
-  {
-    const gitCtx = getGitContext();
-    if (!gitCtx) {
-      ctx.send({ type: "error", message: "Not a git repository." });
-    }
-    const secStaged = args.includes("--staged");
-    let secDiff;
-    try {
-      secDiff = readGitDiff({ staged: secStaged });
-    } catch {
-      ctx.send({ type: "error", message: "Failed to run git diff." });
-    }
-    if (!secDiff) {
-      ctx.send({ type: "info", message: "No changes to review." + (secStaged ? "" : " Try --staged for staged changes.") });
-    }
-    const SEC_MAX_DIFF = 8e3;
-    let secTruncated = false;
-    if (secDiff.length > SEC_MAX_DIFF) {
-      const head = secDiff.slice(0, Math.floor(SEC_MAX_DIFF * 0.7));
-      const tail = secDiff.slice(secDiff.length - Math.floor(SEC_MAX_DIFF * 0.2));
-      secDiff = head + "\n\n... [diff truncated, " + secDiff.length + " chars total] ...\n\n" + tail;
-      secTruncated = true;
-    }
-    const secPrompt = buildSecurityReviewPrompt(secDiff, formatGitContextForPrompt(gitCtx));
-    ctx.send({ type: "info", message: "\u{1F512} Scanning for security vulnerabilities..." });
-    try {
-      const secReview = await ctx.chatOnce(secPrompt, { temperature: 0.2, maxTokens: 8192 });
-      const secMsg = secTruncated ? secReview + "\n\n\u26A0 Diff was truncated. Consider reviewing smaller changesets." : secReview;
-      ctx.send({ type: "info", message: secMsg });
-    } catch (err) {
-      ctx.send({ type: "error", message: `Security review failed: ${err.message}` });
-    }
+  const gitCtx = getGitContext();
+  if (!gitCtx) {
+    ctx.send({ type: "error", message: "Not a git repository." });
+    return;
+  }
+  const secStaged = args.includes("--staged");
+  let secDiff;
+  try {
+    secDiff = readGitDiff({ staged: secStaged });
+  } catch {
+    ctx.send({ type: "error", message: "Failed to run git diff." });
+    return;
+  }
+  if (!secDiff) {
+    ctx.send({ type: "info", message: "No changes to review." + (secStaged ? "" : " Try --staged for staged changes.") });
+    return;
+  }
+  const SEC_MAX_DIFF = 8e3;
+  let secTruncated = false;
+  if (secDiff.length > SEC_MAX_DIFF) {
+    const head = secDiff.slice(0, Math.floor(SEC_MAX_DIFF * 0.7));
+    const tail = secDiff.slice(secDiff.length - Math.floor(SEC_MAX_DIFF * 0.2));
+    secDiff = head + "\n\n... [diff truncated, " + secDiff.length + " chars total] ...\n\n" + tail;
+    secTruncated = true;
+  }
+  const secPrompt = buildSecurityReviewPrompt(secDiff, formatGitContextForPrompt(gitCtx));
+  ctx.send({ type: "info", message: "\u{1F512} Scanning for security vulnerabilities..." });
+  try {
+    const secReview = await ctx.chatOnce(secPrompt, { temperature: 0.2, maxTokens: 8192 });
+    const secMsg = secTruncated ? secReview + "\n\n\u26A0 Diff was truncated. Consider reviewing smaller changesets." : secReview;
+    ctx.send({ type: "info", message: secMsg });
+  } catch (err) {
+    ctx.send({ type: "error", message: `Security review failed: ${err.message}` });
   }
 }
 async function handleTest(args, ctx) {
-  {
-    ctx.send({ type: "info", message: "\u{1F9EA} Running tests..." });
-    try {
-      const { executeTests } = await import("./run-tests-5NEMM6EF.js");
-      const argStr = args.join(" ").trim();
-      let testArgs = {};
-      if (argStr) {
-        const isCommand = argStr.includes(" ") || /^(mvn|gradle|npm|pytest|cargo|go)\b/.test(argStr);
-        testArgs = isCommand ? { command: argStr } : { filter: argStr };
-      }
-      const report = await executeTests(testArgs);
-      ctx.send({ type: "info", message: report });
-    } catch (err) {
-      ctx.send({ type: "error", message: `Test failed: ${err.message}` });
-    }
+  ctx.send({ type: "info", message: "\u{1F9EA} Running tests..." });
+  try {
+    const { executeTests } = await import("./run-tests-AUEKHJCC.js");
+    const argStr = args.join(" ").trim();
+    let testArgs = {};
+    if (argStr) {
+      const isCommand = argStr.includes(" ") || /^(mvn|gradle|npm|pytest|cargo|go)\b/.test(argStr);
+      testArgs = isCommand ? { command: argStr } : { filter: argStr };
+    }
+    const report = await executeTests(testArgs);
+    ctx.send({ type: "info", message: report });
+  } catch (err) {
+    ctx.send({ type: "error", message: `Test failed: ${err.message}` });
   }
 }
 async function handleDiff(args, ctx) {
-  {
-    const history = undoStack.getHistory();
-    if (history.length === 0) {
-      ctx.send({ type: "info", message: "No file modifications in this session." });
+  const history = undoStack.getHistory();
+  if (history.length === 0) {
+    ctx.send({ type: "info", message: "No file modifications in this session." });
+    return;
+  }
+  const fileMap = /* @__PURE__ */ new Map();
+  for (const entry of history) {
+    if (!fileMap.has(entry.filePath)) {
+      fileMap.set(entry.filePath, { earliest: entry.previousContent });
     }
-    const fileMap = /* @__PURE__ */ new Map();
-    for (const entry of history) {
-      if (!fileMap.has(entry.filePath)) {
-        fileMap.set(entry.filePath, { earliest: entry.previousContent });
+  }
+  const statsOnly = args[0]?.toLowerCase() === "--stats";
+  let newFiles = 0;
+  let modifiedFiles = 0;
+  const diffLines = [];
+  for (const [filePath, { earliest }] of fileMap) {
+    const currentContent = existsSync2(filePath) ? (() => {
+      try {
+        return readFileSync2(filePath, "utf-8");
+      } catch {
+        return null;
       }
-    }
-    const statsOnly = args[0]?.toLowerCase() === "--stats";
-    let newFiles = 0;
-    let modifiedFiles = 0;
-    const diffLines = [];
-    for (const [filePath, { earliest }] of fileMap) {
-      const currentContent = existsSync3(filePath) ? (() => {
-        try {
-          return readFileSync3(filePath, "utf-8");
-        } catch {
-          return null;
-        }
-      })() : null;
-      const isNew = earliest === null;
-      if (isNew) newFiles++;
-      else modifiedFiles++;
-      if (statsOnly) continue;
-      if (isNew) {
-        diffLines.push(`
+    })() : null;
+    const isNew = earliest === null;
+    if (isNew) newFiles++;
+    else modifiedFiles++;
+    if (statsOnly) continue;
+    if (isNew) {
+      diffLines.push(`
 \u{1F4C4} [NEW] ${filePath}`);
-        if (currentContent !== null) {
-          diffLines.push(`  ${currentContent.split("\n").length} lines`);
-        } else {
-          diffLines.push("  (file was deleted after creation)");
-        }
+      if (currentContent !== null) {
+        diffLines.push(`  ${currentContent.split("\n").length} lines`);
       } else {
-        diffLines.push(`
+        diffLines.push("  (file was deleted after creation)");
+      }
+    } else {
+      diffLines.push(`
 \u{1F4DD} [MODIFIED] ${filePath}`);
-        const oldText = earliest ?? "";
-        const newText = currentContent ?? "";
-        if (oldText === newText) {
-          diffLines.push("  (no net change)");
-        } else {
-          diffLines.push(renderDiff(oldText, newText, { filePath, maxLines: 80 }));
-        }
+      const oldText = earliest ?? "";
+      const newText = currentContent ?? "";
+      if (oldText === newText) {
+        diffLines.push("  (no net change)");
+      } else {
+        diffLines.push(renderDiff(oldText, newText, { filePath, maxLines: 80 }));
       }
     }
-    diffLines.push(`
-**Summary:** ${fileMap.size} file(s) \u2014 ${newFiles} new, ${modifiedFiles} modified`);
-    ctx.send({ type: "info", message: diffLines.join("\n") });
   }
+  diffLines.push(`
+**Summary:** ${fileMap.size} file(s) \u2014 ${newFiles} new, ${modifiedFiles} modified`);
+  ctx.send({ type: "info", message: diffLines.join("\n") });
 }
 async function handleInit(args, ctx) {
-  {
-    const cwd = process.cwd();
-    const targetPath = join2(cwd, "AICLI.md");
-    const force = args.includes("--force");
-    if (existsSync3(targetPath) && !force) {
-      ctx.send({ type: "info", message: `AICLI.md already exists at ${targetPath}
+  const cwd = process.cwd();
+  const targetPath = join(cwd, "AICLI.md");
+  const force = args.includes("--force");
+  if (existsSync2(targetPath) && !force) {
+    ctx.send({ type: "info", message: `AICLI.md already exists at ${targetPath}
 Use /init --force to overwrite.` });
-    }
-    ctx.send({ type: "info", message: "\u{1F4DD} Scanning project structure..." });
-    try {
-      const projectInfo = scanProject(cwd);
-      const prompt = buildInitPrompt(projectInfo, cwd);
-      const content = await ctx.chatOnce(prompt, { temperature: 0.3, maxTokens: 4096 });
-      writeFileSync2(targetPath, content, "utf-8");
-      ctx.send({ type: "info", message: `\u2713 Generated: ${targetPath} (${content.length} chars)
+    return;
+  }
+  ctx.send({ type: "info", message: "\u{1F4DD} Scanning project structure..." });
+  try {
+    const projectInfo = scanProject(cwd);
+    const prompt = buildInitPrompt(projectInfo, cwd);
+    const content = await ctx.chatOnce(prompt, { temperature: 0.3, maxTokens: 4096 });
+    writeFileSync(targetPath, content, "utf-8");
+    ctx.send({ type: "info", message: `\u2713 Generated: ${targetPath} (${content.length} chars)
 Use /context reload to load it.` });
-    } catch (err) {
-      ctx.send({ type: "error", message: `Failed to generate AICLI.md: ${err.message}` });
-    }
+  } catch (err) {
+    ctx.send({ type: "error", message: `Failed to generate AICLI.md: ${err.message}` });
   }
 }
 async function handleScaffold(args, ctx) {
-  {
-    const description = args.join(" ").trim();
-    if (!description) {
-      ctx.send({ type: "error", message: "Usage: /scaffold <project description>" });
-    }
-    ctx.send({ type: "info", message: "\u{1F3D7}\uFE0F Generating project scaffold..." });
-    const scaffoldPrompt = `Please scaffold a project based on this description: ${description}
+  const description = args.join(" ").trim();
+  if (!description) {
+    ctx.send({ type: "error", message: "Usage: /scaffold <project description>" });
+    return;
+  }
+  ctx.send({ type: "info", message: "\u{1F3D7}\uFE0F Generating project scaffold..." });
+  const scaffoldPrompt = `Please scaffold a project based on this description: ${description}
 
 Create the necessary files and directory structure. Use write_file and bash tools to set up the project.`;
-    await ctx.handleChat(scaffoldPrompt);
-  }
+  await ctx.handleChat(scaffoldPrompt);
 }
 
 // src/web/commands/memory-commands.ts
-import { existsSync as existsSync4, statSync as statSync3 } from "fs";
-import { resolve as resolve3 } from "path";
 async function handleSystem(args, ctx) {
-  {
-    const text = args.join(" ").trim();
-    if (!text) {
-      const current = ctx.activeSystemPrompt;
-      if (current) {
-        const preview = current.length > 500 ? current.slice(0, 500) + "..." : current;
-        ctx.send({ type: "info", message: `\u{1F4CB} Current system prompt (${current.length} chars):
+  const text = args.join(" ").trim();
+  if (!text) {
+    const current = ctx.activeSystemPrompt;
+    if (current) {
+      const preview = current.length > 500 ? current.slice(0, 500) + "..." : current;
+      ctx.send({ type: "info", message: `\u{1F4CB} Current system prompt (${current.length} chars):
 
 ${preview}` });
-      } else {
-        ctx.send({ type: "info", message: "No custom system prompt set. Using default.\nUsage: /system <prompt>" });
-      }
-    }
-    if (text === "clear" || text === "reset") {
-      ctx.activeSystemPrompt = ctx.loadContextFiles();
-      ctx.send({ type: "info", message: "\u2713 System prompt reset to default (context files)." });
     } else {
-      ctx.activeSystemPrompt = text;
-      ctx.send({ type: "info", message: `\u2713 System prompt set (${text.length} chars).` });
+      ctx.send({ type: "info", message: "No custom system prompt set. Using default.\nUsage: /system <prompt>" });
     }
+    return;
+  }
+  if (text === "clear" || text === "reset") {
+    ctx.activeSystemPrompt = ctx.loadContextFiles();
+    ctx.send({ type: "info", message: "\u2713 System prompt reset to default (context files)." });
+  } else {
+    ctx.activeSystemPrompt = text;
+    ctx.send({ type: "info", message: `\u2713 System prompt set (${text.length} chars).` });
   }
 }
-async function handleContext(args, ctx) {
-  {
-    const sub = args[0];
-    if (sub === "reload") {
-      ctx.activeSystemPrompt = ctx.loadContextFiles();
-      ctx.send({ type: "info", message: ctx.activeSystemPrompt ? `\u2713 Context reloaded (${ctx.activeSystemPrompt.length} chars).` : "\u2713 No context files found." });
-    }
-    const result = ctx.contextLoadResult;
-    const layers = ["\u{1F4DA} **Context Layers:**", ""];
-    if (result && result.layers.length > 0) {
-      const labels = { global: "Global ", project: "Project", plugin: "Plugin ", local: "Local  " };
-      for (const layer of result.layers) {
-        layers.push(`  \u2713 ${labels[layer.level] ?? layer.level}: ${layer.displayPath} (${layer.charCount} chars${layer.truncated ? ", truncated" : ""})`);
-      }
-      layers.push(`  Total: ${result.totalChars} chars (${result.layers.length} layer${result.layers.length > 1 ? "s" : ""})`);
-    } else {
-      layers.push("  No context files loaded.");
-      layers.push("  Search order per layer: AICLI.override.md \u2192 AGENTS.override.md \u2192 AICLI.md \u2192 CLAUDE.md \u2192 AGENTS.md");
-    }
-    if (result && result.skipped.length > 0) {
-      layers.push("");
-      layers.push("Skipped:");
-      for (const skipped of result.skipped.slice(0, 5)) {
-        layers.push(`  - ${skipped.displayPath}: ${skipped.reason}${skipped.message ? ` (${skipped.message})` : ""}`);
-      }
-    }
+async function handleContext(_args, ctx) {
+  const sub = _args[0];
+  if (sub === "reload") {
+    ctx.activeSystemPrompt = ctx.loadContextFiles();
+    ctx.send({ type: "info", message: ctx.activeSystemPrompt ? `\u2713 Context reloaded (${ctx.activeSystemPrompt.length} chars).` : "\u2713 No context files found." });
+    return;
+  }
+  const result = ctx.contextLoadResult;
+  const layers = ["\u{1F4DA} **Context Layers:**", ""];
+  if (result && result.layers.length > 0) {
+    const labels = { global: "Global ", project: "Project", plugin: "Plugin ", local: "Local  " };
+    for (const layer of result.layers) {
+      layers.push(`  \u2713 ${labels[layer.level] ?? layer.level}: ${layer.displayPath} (${layer.charCount} chars${layer.truncated ? ", truncated" : ""})`);
+    }
+    layers.push(`  Total: ${result.totalChars} chars (${result.layers.length} layer${result.layers.length > 1 ? "s" : ""})`);
+  } else {
+    layers.push("  No context files loaded.");
+    layers.push("  Search order per layer: AICLI.override.md \u2192 AGENTS.override.md \u2192 AICLI.md \u2192 CLAUDE.md \u2192 AGENTS.md");
+  }
+  if (result && result.skipped.length > 0) {
     layers.push("");
-    layers.push(`Total prompt length: ${ctx.activeSystemPrompt?.length ?? 0} chars`);
-    layers.push("Use /context reload to refresh.");
-    ctx.send({ type: "info", message: layers.join("\n") });
+    layers.push("Skipped:");
+    for (const skipped of result.skipped.slice(0, 5)) {
+      layers.push(`  - ${skipped.displayPath}: ${skipped.reason}${skipped.message ? ` (${skipped.message})` : ""}`);
+    }
   }
+  layers.push("");
+  layers.push(`Total prompt length: ${ctx.activeSystemPrompt?.length ?? 0} chars`);
+  layers.push("Use /context reload to refresh.");
+  ctx.send({ type: "info", message: layers.join("\n") });
 }
 async function handleIndex(args, ctx) {
-  {
-    const sub = (args[0] ?? "status").toLowerCase();
-    const root = process.cwd();
-    const { loadIndex, clearIndex } = await import("./store-MWNHVGJT.js");
-    const { indexProject } = await import("./indexer-2AG4G6B5.js");
-    const { loadVectorStore, clearVectorStore } = await import("./vector-store-BBDXB5IQ.js");
-    if (sub === "status") {
-      const idx = loadIndex(root);
-      const vec = loadVectorStore(root);
-      if (!idx) {
-        ctx.send({ type: "info", message: `No symbol index for ${root}. Run /index rebuild.` });
-      } else {
-        const semantic = vec ? `${vec.count} vectors \xD7 ${vec.dim}-dim` : "not built \u2014 run /index semantic-rebuild to enable search_code";
-        ctx.send({
-          type: "info",
-          message: [
-            "\u{1F50E} Symbol index:",
-            `  Root:      ${idx.root}`,
-            `  Generated: ${idx.generated}`,
-            `  Files:     ${idx.fileCount}`,
-            `  Symbols:   ${idx.symbolCount}`,
-            `  Semantic:  ${semantic}`
-          ].join("\n")
-        });
-      }
-    } else if (sub === "rebuild") {
-      ctx.send({ type: "info", message: `Indexing ${root}\u2026` });
-      const { stats } = await indexProject(root, { force: true });
+  const sub = (args[0] ?? "status").toLowerCase();
+  const root = process.cwd();
+  const { loadIndex, clearIndex } = await import("./store-MWNHVGJT.js");
+  const { indexProject } = await import("./indexer-2AG4G6B5.js");
+  const { loadVectorStore, clearVectorStore } = await import("./vector-store-BBDXB5IQ.js");
+  if (sub === "status") {
+    const idx = loadIndex(root);
+    const vec = loadVectorStore(root);
+    if (!idx) {
+      ctx.send({ type: "info", message: `No symbol index for ${root}. Run /index rebuild.` });
+      return;
+    }
+    const semantic = vec ? `${vec.count} vectors \xD7 ${vec.dim}-dim` : "not built \u2014 run /index semantic-rebuild to enable search_code";
+    ctx.send({
+      type: "info",
+      message: [
+        "\u{1F50E} Symbol index:",
+        `  Root:      ${idx.root}`,
+        `  Generated: ${idx.generated}`,
+        `  Files:     ${idx.fileCount}`,
+        `  Symbols:   ${idx.symbolCount}`,
+        `  Semantic:  ${semantic}`
+      ].join("\n")
+    });
+  } else if (sub === "rebuild") {
+    ctx.send({ type: "info", message: `Indexing ${root}\u2026` });
+    const { stats } = await indexProject(root, { force: true });
+    ctx.send({
+      type: "info",
+      message: `\u2713 Indexed ${stats.filesParsed} files (${stats.symbols} symbols) in ${stats.durationMs}ms`
+    });
+  } else if (sub === "clear") {
+    clearIndex(root);
+    clearVectorStore(root);
+    ctx.send({ type: "info", message: `\u2713 Cleared symbol + semantic index for ${root}` });
+  } else if (sub === "semantic-rebuild") {
+    const idx = loadIndex(root);
+    if (!idx) {
+      ctx.send({ type: "error", message: "No symbol index yet. Run /index rebuild first." });
+      return;
+    }
+    if (idx.symbolCount === 0) {
       ctx.send({
-        type: "info",
-        message: `\u2713 Indexed ${stats.filesParsed} files (${stats.symbols} symbols) in ${stats.durationMs}ms`
+        type: "error",
+        message: "No code symbols to embed. Semantic search needs TS/TSX/JS/JSX/Python source files \u2014 this project appears to have none. Not downloading the embedding model."
       });
-    } else if (sub === "clear") {
-      clearIndex(root);
-      clearVectorStore(root);
-      ctx.send({ type: "info", message: `\u2713 Cleared symbol + semantic index for ${root}` });
-    } else if (sub === "semantic-rebuild") {
-      const idx = loadIndex(root);
-      if (!idx) {
-        ctx.send({ type: "error", message: "No symbol index yet. Run /index rebuild first." });
-      }
-      if (idx.symbolCount === 0) {
-        ctx.send({
-          type: "error",
-          message: "No code symbols to embed. Semantic search needs TS/TSX/JS/JSX/Python source files \u2014 this project appears to have none. Not downloading the embedding model."
-        });
-      }
+      return;
+    }
+    ctx.send({
+      type: "info",
+      message: `Building semantic index for ${idx.symbolCount} symbols\u2026 (first run downloads ~117 MB model)`
+    });
+    try {
+      const { rebuildSemanticIndex } = await import("./semantic-HLAE2O4F.js");
+      const stats = await rebuildSemanticIndex(root);
+      const first = stats.modelFirstLoadMs ? ` (model load+first batch ${stats.modelFirstLoadMs}ms)` : "";
       ctx.send({
         type: "info",
-        message: `Building semantic index for ${idx.symbolCount} symbols\u2026 (first run downloads ~117 MB model)`
-      });
-      try {
-        const { rebuildSemanticIndex } = await import("./semantic-HLAE2O4F.js");
-        const stats = await rebuildSemanticIndex(root);
-        const first = stats.modelFirstLoadMs ? ` (model load+first batch ${stats.modelFirstLoadMs}ms)` : "";
-        ctx.send({
-          type: "info",
-          message: `\u2713 Embedded ${stats.symbolsEmbedded} symbols in ${stats.durationMs}ms${first}`
-        });
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        ctx.send({ type: "error", message: `Semantic rebuild failed: ${msg}` });
-      }
-    } else if (sub === "semantic-clear") {
-      clearVectorStore(root);
-      ctx.send({ type: "info", message: "\u2713 Cleared semantic index (symbol index preserved)" });
-    } else {
-      ctx.send({
-        type: "error",
-        message: `Unknown subcommand: ${sub}. Use status/rebuild/clear/semantic-rebuild/semantic-clear.`
+        message: `\u2713 Embedded ${stats.symbolsEmbedded} symbols in ${stats.durationMs}ms${first}`
       });
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      ctx.send({ type: "error", message: `Semantic rebuild failed: ${msg}` });
     }
+  } else if (sub === "semantic-clear") {
+    clearVectorStore(root);
+    ctx.send({ type: "info", message: "\u2713 Cleared semantic index (symbol index preserved)" });
+  } else {
+    ctx.send({
+      type: "error",
+      message: `Unknown subcommand: ${sub}. Use status/rebuild/clear/semantic-rebuild/semantic-clear.`
+    });
   }
 }
 async function handleMemory(args, ctx) {
-  {
-    const sub = args[0];
-    if (sub === "add" && args.length > 1) {
-      ctx.memoryAdd(args.slice(1).join(" "));
-    } else if (sub === "clear") {
-      ctx.memoryClear();
-    } else {
-      ctx.memoryShow();
-    }
+  const sub = args[0];
+  if (sub === "add" && args.length > 1) {
+    ctx.memoryAdd(args.slice(1).join(" "));
+  } else if (sub === "clear") {
+    ctx.memoryClear();
+  } else {
+    ctx.memoryShow();
   }
 }
 async function handleAddDir(args, ctx) {
-  {
-    const sub = args[0]?.trim();
-    if (!sub) {
-      ctx.send({ type: "info", message: ctx.addedDirs.size > 0 ? `\u{1F4C1} Added directories:
+  const sub = args[0]?.trim();
+  if (!sub) {
+    ctx.send({ type: "info", message: ctx.addedDirs.size > 0 ? `\u{1F4C1} Added directories:
 ${[...ctx.addedDirs].map((d) => `  \u2022 ${d}`).join("\n")}
 
 Use /add-dir remove to clear.` : "No directories added.\nUsage: /add-dir <path> | /add-dir remove" });
-    }
-    if (sub === "remove" || sub === "clear") {
-      ctx.addedDirs.clear();
-      ctx.send({ type: "info", message: "\u2713 All added directories removed from context." });
-    }
-    const dirPath = resolve3(sub);
-    if (!existsSync4(dirPath)) {
-      ctx.send({ type: "error", message: `Directory not found: ${dirPath}` });
-    }
-    if (!statSync3(dirPath).isDirectory()) {
-      ctx.send({ type: "error", message: `Not a directory: ${dirPath}` });
-    }
-    ctx.addedDirs.add(dirPath);
-    ctx.send({ type: "info", message: `\u2713 Added directory: ${dirPath}
-It will be included in AI context for subsequent messages.` });
+    return;
+  }
+  if (sub === "remove" || sub === "clear") {
+    ctx.addedDirs.clear();
+    ctx.send({ type: "info", message: "\u2713 All added directories removed from context." });
+    return;
+  }
+  const dirPath = resolve(sub);
+  if (!existsSync2(dirPath)) {
+    ctx.send({ type: "error", message: `Directory not found: ${dirPath}` });
+    return;
+  }
+  if (!statSync(dirPath).isDirectory()) {
+    ctx.send({ type: "error", message: `Not a directory: ${dirPath}` });
+    return;
   }
+  ctx.addedDirs.add(dirPath);
+  ctx.send({ type: "info", message: `\u2713 Added directory: ${dirPath}
+It will be included in AI context for subsequent messages.` });
 }
 
 // src/web/commands/security-commands.ts
 async function handleConfig(args, ctx) {
-  {
-    const sub = args[0];
-    if (sub === "show" || !sub) {
-      ctx.send({ type: "info", message: `\u2699\uFE0F Configuration:
+  const sub = args[0];
+  if (sub === "show" || !sub) {
+    ctx.send({ type: "info", message: `\u2699\uFE0F Configuration:
 \`\`\`json
 ${ctx.config.toFormattedJSON()}
 \`\`\`` });
-    } else if (sub === "get" && args[1]) {
-      const val = ctx.config.getByPath(args[1]);
-      const display = typeof val === "object" ? JSON.stringify(val, null, 2) : String(val ?? "undefined");
-      ctx.send({ type: "info", message: `${args[1]} = ${display}` });
-    } else if (sub === "set" && args[1] && args[2] !== void 0) {
-      try {
-        ctx.config.setByPath(args[1], args.slice(2).join(" "));
-        ctx.send({ type: "info", message: `\u2713 ${args[1]} = ${args.slice(2).join(" ")}` });
-      } catch (err) {
-        ctx.send({ type: "error", message: `Config error: ${err.message}` });
-      }
-    } else {
-      ctx.send({ type: "info", message: "Usage: /config [show] | /config get <key> | /config set <key> <value>" });
+  } else if (sub === "get" && args[1]) {
+    const val = ctx.config.getByPath(args[1]);
+    const display = typeof val === "object" ? JSON.stringify(val, null, 2) : String(val ?? "undefined");
+    ctx.send({ type: "info", message: `${args[1]} = ${display}` });
+  } else if (sub === "set" && args[1] && args[2] !== void 0) {
+    try {
+      ctx.config.setByPath(args[1], args.slice(2).join(" "));
+      ctx.send({ type: "info", message: `\u2713 ${args[1]} = ${args.slice(2).join(" ")}` });
+    } catch (err) {
+      ctx.send({ type: "error", message: `Config error: ${err.message}` });
     }
+  } else {
+    ctx.send({ type: "info", message: "Usage: /config [show] | /config get <key> | /config set <key> <value>" });
   }
 }
-async function handleDoctor(args, ctx) {
-  {
-    const report = buildDoctorReport({
-      config: ctx.config,
-      providers: ctx.providers,
-      cwd: process.cwd(),
-      mcpStatuses: ctx.mcpManager?.getStatus() ?? []
-    });
-    ctx.send({ type: "info", message: formatDoctorReport(report, false) });
-  }
+async function handleDoctor(_args, ctx) {
+  const report = buildDoctorReport({
+    config: ctx.config,
+    providers: ctx.providers,
+    cwd: process.cwd(),
+    mcpStatuses: ctx.mcpManager?.getStatus() ?? []
+  });
+  ctx.send({ type: "info", message: formatDoctorReport(report, false) });
 }
-async function handleBug(args, ctx) {
-  {
-    const session = ctx.sessions.current;
-    const lines = [
-      "\u{1F41B} **Bug Report Template**",
-      "",
-      "**Environment:**",
-      `  ai-cli version: ${VERSION}`,
-      `  Node.js: ${process.version}`,
-      `  OS: ${process.platform} ${process.arch}`,
-      `  Provider: ${ctx.currentProvider}`,
-      `  Model: ${ctx.currentModel}`,
-      `  Session: ${session?.id.slice(0, 8) ?? "none"} (${session?.messages.length ?? 0} messages)`,
-      "",
-      "**Description:**",
-      "(Describe the bug)",
-      "",
-      "**Steps to reproduce:**",
-      "1. ...",
-      "",
-      "**Expected behavior:**",
-      "...",
-      "",
-      "**Actual behavior:**",
-      "...",
-      "",
-      "Report at: https://github.com/jinzhengdong/ai-cli/issues"
-    ];
-    ctx.send({ type: "info", message: lines.join("\n") });
-  }
+async function handleBug(_args, ctx) {
+  const session = ctx.sessions.current;
+  const lines = [
+    "\u{1F41B} **Bug Report Template**",
+    "",
+    "**Environment:**",
+    `  ai-cli version: ${VERSION}`,
+    `  Node.js: ${process.version}`,
+    `  OS: ${process.platform} ${process.arch}`,
+    `  Provider: ${ctx.currentProvider}`,
+    `  Model: ${ctx.currentModel}`,
+    `  Session: ${session?.id.slice(0, 8) ?? "none"} (${session?.messages.length ?? 0} messages)`,
+    "",
+    "**Description:**",
+    "(Describe the bug)",
+    "",
+    "**Steps to reproduce:**",
+    "1. ...",
+    "",
+    "**Expected behavior:**",
+    "...",
+    "",
+    "**Actual behavior:**",
+    "...",
+    "",
+    "Report at: https://github.com/jinzhengdong/ai-cli/issues"
+  ];
+  ctx.send({ type: "info", message: lines.join("\n") });
 }
 
 // src/web/commands/agent-commands.ts
 async function handleAuto(args, ctx) {
-  {
-    const sub = args[0]?.toLowerCase() ?? "status";
-    if (sub === "on") {
-      ctx.toolExecutor.sessionAutoMode = true;
-      ctx.send({ type: "info", message: "\u26A1 Auto Mode ON \u2014 low-risk actions may auto-run; high-risk actions still confirm or deny. Auto Mode is session-scoped." });
-    } else if (sub === "off") {
-      ctx.toolExecutor.sessionAutoMode = false;
-      ctx.send({ type: "info", message: "Auto Mode disabled." });
-    } else if (sub === "status") {
-      ctx.send({ type: "info", message: `Auto Mode: ${ctx.toolExecutor.sessionAutoMode ? "on" : "off"}
+  const sub = args[0]?.toLowerCase() ?? "status";
+  if (sub === "on") {
+    ctx.toolExecutor.sessionAutoMode = true;
+    ctx.send({ type: "info", message: "\u26A1 Auto Mode ON \u2014 low-risk actions may auto-run; high-risk actions still confirm or deny. Auto Mode is session-scoped." });
+  } else if (sub === "off") {
+    ctx.toolExecutor.sessionAutoMode = false;
+    ctx.send({ type: "info", message: "Auto Mode disabled." });
+  } else if (sub === "status") {
+    ctx.send({ type: "info", message: `Auto Mode: ${ctx.toolExecutor.sessionAutoMode ? "on" : "off"}
 Scope: current session only
 Denied: /permissions recently-denied` });
-    } else {
-      ctx.send({ type: "error", message: "Usage: /auto [on|off|status]" });
-    }
-    ctx.sendStatus();
+  } else {
+    ctx.send({ type: "error", message: "Usage: /auto [on|off|status]" });
   }
+  ctx.sendStatus();
 }
 async function handlePermissions(args, ctx) {
-  {
-    const sub = args[0]?.toLowerCase() ?? "recently-denied";
-    if (sub === "recently-denied") {
-      const rows = getRecentlyDeniedAutoActions();
-      if (rows.length === 0) {
-        ctx.send({ type: "info", message: "No recently denied Auto Mode actions." });
-      } else {
-        const lines = [`Recently denied Auto Mode actions (${rows.length})`, ""];
-        for (const r of rows.slice(0, 20)) {
-          lines.push(`- ${r.timestamp} ${r.tool} ${r.ruleId}`);
-          lines.push(`  ${r.reason}`);
-          lines.push(`  ${r.argsPreview}`);
-        }
-        ctx.send({ type: "info", message: lines.join("\n") });
-      }
-    } else if (sub === "clear-denied") {
-      clearRecentlyDeniedAutoActions();
-      ctx.send({ type: "info", message: "Cleared recently denied Auto Mode actions." });
+  const sub = args[0]?.toLowerCase() ?? "recently-denied";
+  if (sub === "recently-denied") {
+    const rows = getRecentlyDeniedAutoActions();
+    if (rows.length === 0) {
+      ctx.send({ type: "info", message: "No recently denied Auto Mode actions." });
     } else {
-      ctx.send({ type: "error", message: "Usage: /permissions recently-denied|clear-denied" });
+      const lines = [`Recently denied Auto Mode actions (${rows.length})`, ""];
+      for (const r of rows.slice(0, 20)) {
+        lines.push(`- ${r.timestamp} ${r.tool} ${r.ruleId}`);
+        lines.push(`  ${r.reason}`);
+        lines.push(`  ${r.argsPreview}`);
+      }
+      ctx.send({ type: "info", message: lines.join("\n") });
     }
+  } else if (sub === "clear-denied") {
+    clearRecentlyDeniedAutoActions();
+    ctx.send({ type: "info", message: "Cleared recently denied Auto Mode actions." });
+  } else {
+    ctx.send({ type: "error", message: "Usage: /permissions recently-denied|clear-denied" });
   }
 }
 async function handleYolo(args, ctx) {
-  {
-    const sub = args[0]?.toLowerCase();
-    if (sub === "off") {
-      ctx.toolExecutor.sessionAutoApprove = false;
-      ctx.send({ type: "info", message: "\u{1F512} Auto-approve disabled \u2014 confirmations restored for this session." });
-    } else {
-      ctx.toolExecutor.sessionAutoApprove = true;
-      ctx.send({ type: "info", message: "\u26A1 YOLO mode ON \u2014 write tools auto-approved; destructive tools still require confirmation.\nUse /yolo off to re-enable write confirmations." });
-    }
+  const sub = args[0]?.toLowerCase();
+  if (sub === "off") {
+    ctx.toolExecutor.sessionAutoApprove = false;
+    ctx.send({ type: "info", message: "\u{1F512} Auto-approve disabled \u2014 confirmations restored for this session." });
+  } else {
+    ctx.toolExecutor.sessionAutoApprove = true;
+    ctx.send({ type: "info", message: "\u26A1 YOLO mode ON \u2014 write tools auto-approved; destructive tools still require confirmation.\nUse /yolo off to re-enable write confirmations." });
   }
 }
 async function handleAgent(args, ctx) {
-  {
-    const sub = args[0]?.toLowerCase() ?? "summary";
-    if (sub === "list") {
-      const agents = listAgentConfigs(ctx.config.getConfigDir());
-      const lines = [`Agents (${agents.length})`, ""];
-      for (const agent of agents) {
-        const active = agent.name === getPreferredAgentName() ? " *" : "  ";
-        const model = [agent.provider, agent.model].filter(Boolean).join("/") || "inherit";
-        lines.push(`${active} ${agent.name} [${agent.source ?? "builtin"}] \u2014 ${agent.description ?? ""}`);
-        lines.push(`    model: ${model} \xB7 permission: ${agent.permissionProfile ?? "workspace-write"} \xB7 maxRounds: ${agent.maxToolRounds ?? "inherit"}`);
-      }
-      lines.push("", "Config dirs: ~/.aicli/agents/ and .aicli/agents/");
-      ctx.send({ type: "info", message: lines.join("\n") });
+  const sub = args[0]?.toLowerCase() ?? "summary";
+  if (sub === "list") {
+    const agents = listAgentConfigs(ctx.config.getConfigDir());
+    const lines = [`Agents (${agents.length})`, ""];
+    for (const agent of agents) {
+      const active = agent.name === getPreferredAgentName() ? " *" : "  ";
+      const model = [agent.provider, agent.model].filter(Boolean).join("/") || "inherit";
+      lines.push(`${active} ${agent.name} [${agent.source ?? "builtin"}] \u2014 ${agent.description ?? ""}`);
+      lines.push(`    model: ${model} \xB7 permission: ${agent.permissionProfile ?? "workspace-write"} \xB7 maxRounds: ${agent.maxToolRounds ?? "inherit"}`);
+    }
+    lines.push("", "Config dirs: ~/.aicli/agents/ and .aicli/agents/");
+    ctx.send({ type: "info", message: lines.join("\n") });
+    return;
+  }
+  if (sub === "switch") {
+    const name = args[1];
+    if (!name) {
+      ctx.send({ type: "error", message: "Usage: /agent switch <name>" });
+      return;
     }
-    if (sub === "switch") {
-      const name = args[1];
-      if (!name) {
-        ctx.send({ type: "error", message: "Usage: /agent switch <name>" });
-      }
-      const agent = resolveAgentConfig(name, ctx.config.getConfigDir());
-      if (!agent) {
-        const available = listAgentConfigs(ctx.config.getConfigDir()).map((a) => a.name).join(", ");
-        ctx.send({ type: "error", message: `Unknown agent: ${name}
+    const agent = resolveAgentConfig(name, ctx.config.getConfigDir());
+    if (!agent) {
+      const available = listAgentConfigs(ctx.config.getConfigDir()).map((a) => a.name).join(", ");
+      ctx.send({ type: "error", message: `Unknown agent: ${name}
 Available: ${available}` });
-      }
-      setPreferredAgentName(agent.name);
-      ctx.send({ type: "info", message: `Preferred spawn_agent role: ${agent.name}` });
-      ctx.sendStatus();
+      return;
     }
-    if (sub === "stop") {
-      const target = args[1] ?? "all";
-      const count = requestAgentStop(target);
-      ctx.send({ type: "info", message: count > 0 ? `Stop requested for ${count} running agent(s).` : "No matching running agents." });
-      ctx.sendStatus();
+    setPreferredAgentName(agent.name);
+    ctx.send({ type: "info", message: `Preferred spawn_agent role: ${agent.name}` });
+    ctx.sendStatus();
+    return;
+  }
+  if (sub === "stop") {
+    const target = args[1] ?? "all";
+    const count = requestAgentStop(target);
+    ctx.send({ type: "info", message: count > 0 ? `Stop requested for ${count} running agent(s).` : "No matching running agents." });
+    ctx.sendStatus();
+    return;
+  }
+  if (sub === "summary") {
+    const runs = listAgentRuns();
+    if (runs.length === 0) {
+      ctx.send({ type: "info", message: "No sub-agent runs yet." });
+      return;
     }
-    if (sub === "summary") {
-      const runs = listAgentRuns();
-      if (runs.length === 0) {
-        ctx.send({ type: "info", message: "No sub-agent runs yet." });
-      }
-      const lines = [`Recent agent runs (${runs.length})`, ""];
-      for (const run of runs.slice(0, 20)) {
-        lines.push(`${run.id} ${run.status} ${run.agentName} ${run.startedAt}`);
-        lines.push(`  task: ${run.task.slice(0, 120)}${run.task.length > 120 ? "..." : ""}`);
-        if (run.toolNames.length > 0) lines.push(`  tools: ${run.toolNames.join(", ")}`);
-        if (run.summary) lines.push(`  summary: ${run.summary.slice(0, 180)}${run.summary.length > 180 ? "..." : ""}`);
-        if (run.error) lines.push(`  error: ${run.error}`);
-      }
-      ctx.send({ type: "info", message: lines.join("\n") });
+    const lines = [`Recent agent runs (${runs.length})`, ""];
+    for (const run of runs.slice(0, 20)) {
+      lines.push(`${run.id} ${run.status} ${run.agentName} ${run.startedAt}`);
+      lines.push(`  task: ${run.task.slice(0, 120)}${run.task.length > 120 ? "..." : ""}`);
+      if (run.toolNames.length > 0) lines.push(`  tools: ${run.toolNames.join(", ")}`);
+      if (run.summary) lines.push(`  summary: ${run.summary.slice(0, 180)}${run.summary.length > 180 ? "..." : ""}`);
+      if (run.error) lines.push(`  error: ${run.error}`);
     }
-    ctx.send({ type: "error", message: "Usage: /agent list|switch <name>|stop <id|all>|summary" });
+    ctx.send({ type: "info", message: lines.join("\n") });
+    return;
   }
+  ctx.send({ type: "error", message: "Usage: /agent list|switch <name>|stop <id|all>|summary" });
 }
 
 // src/web/commands/misc-commands.ts
-async function handleHelp(args, ctx) {
+async function handleHelp(_args, ctx) {
   ctx.send({
     type: "info",
     message: [
@@ -2032,90 +2051,87 @@ async function handleHelp(args, ctx) {
     ].join("\n")
   });
 }
-async function handleAbout(args, ctx) {
-  {
-    const providerList = ctx.providers.listAll();
-    const toolCount = ctx.toolRegistry.getDefinitions().length;
-    const mcpTools = ctx.mcpManager?.getTotalToolCount() ?? 0;
-    const lines = [
-      `\u{1F916} **ai-cli** v${VERSION}`,
-      "",
-      `${DESCRIPTION}`,
-      `Author: ${AUTHOR} <${AUTHOR_EMAIL}>`,
-      "",
-      `**Providers:** ${providerList.length} (${providerList.map((p) => p.id).join(", ")})`,
-      `**Tools:** ${toolCount + mcpTools} (${toolCount} built-in${mcpTools > 0 ? ` + ${mcpTools} MCP` : ""})`,
-      `**REPL Commands:** 37`,
-      "",
-      `GitHub: https://github.com/jinzhengdong/ai-cli`
-    ];
-    ctx.send({ type: "info", message: lines.join("\n") });
-  }
+async function handleAbout(_args, ctx) {
+  const providerList = ctx.providers.listAll();
+  const toolCount = ctx.toolRegistry.getDefinitions().length;
+  const mcpTools = ctx.mcpManager?.getTotalToolCount() ?? 0;
+  const lines = [
+    `\u{1F916} **ai-cli** v${VERSION}`,
+    "",
+    `${DESCRIPTION}`,
+    `Author: ${AUTHOR} <${AUTHOR_EMAIL}>`,
+    "",
+    `**Providers:** ${providerList.length} (${providerList.map((p) => p.id).join(", ")})`,
+    `**Tools:** ${toolCount + mcpTools} (${toolCount} built-in${mcpTools > 0 ? ` + ${mcpTools} MCP` : ""})`,
+    `**REPL Commands:** 37`,
+    "",
+    `GitHub: https://github.com/jinzhengdong/ai-cli`
+  ];
+  ctx.send({ type: "info", message: lines.join("\n") });
 }
 async function handleSearch(args, ctx) {
-  {
-    const query = args.join(" ").trim();
-    if (!query) {
-      ctx.send({ type: "error", message: "Usage: /search <keyword>" });
-    }
-    const results = ctx.sessions.searchMessages(query);
-    if (results.length === 0) {
-      ctx.send({ type: "info", message: `No sessions found containing "${query}".` });
-    }
-    const lines = [`\u{1F50D} Found ${results.length} session(s) containing "${query}"`, ""];
-    for (const r of results) {
-      const { sessionMeta, matches } = r;
-      const dateStr = sessionMeta.updated instanceof Date ? sessionMeta.updated.toLocaleDateString() : String(sessionMeta.updated);
-      lines.push(`**${sessionMeta.id.slice(0, 8)}** [${dateStr}] ${sessionMeta.provider} / ${sessionMeta.model}`);
-      if (sessionMeta.title) lines.push(`  ${sessionMeta.title}`);
-      for (const m of matches) {
-        const icon = m.role === "user" ? "\u{1F464}" : "\u{1F916}";
-        lines.push(`  ${icon} ${m.snippet}`);
-      }
-      lines.push("");
+  const query = args.join(" ").trim();
+  if (!query) {
+    ctx.send({ type: "error", message: "Usage: /search <keyword>" });
+    return;
+  }
+  const results = ctx.sessions.searchMessages(query);
+  if (results.length === 0) {
+    ctx.send({ type: "info", message: `No sessions found containing "${query}".` });
+    return;
+  }
+  const lines = [`\u{1F50D} Found ${results.length} session(s) containing "${query}"`, ""];
+  for (const r of results) {
+    const { sessionMeta, matches } = r;
+    const dateStr = sessionMeta.updated instanceof Date ? sessionMeta.updated.toLocaleDateString() : String(sessionMeta.updated);
+    lines.push(`**${sessionMeta.id.slice(0, 8)}** [${dateStr}] ${sessionMeta.provider} / ${sessionMeta.model}`);
+    if (sessionMeta.title) lines.push(`  ${sessionMeta.title}`);
+    for (const m of matches) {
+      const icon = m.role === "user" ? "\u{1F464}" : "\u{1F916}";
+      lines.push(`  ${icon} ${m.snippet}`);
     }
-    lines.push("Use /session load <id> to resume a session.");
-    ctx.send({ type: "info", message: lines.join("\n") });
+    lines.push("");
   }
+  lines.push("Use /session load <id> to resume a session.");
+  ctx.send({ type: "info", message: lines.join("\n") });
 }
 async function handleUndo(args, ctx) {
-  {
-    const sub = args.join(" ").trim();
-    if (sub === "list") {
-      const history = undoStack.getHistory();
-      if (history.length === 0) {
-        ctx.send({ type: "info", message: "Undo stack is empty." });
-      }
-      const lines = [`\u{1F4CB} Undo Stack (${history.length} entries, newest last):`, ""];
-      history.forEach((entry, i) => {
-        const timeStr = entry.timestamp.toLocaleTimeString();
-        const typeTag = entry.isDirectory ? "[dir]" : entry.previousContent === null ? "[new]" : "[mod]";
-        lines.push(`  ${String(i + 1).padStart(3)}  ${typeTag}  ${entry.description}  ${timeStr}`);
-      });
-      ctx.send({ type: "info", message: lines.join("\n") });
-    }
-    const n = sub ? parseInt(sub, 10) : 1;
-    if (isNaN(n) || n < 1) {
-      ctx.send({ type: "info", message: "Usage: /undo [list | <n>]" });
-    }
-    if (undoStack.depth === 0) {
-      ctx.send({ type: "info", message: "Nothing to undo." });
-    }
-    const count = Math.min(n, undoStack.depth);
-    const undoResults = [];
-    for (let i = 0; i < count; i++) {
-      const top = undoStack.peek();
-      if (!top) {
-      }
-      const undoResult = undoStack.undo();
-      if (undoResult) undoResults.push(undoResult.result);
+  const sub = args.join(" ").trim();
+  if (sub === "list") {
+    const history = undoStack.getHistory();
+    if (history.length === 0) {
+      ctx.send({ type: "info", message: "Undo stack is empty." });
+      return;
     }
-    if (undoResults.length === 0) {
-      ctx.send({ type: "info", message: "Nothing to undo." });
-    } else {
-      ctx.send({ type: "info", message: `\u2713 ${undoResults.length} operation(s) undone:
+    const lines = [`\u{1F4CB} Undo Stack (${history.length} entries, newest last):`, ""];
+    history.forEach((entry, i) => {
+      const timeStr = entry.timestamp.toLocaleTimeString();
+      const typeTag = entry.isDirectory ? "[dir]" : entry.previousContent === null ? "[new]" : "[mod]";
+      lines.push(`  ${String(i + 1).padStart(3)}  ${typeTag}  ${entry.description}  ${timeStr}`);
+    });
+    ctx.send({ type: "info", message: lines.join("\n") });
+    return;
+  }
+  const n = sub ? parseInt(sub, 10) : 1;
+  if (isNaN(n) || n < 1) {
+    ctx.send({ type: "info", message: "Usage: /undo [list | <n>]" });
+    return;
+  }
+  if (undoStack.depth === 0) {
+    ctx.send({ type: "info", message: "Nothing to undo." });
+    return;
+  }
+  const count = Math.min(n, undoStack.depth);
+  const undoResults = [];
+  for (let i = 0; i < count; i++) {
+    const undoResult = undoStack.undo();
+    if (undoResult) undoResults.push(undoResult.result);
+  }
+  if (undoResults.length === 0) {
+    ctx.send({ type: "info", message: "Nothing to undo." });
+  } else {
+    ctx.send({ type: "info", message: `\u2713 ${undoResults.length} operation(s) undone:
 ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
-    }
   }
 }
 
@@ -2164,20 +2180,6 @@ var webCommandHandlers = {
   search: handleSearch,
   undo: handleUndo
 };
-function lastAssistantText(messages) {
-  for (let i = messages.length - 1; i >= 0; i--) {
-    const m = messages[i];
-    if (!m || m.role !== "assistant") continue;
-    const c = m.content;
-    if (typeof c === "string") return c;
-    if (Array.isArray(c)) {
-      const text = c.filter((p) => p && p.type === "text" && typeof p.text === "string").map((p) => p.text).join("");
-      if (text) return text;
-    }
-    return void 0;
-  }
-  return void 0;
-}
 var SessionHandler = class {
   ws;
   config;
@@ -2220,6 +2222,8 @@ var SessionHandler = class {
   addedDirs = /* @__PURE__ */ new Set();
   /** Track MCP tool names used across this session (for MCP budget prioritization) */
   usedMcpToolNames = /* @__PURE__ */ new Set();
+  /** P2-PERF-05: bash session key for cleanup on disconnect */
+  _bashSessionKey = "";
   /**
    * 未保存会话的内存缓存（per-handler）。
    * 当客户端通过 `session new` 创建新会话时，会话仅存在于 SessionManager._current 中，
@@ -2238,7 +2242,9 @@ var SessionHandler = class {
     this.mcpManager = shared.mcpManager;
     this.skillManager = shared.skillManager;
     this.toolExecutor = new ToolExecutorWeb(shared.toolRegistry, ws);
-    this.toolExecutor.setSessionKey(`web-${Math.random().toString(36).slice(2)}-${Date.now()}`);
+    const bashSessionKey = `web-${Math.random().toString(36).slice(2)}-${Date.now()}`;
+    this.toolExecutor.setSessionKey(bashSessionKey);
+    this._bashSessionKey = bashSessionKey;
     this.currentProvider = this.config.get("defaultProvider");
     const allDefaultModels = this.config.get("defaultModels");
     try {
@@ -2356,10 +2362,10 @@ var SessionHandler = class {
         return;
       }
       case "ask_user_response": {
-        const resolve6 = this.pendingAskUser.get(msg.requestId);
-        if (resolve6) {
+        const resolve5 = this.pendingAskUser.get(msg.requestId);
+        if (resolve5) {
           this.pendingAskUser.delete(msg.requestId);
-          resolve6(msg.answer);
+          resolve5(msg.answer);
         }
         return;
       }
@@ -2372,10 +2378,10 @@ var SessionHandler = class {
       case "memory_manage":
         return this.handleMemoryManage(msg.action, msg.id, msg.expiresAt);
       case "auto_pause_response": {
-        const resolve6 = this.pendingAutoPause.get(msg.requestId);
-        if (resolve6) {
+        const resolve5 = this.pendingAutoPause.get(msg.requestId);
+        if (resolve5) {
           this.pendingAutoPause.delete(msg.requestId);
-          resolve6({ action: msg.action, message: msg.message });
+          resolve5({ action: msg.action, message: msg.message });
         }
         return;
       }
@@ -2390,10 +2396,10 @@ var SessionHandler = class {
         this.hubOrchestrator?.abort();
         return;
       case "hub_steer": {
-        const resolve6 = this.pendingHubReview.get(msg.requestId);
-        if (resolve6) {
+        const resolve5 = this.pendingHubReview.get(msg.requestId);
+        if (resolve5) {
           this.pendingHubReview.delete(msg.requestId);
-          resolve6({ action: msg.action, message: msg.message });
+          resolve5({ action: msg.action, message: msg.message });
         }
         return;
       }
@@ -2406,11 +2412,12 @@ var SessionHandler = class {
     runLifecycleHooks(mergePluginHooks(this.config.get("hooks") ?? void 0, this.config.getConfigDir()), "Stop", { sessionId: this.sessions.current?.id }, { configDir: this.config.getConfigDir() });
     this.toolExecutor.cancelAll();
     if (this.abortController) this.abortController.abort();
-    for (const resolve6 of this.pendingAskUser.values()) resolve6(null);
+    for (const resolve5 of this.pendingAskUser.values()) resolve5(null);
     this.pendingAskUser.clear();
-    for (const resolve6 of this.pendingAutoPause.values()) resolve6({ action: "stop" });
+    for (const resolve5 of this.pendingAutoPause.values()) resolve5({ action: "stop" });
     this.pendingAutoPause.clear();
     this.saveIfNeeded();
+    if (this._bashSessionKey) clearBashSession(this._bashSessionKey);
   }
   /** 根据当前模型 context window 更新工具输出截断上限 */
   updateContextWindow() {
@@ -2542,9 +2549,9 @@ var SessionHandler = class {
     this.hubOrchestrator = orchestrator;
     orchestrator.onEvent = (event) => this.send({ type: "hub_event", event });
     if (config.humanSteer) {
-      orchestrator.onRoundReview = ({ round, maxRounds }) => new Promise((resolve6) => {
+      orchestrator.onRoundReview = ({ round, maxRounds }) => new Promise((resolve5) => {
         const requestId = `hubrev_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-        this.pendingHubReview.set(requestId, resolve6);
+        this.pendingHubReview.set(requestId, resolve5);
         this.send({ type: "hub_review", requestId, round, maxRounds });
       });
     }
@@ -2877,7 +2884,7 @@ Try: /compact to reduce context, /clear to reset, or switch to a larger-context
           this.send({ type: "response_done", content, usage });
           if (pendingTeeSave && isCleanDocumentBody(content)) {
             try {
-              mkdirSync4(dirname4(pendingTeeSave), { recursive: true });
+              mkdirSync3(dirname3(pendingTeeSave), { recursive: true });
               const bodyToSave = stripOuterCodeFence(content);
               atomicWriteFileSync(pendingTeeSave, bodyToSave);
               undoStack.push(pendingTeeSave, `save_last_response (deferred): ${pendingTeeSave}`);
@@ -2902,8 +2909,8 @@ Try: /compact to reduce context, /clear to reset, or switch to a larger-context
         onMcpToolUsed: (name) => this.usedMcpToolNames.add(name),
         requestAutoPause: async ({ effectiveRound, maxToolRounds: totalRounds, toolSummary }) => {
           const requestId = `pause_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-          const pauseResp = await new Promise((resolve6) => {
-            this.pendingAutoPause.set(requestId, resolve6);
+          const pauseResp = await new Promise((resolve5) => {
+            this.pendingAutoPause.set(requestId, resolve5);
             this.send({
               type: "auto_pause_request",
               requestId,
@@ -3053,8 +3060,8 @@ ${summaryContent}`,
     let isError = false;
     let summary;
     try {
-      mkdirSync4(dirname4(saveToFile), { recursive: true });
-      fileStream = createWriteStream4(saveToFile);
+      mkdirSync3(dirname3(saveToFile), { recursive: true });
+      fileStream = createWriteStream3(saveToFile);
       const teeSystemPrompt = stripToolCallReminder(systemPrompt ?? "") + CONTENT_ONLY_STREAM_REMINDER;
       const teeExtraMessages = extraMessages.length > 0 ? [...extraMessages, { role: "user", content: TEE_FINAL_USER_NUDGE }] : [{ role: "user", content: TEE_FINAL_USER_NUDGE }];
       const chatRequest = {
@@ -3082,8 +3089,8 @@ ${summaryContent}`,
         }
         if (chunk.done) break;
       }
-      await new Promise((resolve6, reject) => {
-        fileStream.end((err) => err ? reject(err) : resolve6());
+      await new Promise((resolve5, reject) => {
+        fileStream.end((err) => err ? reject(err) : resolve5());
       });
       const verdict = evaluateTeeContent(fullContent, saveToFile, priorContent);
       if (verdict.kind === "reject") {
@@ -3109,7 +3116,7 @@ ${summaryContent}`,
     } catch (err) {
       if (fileStream) {
         try {
-          await new Promise((resolve6) => fileStream.end(() => resolve6()));
+          await new Promise((resolve5) => fileStream.end(() => resolve5()));
         } catch {
         }
       }
@@ -3346,7 +3353,7 @@ ${entry.content}`;
     const configDir = this.config.getConfigDir();
     try {
       atomicWriteFileSync(memoryStorePath(configDir), "");
-      atomicWriteFileSync(join4(configDir, MEMORY_FILE_NAME), "");
+      atomicWriteFileSync(join3(configDir, MEMORY_FILE_NAME), "");
       this.send({ type: "info", message: "\u{1F5D1}\uFE0F Persistent memory cleared." });
       this.sendMemoryEntries();
     } catch (err) {
@@ -3412,7 +3419,7 @@ ${entry.content}`;
       return;
     }
     try {
-      const { searchChatMemory, loadChatIndex } = await import("./chat-index-FDSGKWQV.js");
+      const { searchChatMemory, loadChatIndex } = await import("./chat-index-O56HDGFI.js");
       const loaded = loadChatIndex();
       if (!loaded || loaded.idx.chunks.length === 0) {
         this.send({ type: "memory_hits", query: q, hits: [], indexMissing: true });
@@ -3448,7 +3455,7 @@ ${entry.content}`;
   }
   async handleMemoryStatus() {
     try {
-      const { getChatIndexStatus } = await import("./chat-index-FDSGKWQV.js");
+      const { getChatIndexStatus } = await import("./chat-index-O56HDGFI.js");
       const s = getChatIndexStatus();
       this.send({
         type: "memory_status",
@@ -3473,7 +3480,7 @@ ${entry.content}`;
         type: "info",
         message: full ? "\u{1F9E0} Rebuilding chat memory index (this may take a while on first run \u2014 ~117 MB embedder)." : "\u{1F9E0} Refreshing chat memory index (incremental)\u2026"
       });
-      const { buildChatIndex } = await import("./chat-index-FDSGKWQV.js");
+      const { buildChatIndex } = await import("./chat-index-O56HDGFI.js");
       const stats = await buildChatIndex({
         full,
         onProgress: (p) => {
@@ -3622,11 +3629,11 @@ function getModuleDir() {
     if (typeof import.meta?.url === "string") {
       const url = new URL(import.meta.url);
       const filePath = url.pathname.replace(/^\/([A-Z]:)/i, "$1");
-      return dirname5(filePath);
+      return dirname4(filePath);
     }
   } catch {
   }
-  return resolve5(".");
+  return resolve4(".");
 }
 async function startWebServer(options = {}) {
   const port = options.port ?? 3e3;
@@ -3694,8 +3701,8 @@ async function startWebServer(options = {}) {
     }
   }
   let skillManager = null;
-  const skillsDir = join5(config.getConfigDir(), SKILLS_DIR_NAME);
-  if (existsSync6(skillsDir)) {
+  const skillsDir = join4(config.getConfigDir(), SKILLS_DIR_NAME);
+  if (existsSync5(skillsDir)) {
     skillManager = new SkillManager(skillsDir, config.get("ui").skillSizeWarn);
     skillManager.loadSkills(pluginAssets.skillDirs);
     const count = skillManager.listSkills().length;
@@ -3766,18 +3773,18 @@ async function startWebServer(options = {}) {
     next();
   };
   const moduleDir = getModuleDir();
-  let clientDir = join5(moduleDir, "web", "client");
-  if (!existsSync6(clientDir)) {
-    clientDir = join5(moduleDir, "client");
+  let clientDir = join4(moduleDir, "web", "client");
+  if (!existsSync5(clientDir)) {
+    clientDir = join4(moduleDir, "client");
   }
-  if (!existsSync6(clientDir)) {
-    clientDir = join5(moduleDir, "..", "..", "src", "web", "client");
+  if (!existsSync5(clientDir)) {
+    clientDir = join4(moduleDir, "..", "..", "src", "web", "client");
   }
-  if (!existsSync6(clientDir)) {
-    clientDir = join5(process.cwd(), "src", "web", "client");
+  if (!existsSync5(clientDir)) {
+    clientDir = join4(process.cwd(), "src", "web", "client");
   }
   console.log(`   Static files: ${clientDir}`);
-  app.use("/vendor", express.static(join5(clientDir, "vendor"), { maxAge: "1y", immutable: true }));
+  app.use("/vendor", express.static(join4(clientDir, "vendor"), { maxAge: "1y", immutable: true }));
   app.use(express.static(clientDir));
   app.get("/api/status", (_req, res) => {
     res.json({
@@ -3844,10 +3851,10 @@ async function startWebServer(options = {}) {
   app.get("/api/files", requireAuth, (req, res) => {
     const cwd = process.cwd();
     const prefix = req.query.prefix || "";
-    const targetDir = join5(cwd, prefix);
+    const targetDir = join4(cwd, prefix);
     try {
-      const canonicalTarget = realpathSync(resolve5(targetDir));
-      const canonicalCwd = realpathSync(resolve5(cwd));
+      const canonicalTarget = realpathSync(resolve4(targetDir));
+      const canonicalCwd = realpathSync(resolve4(cwd));
       if (!canonicalTarget.startsWith(canonicalCwd + sep) && canonicalTarget !== canonicalCwd) {
         res.json({ files: [] });
         return;
@@ -3858,10 +3865,10 @@ async function startWebServer(options = {}) {
     }
     try {
       const SKIP = /* @__PURE__ */ new Set(["node_modules", ".git", "dist", "dist-cjs", "release", "__pycache__", ".next", ".nuxt", "coverage", ".cache"]);
-      const entries = readdirSync5(targetDir, { withFileTypes: true });
+      const entries = readdirSync4(targetDir, { withFileTypes: true });
       const files = entries.filter((e) => !SKIP.has(e.name) && !e.name.startsWith(".")).slice(0, 50).map((e) => ({
         name: e.name,
-        path: relative(cwd, join5(targetDir, e.name)).replace(/\\/g, "/"),
+        path: relative(cwd, join4(targetDir, e.name)).replace(/\\/g, "/"),
         isDir: e.isDirectory()
       }));
       res.json({ files });
@@ -3901,8 +3908,8 @@ async function startWebServer(options = {}) {
     try {
       const authUser = req._authUser;
       const histDir = authUser ? getUserShared(authUser).config.getHistoryDir() : config.getHistoryDir();
-      const filePath = join5(histDir, `${id}.json`);
-      if (!existsSync6(filePath)) {
+      const filePath = join4(histDir, `${id}.json`);
+      if (!existsSync5(filePath)) {
         res.status(404).json({ error: "Session not found" });
         return;
       }
@@ -3917,7 +3924,7 @@ async function startWebServer(options = {}) {
         res.status(404).json({ error: "Session not found" });
         return;
       }
-      const data = JSON.parse(readFileSync6(filePath, "utf-8"));
+      const data = JSON.parse(readFileSync5(filePath, "utf-8"));
       res.json({ session: data });
     } catch (err) {
       res.status(500).json({ error: err instanceof Error ? err.message : String(err) });
@@ -3930,10 +3937,10 @@ async function startWebServer(options = {}) {
       return;
     }
     const cwd = process.cwd();
-    const fullPath = resolve5(join5(cwd, filePath));
+    const fullPath = resolve4(join4(cwd, filePath));
     try {
       const canonicalFull = realpathSync(fullPath);
-      const canonicalCwd = realpathSync(resolve5(cwd));
+      const canonicalCwd = realpathSync(resolve4(cwd));
       if (!canonicalFull.startsWith(canonicalCwd + sep) && canonicalFull !== canonicalCwd) {
         res.json({ error: "Access denied" });
         return;
@@ -3943,12 +3950,12 @@ async function startWebServer(options = {}) {
       return;
     }
     try {
-      const stat = statSync5(fullPath);
+      const stat = statSync4(fullPath);
       if (stat.size > 512 * 1024) {
         res.json({ error: `File too large (${(stat.size / 1024).toFixed(0)} KB, max 512 KB)` });
         return;
       }
-      const content = readFileSync6(fullPath, "utf-8");
+      const content = readFileSync5(fullPath, "utf-8");
       res.json({ content, size: stat.size });
     } catch {
       res.json({ error: "Cannot read file" });
@@ -4152,7 +4159,7 @@ async function startWebServer(options = {}) {
   });
   const MAX_PORT_ATTEMPTS = 10;
   let actualPort = port;
-  const result = await new Promise((resolve6, reject) => {
+  const result = await new Promise((resolve5, reject) => {
     const tryListen = (attempt) => {
       server.once("error", (err) => {
         if (err.code === "EADDRINUSE" && attempt < MAX_PORT_ATTEMPTS) {
@@ -4183,7 +4190,7 @@ async function startWebServer(options = {}) {
         }
         console.log(`   Press Ctrl+C to stop
 `);
-        resolve6({ port: actualPort, host, url });
+        resolve5({ port: actualPort, host, url });
       });
     };
     tryListen(1);
@@ -4203,17 +4210,17 @@ function resolveProjectMcpPath() {
   const cwd = process.cwd();
   const gitRoot = getGitRoot(cwd);
   const projectRoot = gitRoot ?? cwd;
-  const configPath = join5(projectRoot, MCP_PROJECT_CONFIG_NAME);
-  return existsSync6(configPath) ? configPath : null;
+  const configPath = join4(projectRoot, MCP_PROJECT_CONFIG_NAME);
+  return existsSync5(configPath) ? configPath : null;
 }
 function loadProjectMcpConfig() {
   const cwd = process.cwd();
   const gitRoot = getGitRoot(cwd);
   const projectRoot = gitRoot ?? cwd;
-  const configPath = join5(projectRoot, MCP_PROJECT_CONFIG_NAME);
-  if (!existsSync6(configPath)) return null;
+  const configPath = join4(projectRoot, MCP_PROJECT_CONFIG_NAME);
+  if (!existsSync5(configPath)) return null;
   try {
-    const raw = JSON.parse(readFileSync6(configPath, "utf-8"));
+    const raw = JSON.parse(readFileSync5(configPath, "utf-8"));
     return raw.mcpServers ?? raw;
   } catch {
     return null;