jinzd-ai-cli 0.4.222 → 0.4.223

package/dist/electron-server.js

@@ -38,7 +38,7 @@ import {
   VERSION,
   buildUserIdentityPrompt,
   runTestsTool
-} from "./chunk-AV5OPK7Q.js";
+} from "./chunk-GH37CLOE.js";
 import {
   hasSemanticIndex,
   semanticSearch
@@ -64,8 +64,8 @@ import {
 import express from "express";
 import { createServer } from "http";
 import { WebSocketServer } from "ws";
-import { join as join29, dirname as dirname12, resolve as resolve14, relative as relative4, sep as sep3 } from "path";
-import { existsSync as existsSync34, readFileSync as readFileSync27, readdirSync as readdirSync18, statSync as statSync16, realpathSync } from "fs";
+import { join as join28, dirname as dirname11, resolve as resolve13, relative as relative4, sep as sep3 } from "path";
+import { existsSync as existsSync33, readFileSync as readFileSync26, readdirSync as readdirSync17, statSync as statSync15, realpathSync } from "fs";
 import { networkInterfaces } from "os";
 
 // src/config/config-manager.ts
@@ -7257,7 +7257,7 @@ var ToolExecutor = class {
     rl.resume();
     process.stdout.write(prompt);
     this.confirming = true;
-    return new Promise((resolve15) => {
+    return new Promise((resolve14) => {
       let completed = false;
       const cleanup = (result) => {
         if (completed) return;
@@ -7267,7 +7267,7 @@ var ToolExecutor = class {
         rl.pause();
         rlAny.output = savedOutput;
         this.confirming = false;
-        resolve15(result);
+        resolve14(result);
       };
       const onLine = (line) => {
         const trimmed = line.trim();
@@ -7441,7 +7441,7 @@ var ToolExecutor = class {
     rl.resume();
     process.stdout.write(color("Proceed? [y/N] (type y + Enter to confirm) "));
     this.confirming = true;
-    return new Promise((resolve15) => {
+    return new Promise((resolve14) => {
       let completed = false;
       const cleanup = (answer) => {
         if (completed) return;
@@ -7451,7 +7451,7 @@ var ToolExecutor = class {
         rl.pause();
         rlAny.output = savedOutput;
         this.confirming = false;
-        resolve15(answer === "y");
+        resolve14(answer === "y");
       };
       const onLine = (line) => {
         const trimmed = line.trim();
@@ -8700,7 +8700,7 @@ var runInteractiveTool = {
       PYTHONDONTWRITEBYTECODE: "1"
     };
     const prefixWarnings = [argsTypeWarning, stdinTypeWarning].filter(Boolean).join("");
-    return new Promise((resolve15) => {
+    return new Promise((resolve14) => {
       const child = spawn2(executable, cmdArgs.map(String), {
         cwd: process.cwd(),
         env,
@@ -8733,22 +8733,22 @@ var runInteractiveTool = {
       setTimeout(writeNextLine, 400);
       const timer = setTimeout(() => {
         child.kill();
-        resolve15(`${prefixWarnings}[Timeout after ${timeout}ms]
+        resolve14(`${prefixWarnings}[Timeout after ${timeout}ms]
 ${buildOutput(stdout, stderr)}`);
       }, timeout);
       child.on("close", (code) => {
         clearTimeout(timer);
         const output = buildOutput(stdout, stderr);
         if (code !== 0 && code !== null) {
-          resolve15(`${prefixWarnings}Exit code ${code}:
+          resolve14(`${prefixWarnings}Exit code ${code}:
 ${output}`);
         } else {
-          resolve15(`${prefixWarnings}${output || "(no output)"}`);
+          resolve14(`${prefixWarnings}${output || "(no output)"}`);
         }
       });
       child.on("error", (err) => {
         clearTimeout(timer);
-        resolve15(
+        resolve14(
           `${prefixWarnings}Failed to start process "${executable}": ${err.message}
 Hint: On Windows, use the full path to the executable, e.g.:
   C:\\Users\\Jinzd\\anaconda3\\envs\\python312\\python.exe`
@@ -9798,7 +9798,7 @@ function promptUser(rl, question) {
   console.log();
   console.log(chalk4.cyan("\u2753 ") + chalk4.bold(question));
   process.stdout.write(chalk4.cyan("> "));
-  return new Promise((resolve15) => {
+  return new Promise((resolve14) => {
     let completed = false;
     const cleanup = (answer) => {
       if (completed) return;
@@ -9808,7 +9808,7 @@ function promptUser(rl, question) {
       rl.pause();
       rlAny.output = savedOutput;
       askUserContext.prompting = false;
-      resolve15(answer);
+      resolve14(answer);
     };
     const onLine = (line) => {
       cleanup(line);
@@ -12253,7 +12253,7 @@ var McpClient = class {
   // 内部方法：JSON-RPC 通信
   // ══════════════════════════════════════════════════════════════════
   sendRequest(method, params) {
-    return new Promise((resolve15, reject) => {
+    return new Promise((resolve14, reject) => {
       if (!this.process?.stdin?.writable) {
         return reject(new Error(`MCP server [${this.serverId}] stdin not writable`));
       }
@@ -12277,7 +12277,7 @@ var McpClient = class {
       this.pendingRequests.set(id, {
         resolve: (result) => {
           cleanup();
-          resolve15(result);
+          resolve14(result);
         },
         reject: (error) => {
           cleanup();
@@ -12354,13 +12354,13 @@ var McpClient = class {
   }
   /** Promise 超时包装 */
   withTimeout(promise, ms, label) {
-    return new Promise((resolve15, reject) => {
+    return new Promise((resolve14, reject) => {
       const timer = setTimeout(() => {
         reject(new Error(`MCP [${this.serverId}] ${label} timed out after ${ms}ms`));
       }, ms);
       promise.then((val) => {
         clearTimeout(timer);
-        resolve15(val);
+        resolve14(val);
       }).catch((err) => {
         clearTimeout(timer);
         reject(err);
@@ -12864,33 +12864,33 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
   }
   /** Resolve a pending confirm from client response */
   resolveConfirm(requestId, approved) {
-    const resolve15 = this.pendingConfirms.get(requestId);
-    if (resolve15) {
+    const resolve14 = this.pendingConfirms.get(requestId);
+    if (resolve14) {
       this.clearPendingTimer(requestId);
       this.pendingConfirms.delete(requestId);
       this.confirming = false;
-      resolve15(approved);
+      resolve14(approved);
     }
   }
   /** Resolve a pending batch confirm from client response */
   resolveBatchConfirm(requestId, decision) {
-    const resolve15 = this.pendingBatchConfirms.get(requestId);
-    if (resolve15) {
+    const resolve14 = this.pendingBatchConfirms.get(requestId);
+    if (resolve14) {
       this.clearPendingTimer(requestId);
       this.pendingBatchConfirms.delete(requestId);
       this.confirming = false;
       if (decision === "all" || decision === "none") {
-        resolve15(decision);
+        resolve14(decision);
       } else {
-        resolve15(new Set(decision));
+        resolve14(new Set(decision));
       }
     }
   }
   /** Cancel all pending confirms (e.g., on disconnect) */
   cancelAll() {
-    for (const resolve15 of this.pendingConfirms.values()) resolve15(false);
+    for (const resolve14 of this.pendingConfirms.values()) resolve14(false);
     this.pendingConfirms.clear();
-    for (const resolve15 of this.pendingBatchConfirms.values()) resolve15("none");
+    for (const resolve14 of this.pendingBatchConfirms.values()) resolve14("none");
     this.pendingBatchConfirms.clear();
     this.confirming = false;
   }
@@ -12966,8 +12966,8 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
       diff: this.getDiffPreview(call)
     };
     this.send(msg);
-    return new Promise((resolve15) => {
-      this.pendingConfirms.set(requestId, resolve15);
+    return new Promise((resolve14) => {
+      this.pendingConfirms.set(requestId, resolve14);
       this.pendingTimers.set(requestId, setTimeout(() => {
         if (this.pendingConfirms.has(requestId)) {
           this.resolveConfirm(requestId, false);
@@ -12991,8 +12991,8 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
       files
     };
     this.send(msg);
-    return new Promise((resolve15) => {
-      this.pendingBatchConfirms.set(requestId, resolve15);
+    return new Promise((resolve14) => {
+      this.pendingBatchConfirms.set(requestId, resolve14);
       this.pendingTimers.set(requestId, setTimeout(() => {
         if (this.pendingBatchConfirms.has(requestId)) {
           this.resolveBatchConfirm(requestId, "none");
@@ -13661,8 +13661,8 @@ function loadContextFiles(options) {
 }
 
 // src/web/session-handler.ts
-import { mkdirSync as mkdirSync17, createWriteStream as createWriteStream4 } from "fs";
-import { join as join27, dirname as dirname11 } from "path";
+import { mkdirSync as mkdirSync16, createWriteStream as createWriteStream3 } from "fs";
+import { join as join26, dirname as dirname10 } from "path";
 
 // src/repl/commands/project-init.ts
 import { existsSync as existsSync26, readFileSync as readFileSync20, readdirSync as readdirSync11, statSync as statSync9 } from "fs";
@@ -14026,7 +14026,7 @@ ${topic}${contextSection}`;
         messages.push({
           role: "assistant",
           content: msg.content,
-          timestamp: msg.timestamp
+          timestamp: new Date(msg.timestamp)
         });
       } else {
         const prefix = `[${msg.speakerName} (${msg.speaker})]:`;
@@ -14034,7 +14034,7 @@ ${topic}${contextSection}`;
           role: "user",
           content: `${prefix}
 ${msg.content}`,
-          timestamp: msg.timestamp
+          timestamp: new Date(msg.timestamp)
         });
       }
     }
@@ -14429,14 +14429,14 @@ import { join as join21 } from "path";
 function discussionToMessages(state2) {
   const out = [];
   const t0 = state2.messages[0]?.timestamp ?? /* @__PURE__ */ new Date();
-  out.push({ role: "user", content: `\u{1F3DB} Topic: ${state2.topic}`, timestamp: t0 });
+  out.push({ role: "user", content: `\u{1F3DB} Topic: ${state2.topic}`, timestamp: new Date(t0) });
   for (const m of state2.messages) {
     if (m.speaker === "system") {
-      out.push({ role: "system", content: m.content, timestamp: m.timestamp });
+      out.push({ role: "system", content: m.content, timestamp: new Date(m.timestamp) });
       continue;
     }
     if (m.speaker === "human") {
-      out.push({ role: "user", content: `\u{1F9ED} ${m.speakerName}: ${m.content}`, timestamp: m.timestamp });
+      out.push({ role: "user", content: `\u{1F9ED} ${m.speakerName}: ${m.content}`, timestamp: new Date(m.timestamp) });
       continue;
     }
     if (m.passed || !m.content.trim()) continue;
@@ -14446,7 +14446,7 @@ function discussionToMessages(state2) {
       content: `**${m.speakerName}** (${m.speaker})${tag}
 
 ${m.content}`,
-      timestamp: m.timestamp
+      timestamp: new Date(m.timestamp)
     });
   }
   if (state2.summary && state2.summary.trim()) {
@@ -14468,1708 +14468,1726 @@ async function persistDiscussion(state2, config, defaultProvider, defaultModel)
 
 // 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"}` });
-    }
-    ctx.sendStatus();
+  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/session-commands.ts
-async function handleClear(args, ctx) {
-  ctx.saveIfNeeded();
-  ctx.sessions.createSession(ctx.currentProvider, ctx.currentModel);
-  ctx.resetWebSessionUsage();
-  ctx.send({ type: "info", message: "Conversation cleared." });
-  ctx.sendStatus();
-  ctx.sendSessionList();
+// src/web/commands/_shared.ts
+import { existsSync as existsSync29, readFileSync as readFileSync22, writeFileSync as writeFileSync3, mkdirSync as mkdirSync14, readdirSync as readdirSync13, statSync as statSync12, createWriteStream } from "fs";
+import { join as join24, resolve as resolve10, dirname as dirname8 } from "path";
+
+// src/cli/review-prompts.ts
+function buildReviewPrompt(diff, gitContextStr, detailed) {
+  const level = detailed ? "Please perform a detailed in-depth review covering: security, performance, maintainability, error handling, naming conventions, and code duplication." : "Please perform a concise code review focusing on bugs, security issues, and key improvement suggestions.";
+  return `# Code Review Request
+
+${level}
+
+## Git Status
+${gitContextStr}
+
+## Code Changes (diff)
+\`\`\`diff
+${diff}
+\`\`\`
+
+## Output Format
+Please structure your review as follows:
+1. **Overall Assessment**: One-sentence summary of the change quality
+2. **Issues** (if any): Each issue with [Severity] file:line \u2014 description + suggested fix
+3. **Improvement Suggestions** (if any): Non-critical but recommended optimizations
+4. **Highlights** (if any): Good practices worth acknowledging
+
+Severity levels: \u{1F534} Critical / \u{1F7E1} Warning / \u{1F535} Info`;
 }
-async function handleCompact(args, ctx) {
-  await ctx.compactSession(args.join(" ") || void 0);
+function buildSecurityReviewPrompt(diff, gitContextStr) {
+  return `# Security Vulnerability Review
+
+Analyze the following code changes **exclusively for security vulnerabilities**.
+
+## Categories to check:
+1. **Injection** \u2014 SQL, command, path traversal, XSS, template injection
+2. **Authentication & Authorization** \u2014 hardcoded credentials, missing auth checks, privilege escalation
+3. **Secrets & Sensitive Data** \u2014 API keys, tokens, passwords in code, logging sensitive data
+4. **Input Validation** \u2014 missing validation, unsafe deserialization, buffer issues
+5. **Cryptography** \u2014 weak algorithms, improper random, hardcoded IVs/salts
+6. **Dependencies** \u2014 known vulnerable packages, unsafe dynamic imports
+7. **File System** \u2014 path traversal, unsafe file permissions, symlink attacks
+8. **Network** \u2014 SSRF, insecure protocols, missing TLS validation
+
+## Git Status
+${gitContextStr}
+
+## Code Changes (diff)
+\`\`\`diff
+${diff}
+\`\`\`
+
+## Output Format
+For each finding:
+- **Severity**: \u{1F534} CRITICAL / \u{1F7E0} HIGH / \u{1F7E1} MEDIUM / \u{1F535} LOW / \u2139\uFE0F INFO
+- **Category**: (from list above)
+- **File & location**: file:line
+- **Description**: what the vulnerability is and how it could be exploited
+- **Recommended fix**: specific code change to resolve
+
+If no security issues found, state "\u2705 No security vulnerabilities detected" with a brief explanation of what was checked.`;
 }
-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 ? `
-Cost:   ${formatCost(cost)}` : "";
-    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}`
-    });
-  }
+
+// src/core/git-diff.ts
+import { execFileSync as execFileSync3 } from "child_process";
+function readGitDiff(options = {}) {
+  const args = ["diff"];
+  if (options.staged) args.push("--staged");
+  return execFileSync3("git", args, {
+    encoding: "utf-8",
+    timeout: options.timeoutMs ?? 1e4
+  }).trim();
 }
-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);
-      ctx.resetWebSessionUsage();
-      ctx.send({ type: "info", message: "New session created." });
-      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.'
-            });
-          }
-        }
-        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.sendSessionList();
-    } else 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();
-      }
-      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}` });
-      }
-    } 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.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>" });
-    }
-  }
+
+// src/diagnostics/doctor-report.ts
+import { existsSync as existsSync28, statSync as statSync11 } from "fs";
+import { join as join23 } from "path";
+import { arch as arch2, platform as platform6, release as release2 } from "os";
+
+// src/diagnostics/crash-log.ts
+import {
+  existsSync as existsSync27,
+  mkdirSync as mkdirSync13,
+  readdirSync as readdirSync12,
+  readFileSync as readFileSync21,
+  statSync as statSync10,
+  unlinkSync as unlinkSync6,
+  writeFileSync as writeFileSync2
+} from "fs";
+import { join as join22 } from "path";
+import { homedir as homedir8, platform as platform5, release, arch } from "os";
+var LOGS_DIR_NAME = "logs";
+var CRASH_LOG_PREFIX = "crash-";
+function getLogsDir(configDir) {
+  const base = configDir ?? join22(homedir8(), CONFIG_DIR_NAME);
+  return join22(base, LOGS_DIR_NAME);
 }
-async function handleExport(args, ctx) {
-  {
-    const format = args[0] === "json" ? "json" : "md";
-    ctx.exportConversation(format);
-  }
+function truncate(s, n) {
+  return s.length <= n ? s : s.slice(0, n) + "\u2026";
 }
-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
+function listRecentCrashes(limit = 10, configDir) {
+  const dir = getLogsDir(configDir);
+  if (!existsSync27(dir)) return [];
+  const files = [];
+  let names;
+  try {
+    names = readdirSync12(dir);
+  } catch {
+    return [];
+  }
+  for (const name of names) {
+    if (!name.startsWith(CRASH_LOG_PREFIX) || !name.endsWith(".log")) continue;
+    const full = join22(dir, name);
+    try {
+      const st = statSync10(full);
+      const head = readFileSync21(full, "utf-8").split("\n").slice(0, 20);
+      const tsLine = head.find((l) => l.startsWith("timestamp:"));
+      const kindLine = head.find((l) => l.startsWith("kind:"));
+      const msgIdx = head.findIndex((l) => l.trim() === "## message");
+      const message = msgIdx >= 0 && head[msgIdx + 1] ? head[msgIdx + 1] : "";
+      files.push({
+        file: full,
+        timestamp: tsLine ? tsLine.replace("timestamp:", "").trim() : st.mtime.toISOString(),
+        kind: kindLine ? kindLine.replace("kind:", "").trim() : "unknown",
+        message: truncate(message, 200),
+        sizeBytes: st.size
       });
-      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)`);
+    } catch {
     }
-    ctx.send({ type: "info", message: lines.join("\n") });
   }
+  files.sort((a, b) => a.timestamp < b.timestamp ? 1 : -1);
+  return files.slice(0, limit);
 }
-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 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.` });
-      }
-    } else {
-      ctx.send({ type: "error", message: `Unknown subcommand: ${sub}. Use save/restore/list/delete.` });
-    }
+function getConfigDirUsage(configDir) {
+  const base = configDir ?? join22(homedir8(), CONFIG_DIR_NAME);
+  if (!existsSync27(base)) return { totalBytes: 0, entries: [] };
+  const entries = [];
+  let total = 0;
+  let names;
+  try {
+    names = readdirSync12(base);
+  } catch {
+    return { totalBytes: 0, entries: [] };
+  }
+  for (const name of names) {
+    const full = join22(base, name);
+    const bytes = dirSize(full);
+    entries.push({ name, bytes });
+    total += bytes;
   }
+  entries.sort((a, b) => b.bytes - a.bytes);
+  return { totalBytes: total, entries };
 }
-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 resolve15 = (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") });
-    }
-    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 });
-      }
-    }
-    if (sub === "switch") {
-      const ref = args[1];
-      if (!ref) {
-        ctx.send({ type: "error", message: "Usage: /branch switch <id|title>" });
-      }
-      const id = resolve15(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).` });
-      }
-    }
-    if (sub === "delete") {
-      const ref = args[1];
-      if (!ref) {
-        ctx.send({ type: "error", message: "Usage: /branch delete <id|title>" });
-      }
-      const id = resolve15(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).` });
-      }
-    }
-    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 = resolve15(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.` });
-      }
-    }
-    if (sub === "diff") {
-      const ref = args[1];
-      if (!ref) {
-        ctx.send({ type: "error", message: "Usage: /branch diff <id|title>" });
-      }
-      const id = resolve15(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") });
-    }
-    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 = resolve15(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}".` });
-      }
-      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}` });
-      ctx.sendSessionMessages();
-      ctx.sendStatus();
+function dirSize(path3) {
+  try {
+    const st = statSync10(path3);
+    if (st.isFile()) return st.size;
+    if (!st.isDirectory()) return 0;
+    let sum = 0;
+    for (const name of readdirSync12(path3)) {
+      sum += dirSize(join22(path3, name));
     }
-    ctx.send({ type: "error", message: `Unknown subcommand: ${sub}. Use list/new/switch/delete/rename/diff/cherry-pick.` });
+    return sum;
+  } catch {
+    return 0;
   }
 }
-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)`;
-    }
+
+// src/diagnostics/doctor-report.ts
+function checkFile(label, path3) {
+  const exists = existsSync28(path3);
+  let sizeBytes = null;
+  if (exists) {
     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}` });
+      sizeBytes = statSync11(path3).size;
+    } catch {
     }
   }
+  return { label, path: path3, exists, sizeBytes };
 }
-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 cpIndices = (await import("./file-checkpoint-CGH6OJVI.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-CGH6OJVI.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.");
+function buildDoctorReport(options) {
+  const config = options.config;
+  const cwd = options.cwd ?? process.cwd();
+  const configDir = config.getConfigDir();
+  const projectRoot = getGitRoot(cwd) ?? cwd;
+  const contextCfg = config.get("context");
+  const contextSetting = config.get("contextFile");
+  const context = loadContextFiles({
+    cwd,
+    configDir,
+    projectRoot,
+    setting: contextSetting,
+    maxBytes: contextCfg.projectDocMaxBytes,
+    fallbackFilenames: contextCfg.projectDocFallbackFilenames
+  });
+  const hooksConfig = config.get("hooks");
+  const hooks = listHooks(hooksConfig, configDir);
+  const pendingHooks = getPendingHookTrust(hooksConfig, configDir);
+  const plugins = listInstalledPlugins(configDir);
+  const activeAssets = getActivePluginAssets(configDir);
+  const network = config.get("networkPolicy");
+  const mcpServers = config.get("mcpServers");
+  const allStats = getStatsSnapshot();
+  return {
+    version: VERSION,
+    npmCheck: options.npmCheck,
+    node: process.version,
+    platform: `${platform6()} ${release2()} (${arch2()})`,
+    cwd,
+    projectRoot,
+    configDir,
+    providers: options.providers.listAll().map((p) => ({ id: p.id, displayName: p.displayName, configured: p.configured })),
+    files: [
+      checkFile("config.json", join23(configDir, "config.json")),
+      checkFile("memory.md", join23(configDir, MEMORY_FILE_NAME)),
+      checkFile("memory.jsonl", join23(configDir, "memory.jsonl")),
+      checkFile("dev-state.md", join23(configDir, DEV_STATE_FILE_NAME)),
+      checkFile("hooks-trust.json", join23(configDir, "hooks-trust.json")),
+      checkFile("plugin-state.json", join23(configDir, "plugins", "plugin-state.json"))
+    ],
+    context: {
+      enabled: contextSetting !== false,
+      setting: contextSetting,
+      candidates: context.candidates,
+      maxBytes: context.maxBytes,
+      layers: context.layers.map((l) => ({ level: l.level, fileName: l.fileName, displayPath: l.displayPath, bytes: l.byteCount, chars: l.charCount, truncated: l.truncated })),
+      skipped: context.skipped.map((s) => ({ level: s.level, fileName: s.fileName, displayPath: s.displayPath, reason: s.reason, message: s.message }))
+    },
+    permissions: {
+      defaultProfile: config.get("defaultPermissionProfile"),
+      allowedProfiles: config.get("allowedPermissionProfiles"),
+      customProfileCount: Object.keys(config.get("permissionProfiles")).length,
+      legacyDefaultAction: config.get("defaultPermission"),
+      ruleCount: config.get("permissionRules").length
+    },
+    networkPolicy: {
+      enabled: network.enabled,
+      defaultAction: network.defaultAction,
+      allowDomains: network.allowDomains.length,
+      denyDomains: network.denyDomains.length,
+      allowPorts: network.allowPorts.length,
+      denyPorts: network.denyPorts.length,
+      allowPrivateNetwork: network.allowPrivateNetwork,
+      toolOverrides: Object.fromEntries(Object.entries(network.tools).filter(([, v]) => v !== void 0))
+    },
+    hooks: {
+      enabled: hooksConfig?.enabled !== false,
+      total: hooks.length,
+      project: hooks.filter((h) => h.source === "project").length,
+      pendingTrust: pendingHooks.length,
+      disabled: hooks.filter((h) => h.disabled).length
+    },
+    plugins: {
+      root: join23(configDir, "plugins"),
+      installed: plugins.length,
+      active: activeAssets.plugins.length,
+      invalid: plugins.filter((p) => !p.valid).length,
+      untrusted: plugins.filter((p) => p.valid && !p.trusted).length,
+      disabled: plugins.filter((p) => p.valid && !p.enabled).length,
+      mcpServers: Object.keys(activeAssets.mcpServers).length,
+      skillDirs: activeAssets.skillDirs.length,
+      commandDirs: activeAssets.commandDirs.length,
+      agentDirs: activeAssets.agentDirs.length,
+      entries: plugins.map((p) => ({ name: p.name, version: p.manifest.version, enabled: p.enabled, trusted: p.trusted, valid: p.valid, error: p.error }))
+    },
+    mcp: {
+      enabled: config.get("mcpEnabled"),
+      configured: Object.keys(mcpServers).length,
+      projectConfigExists: existsSync28(join23(projectRoot, MCP_PROJECT_CONFIG_NAME)),
+      statuses: options.mcpStatuses ?? []
+    },
+    recentCrashes: listRecentCrashes(5, configDir),
+    diskUsage: getConfigDirUsage(configDir),
+    toolStats: {
+      totalCalls: allStats.reduce((a, b) => a + b.calls, 0),
+      totalFailures: allStats.reduce((a, b) => a + b.failures, 0),
+      topUsed: getTopUsedTools(5),
+      topFailing: getTopFailingTools(5)
     }
-    ctx.send({ type: "info", message: rewindLines.join("\n") });
-    ctx.sendSessionMessages();
-    ctx.sendStatus();
-  }
+  };
 }
 
-// src/web/commands/tooling-commands.ts
-import { existsSync as existsSync27, readdirSync as readdirSync12 } from "fs";
-import { join as join22 } from "path";
-async function handleTools(args, ctx) {
-  ctx.sendToolsList();
+// src/diagnostics/doctor-cli.ts
+function formatBytes(n) {
+  if (n < 1024) return `${n} B`;
+  if (n < 1024 * 1024) return `${(n / 1024).toFixed(1)} KB`;
+  if (n < 1024 * 1024 * 1024) return `${(n / 1024 / 1024).toFixed(1)} MB`;
+  return `${(n / 1024 / 1024 / 1024).toFixed(2)} GB`;
 }
-async function handlePlugins(args, ctx) {
-  {
-    const configDir = ctx.config.getConfigDir();
-    const pluginsDir = join22(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}`);
-      }
+function formatDoctorReport(report, ansi = true) {
+  const wrap = (code, s) => ansi ? `${code}${s}\x1B[0m` : s;
+  const B = (s) => wrap("\x1B[1m", s);
+  const D = (s) => wrap("\x1B[2m", s);
+  const G = (s) => wrap("\x1B[32m", s);
+  const Y = (s) => wrap("\x1B[33m", s);
+  const R = (s) => wrap("\x1B[31m", s);
+  const out = [];
+  out.push("");
+  out.push(B("\u{1FA7A} AI-CLI Health Check"));
+  out.push("");
+  const nc = report.npmCheck;
+  let versionLine = `  version:  ${report.version}`;
+  if (nc?.status === "up-to-date") versionLine += `  ${D("(latest on npm)")}`;
+  else if (nc?.status === "outdated" && nc.latest) versionLine += `  ${Y(`\u2192 ${nc.latest} available`)}  ${D("(npm i -g jinzd-ai-cli@latest)")}`;
+  else if (nc?.status === "skipped") versionLine += `  ${D(`(npm check skipped: ${nc.reason ?? "unknown"})`)}`;
+  out.push(versionLine);
+  out.push(`  node:     ${report.node}`);
+  out.push(`  platform: ${report.platform}`);
+  out.push(`  cwd:      ${report.cwd}`);
+  out.push(`  project:  ${report.projectRoot}`);
+  out.push(`  config:   ${report.configDir}`);
+  out.push("");
+  out.push(B("API Keys:"));
+  for (const p of report.providers) {
+    out.push(`  ${p.configured ? G("\u2713") : D("\u25CB")}  ${p.id.padEnd(14)} ${p.configured ? G("configured") : D("not configured")}`);
+  }
+  out.push("");
+  out.push(B("Context Files:"));
+  out.push(`  status: ${report.context.enabled ? G("enabled") : D("disabled")} \xB7 max ${formatBytes(report.context.maxBytes)}`);
+  if (report.context.layers.length === 0) out.push(`  ${D("(no context files loaded)")}`);
+  for (const l of report.context.layers) {
+    out.push(`  ${G("\u2713")}  ${l.level.padEnd(7)} ${l.displayPath} ${D(`(${formatBytes(l.bytes)}${l.truncated ? ", truncated" : ""})`)}`);
+  }
+  if (report.context.skipped.length > 0) {
+    out.push(`  ${D("skipped:")}`);
+    for (const s of report.context.skipped.slice(0, 5)) {
+      out.push(`    ${Y("!")} ${s.level}:${s.fileName} ${s.reason}${s.message ? ` \xB7 ${s.message}` : ""}`);
     }
-    ctx.send({ type: "info", message: lines.join("\n") });
   }
+  out.push("");
+  out.push(B("Permissions / Network:"));
+  out.push(`  profile: ${report.permissions.defaultProfile} \xB7 allowed ${report.permissions.allowedProfiles.join(", ")} \xB7 rules ${report.permissions.ruleCount} \xB7 custom profiles ${report.permissions.customProfileCount}`);
+  const np = report.networkPolicy;
+  out.push(`  networkPolicy: ${np.enabled ? G("enabled") : D("disabled")} \xB7 default ${np.defaultAction} \xB7 allow ${np.allowDomains} domain(s)/${np.allowPorts} port(s) \xB7 deny ${np.denyDomains} domain(s)/${np.denyPorts} port(s) \xB7 private ${np.allowPrivateNetwork ? "allow" : "block/confirm"}`);
+  const overrides = Object.entries(np.toolOverrides).map(([k, v]) => `${k}=${v}`).join(", ");
+  if (overrides) out.push(`  tool overrides: ${overrides}`);
+  out.push("");
+  out.push(B("Hooks / Plugins:"));
+  out.push(`  hooks: ${report.hooks.enabled ? G("enabled") : D("disabled")} \xB7 total ${report.hooks.total} \xB7 project ${report.hooks.project} \xB7 pending trust ${report.hooks.pendingTrust} \xB7 disabled ${report.hooks.disabled}`);
+  out.push(`  plugins: installed ${report.plugins.installed} \xB7 active ${report.plugins.active} \xB7 disabled ${report.plugins.disabled} \xB7 untrusted ${report.plugins.untrusted} \xB7 invalid ${report.plugins.invalid}`);
+  out.push(`  plugin assets: ${report.plugins.skillDirs} skill dir(s), ${report.plugins.commandDirs} command dir(s), ${report.plugins.agentDirs} agent dir(s), ${report.plugins.mcpServers} MCP server(s)`);
+  if (report.plugins.entries.length > 0) {
+    for (const p of report.plugins.entries.slice(0, 5)) {
+      const state2 = p.valid ? `${p.enabled ? "enabled" : "disabled"} \xB7 ${p.trusted ? "trusted" : "untrusted"}` : `invalid \xB7 ${p.error ?? ""}`;
+      out.push(`    ${p.valid ? G("\u2713") : R("\u2717")} ${p.name}@${p.version} ${D(state2)}`);
+    }
+  }
+  out.push("");
+  out.push(B("MCP Servers:"));
+  out.push(`  global configured: ${report.mcp.configured} \xB7 project .mcp.json: ${report.mcp.projectConfigExists ? "yes" : "no"} \xB7 mcpEnabled: ${report.mcp.enabled ? "true" : "false"}`);
+  if (report.mcp.statuses.length === 0) out.push(`  ${D("(no connected manager status in this mode)")}`);
+  for (const s of report.mcp.statuses) {
+    const state2 = s.connected ? `${G("connected")} \xB7 ${s.serverName} \xB7 ${s.toolCount} tools` : `${R("disconnected")}${s.error ? D(` \xB7 ${s.error}`) : ""}`;
+    out.push(`  ${s.connected ? G("\u2713") : R("\u2717")}  ${s.serverId.padEnd(16)} ${state2}`);
+  }
+  out.push("");
+  out.push(B("Config Files:"));
+  for (const f of report.files) {
+    const extra = f.exists && f.sizeBytes !== null ? ` ${D(`(${formatBytes(f.sizeBytes)})`)}` : "";
+    out.push(`  ${f.exists ? G("\u2713") : D("\u2013")}  ${f.label.padEnd(16)} ${f.exists ? f.path : D("(not found)")}${extra}`);
+  }
+  out.push("");
+  out.push(B("Recent Crashes (last 5):"));
+  if (report.recentCrashes.length === 0) out.push(`  ${D("(none - clean!)")}`);
+  for (const c of report.recentCrashes) {
+    out.push(`  ${R("\u2717")}  ${c.timestamp}  ${Y(c.kind)}`);
+    out.push(`     ${D(c.message)}`);
+    out.push(`     ${D(c.file)}`);
+  }
+  out.push("");
+  const ts = report.toolStats;
+  out.push(B("Tool Usage:"));
+  out.push(`  total: ${ts.totalCalls} calls \xB7 ${ts.totalFailures} failures (${ts.totalCalls ? (ts.totalFailures * 100 / ts.totalCalls).toFixed(1) : "0.0"}%)`);
+  if (ts.topUsed.length > 0) {
+    out.push(`  ${D("top used:")}`);
+    for (const t of ts.topUsed) out.push(`    ${t.name.padEnd(20)} ${String(t.calls).padStart(6)} calls \xB7 avg ${t.calls ? (t.totalDurationMs / t.calls).toFixed(0) : "0"}ms`);
+  }
+  if (ts.topFailing.length > 0) {
+    out.push(`  ${D("top failing:")}`);
+    for (const t of ts.topFailing) out.push(`    ${R(t.name.padEnd(20))} ${t.failures}/${t.calls} (${(t.failures * 100 / Math.max(1, t.calls)).toFixed(1)}%)  ${D(t.lastFailureMessage ?? "")}`.slice(0, 200));
+  }
+  out.push("");
+  const dirAnnotations = {
+    models: "semantic search model -> /index semantic-clear",
+    index: "symbol index -> /index clear",
+    history: "conversation history",
+    logs: "crash logs",
+    "memory-index": "chat memory index -> /memory index-clear",
+    plugins: "installed package plugins"
+  };
+  out.push(B("Disk Usage (~/.aicli):"));
+  out.push(`  total: ${formatBytes(report.diskUsage.totalBytes)}`);
+  for (const e of report.diskUsage.entries.slice(0, 10)) {
+    const note = dirAnnotations[e.name];
+    out.push(`    ${e.name.padEnd(18)} ${formatBytes(e.bytes)}${note ? `  ${D(`\xB7 ${note}`)}` : ""}`);
+  }
+  out.push("");
+  out.push(G("\u2713 Health check complete"));
+  out.push("");
+  return out.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 state2 = trustPlugin(configDir, name);
-        ctx.send({ type: "info", message: `Trusted plugin ${state2.name}.` });
-      }
-      if (sub === "enable" || sub === "disable") {
-        const name = args[1];
-        if (!name) throw new Error(`Usage: /plugin ${sub} <name>`);
-        const state2 = setPluginEnabled(configDir, name, sub === "enable");
-        ctx.send({ type: "info", message: `${sub === "enable" ? "Enabled" : "Disabled"} plugin ${state2.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) });
+
+// src/web/commands/_shared.ts
+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;
 }
-async function handleMcp(args, ctx) {
-  {
-    if (!ctx.mcpManager) {
-      ctx.send({ type: "info", message: "MCP not configured. Add mcpServers to config.json." });
+
+// src/web/commands/session-commands.ts
+async function handleClear(_args, ctx) {
+  ctx.saveIfNeeded();
+  ctx.sessions.createSession(ctx.currentProvider, ctx.currentModel);
+  ctx.resetWebSessionUsage();
+  ctx.send({ type: "info", message: "Conversation cleared." });
+  ctx.sendStatus();
+  ctx.sendSessionList();
+}
+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 ? `
+Cache:  write=${cacheCreate} read=${cacheRead}` : "";
+  const costLine = cost != null ? `
+Cost:   ${formatCost(cost)}` : "";
+  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);
+    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: `Loaded session: ${cached.id.slice(0, 8)} "${cached.title ?? ""}" (${cached.messages.length} messages)`
+      });
+      ctx.sendSessionMessages();
+      ctx.sendStatus();
+      ctx.sendSessionList();
+      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}` });
+    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.sendToolsList();
-    }
-    const statuses = ctx.mcpManager.getStatus();
-    if (statuses.length === 0) {
-      ctx.send({ type: "info", message: "No MCP servers configured." });
-    }
-    const lines = [`\u{1F50C} **MCP Servers (${statuses.length}):**`, ""];
-    for (const s of statuses) {
-      const state2 = s.connected ? `\u2713 connected \xB7 ${s.serverName} \xB7 ${s.toolCount} tools` : `\u2717 disconnected${s.error ? ` \xB7 ${s.error}` : ""}`;
-      lines.push(`  ${s.serverId}: ${state2}`);
+      ctx.sendSessionMessages();
+      ctx.sendStatus();
+      ctx.sendSessionList();
+      return;
     }
-    lines.push("");
-    lines.push("Use /mcp reconnect to reconnect.");
-    ctx.send({ type: "info", message: lines.join("\n") });
+    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;
   }
-}
-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")}` });
+  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();
       }
-    } 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();
+      ctx.send({ type: "info", message: `Deleted session: ${cachedKey.slice(0, 8)}` });
+      ctx.sendSessionList();
+      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 {
-      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}` });
-      }
+      ctx.send({ type: "error", message: `Session not found: ${targetId}` });
     }
+    return;
   }
-}
-async function handleCommands(args, ctx) {
-  {
-    const configDir = ctx.config.getConfigDir();
-    const commandsDir = join22(configDir, CUSTOM_COMMANDS_DIR_NAME);
-    if (!existsSync27(commandsDir)) {
-      ctx.send({ type: "info", message: `No custom commands directory.
-Create: ${commandsDir}/ with .md files.` });
+  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;
     }
-    try {
-      const files = readdirSync12(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") });
+    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++;
       }
-    } catch {
-      ctx.send({ type: "info", message: `Cannot read: ${commandsDir}` });
     }
+    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 {
+      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>" });
 }
-
-// src/web/commands/review-commands.ts
-import { existsSync as existsSync28, readFileSync as readFileSync22, writeFileSync as writeFileSync3 } from "fs";
-import { join as join23 } from "path";
-
-// src/cli/review-prompts.ts
-function buildReviewPrompt(diff, gitContextStr, detailed) {
-  const level = detailed ? "Please perform a detailed in-depth review covering: security, performance, maintainability, error handling, naming conventions, and code duplication." : "Please perform a concise code review focusing on bugs, security issues, and key improvement suggestions.";
-  return `# Code Review Request
-
-${level}
-
-## Git Status
-${gitContextStr}
-
-## Code Changes (diff)
-\`\`\`diff
-${diff}
-\`\`\`
-
-## Output Format
-Please structure your review as follows:
-1. **Overall Assessment**: One-sentence summary of the change quality
-2. **Issues** (if any): Each issue with [Severity] file:line \u2014 description + suggested fix
-3. **Improvement Suggestions** (if any): Non-critical but recommended optimizations
-4. **Highlights** (if any): Good practices worth acknowledging
-
-Severity levels: \u{1F534} Critical / \u{1F7E1} Warning / \u{1F535} Info`;
-}
-function buildSecurityReviewPrompt(diff, gitContextStr) {
-  return `# Security Vulnerability Review
-
-Analyze the following code changes **exclusively for security vulnerabilities**.
-
-## Categories to check:
-1. **Injection** \u2014 SQL, command, path traversal, XSS, template injection
-2. **Authentication & Authorization** \u2014 hardcoded credentials, missing auth checks, privilege escalation
-3. **Secrets & Sensitive Data** \u2014 API keys, tokens, passwords in code, logging sensitive data
-4. **Input Validation** \u2014 missing validation, unsafe deserialization, buffer issues
-5. **Cryptography** \u2014 weak algorithms, improper random, hardcoded IVs/salts
-6. **Dependencies** \u2014 known vulnerable packages, unsafe dynamic imports
-7. **File System** \u2014 path traversal, unsafe file permissions, symlink attacks
-8. **Network** \u2014 SSRF, insecure protocols, missing TLS validation
-
-## Git Status
-${gitContextStr}
-
-## Code Changes (diff)
-\`\`\`diff
-${diff}
-\`\`\`
-
-## Output Format
-For each finding:
-- **Severity**: \u{1F534} CRITICAL / \u{1F7E0} HIGH / \u{1F7E1} MEDIUM / \u{1F535} LOW / \u2139\uFE0F INFO
-- **Category**: (from list above)
-- **File & location**: file:line
-- **Description**: what the vulnerability is and how it could be exploited
-- **Recommended fix**: specific code change to resolve
-
-If no security issues found, state "\u2705 No security vulnerabilities detected" with a brief explanation of what was checked.`;
-}
-
-// src/core/git-diff.ts
-import { execFileSync as execFileSync3 } from "child_process";
-function readGitDiff(options = {}) {
-  const args = ["diff"];
-  if (options.staged) args.push("--staged");
-  return execFileSync3("git", args, {
-    encoding: "utf-8",
-    timeout: options.timeoutMs ?? 1e4
-  }).trim();
+async function handleExport(args, ctx) {
+  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)`);
+  }
+  ctx.send({ type: "info", message: lines.join("\n") });
 }
-
-// src/web/commands/review-commands.ts
-async function handleReview(args, ctx) {
-  {
-    const gitCtx = getGitContext();
-    if (!gitCtx) {
-      ctx.send({ type: "error", message: "Not a git repository." });
+async function handleCheckpoint(args, ctx) {
+  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 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;
+  }
+  const cpName = args.slice(1).join(" ").trim();
+  if (sub === "save") {
+    if (!cpName) {
+      ctx.send({ type: "error", message: "Usage: /checkpoint save <name>" });
+      return;
     }
-    if (!diff) {
-      ctx.send({ type: "info", message: "No changes to review." + (staged ? "" : " Try --staged for staged changes.") });
+    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: `Checkpoint "${cpName}" not found.` });
     }
-    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;
+  } else if (sub === "delete") {
+    if (!cpName) {
+      ctx.send({ type: "error", message: "Usage: /checkpoint delete <name>" });
+      return;
     }
-    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 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 handleSecurityReview(args, ctx) {
-  {
-    const gitCtx = getGitContext();
-    if (!gitCtx) {
-      ctx.send({ type: "error", message: "Not a git repository." });
+async function handleBranch(args, ctx) {
+  const session = ctx.sessions.current;
+  if (!session) {
+    ctx.send({ type: "error", message: "No active session." });
+    return;
+  }
+  const sub = args[0]?.toLowerCase();
+  const resolve14 = (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.` });
     }
-    const secStaged = args.includes("--staged");
-    let secDiff;
-    try {
-      secDiff = readGitDiff({ staged: secStaged });
-    } catch {
-      ctx.send({ type: "error", message: "Failed to run git diff." });
+    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 (!secDiff) {
-      ctx.send({ type: "info", message: "No changes to review." + (secStaged ? "" : " Try --staged for staged changes.") });
+    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;
     }
-    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 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;
     }
-    const secPrompt = buildSecurityReviewPrompt(secDiff, formatGitContextForPrompt(gitCtx));
-    ctx.send({ type: "info", message: "\u{1F512} Scanning for security vulnerabilities..." });
+    const title = args.slice(2).join(" ").trim() || void 0;
     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 });
+      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: `Security review failed: ${err.message}` });
+      ctx.send({ type: "error", message: err.message });
     }
+    return;
   }
-}
-async function handleTest(args, ctx) {
-  {
-    ctx.send({ type: "info", message: "\u{1F9EA} Running tests..." });
-    try {
-      const { executeTests } = await import("./run-tests-NIY24YDP.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}` });
+  if (sub === "switch") {
+    const ref = args[1];
+    if (!ref) {
+      ctx.send({ type: "error", message: "Usage: /branch switch <id|title>" });
+      return;
+    }
+    const id = resolve14(ref);
+    if (!id) return;
+    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).` });
     }
+    return;
   }
-}
-async function handleDiff(args, ctx) {
-  {
-    const history = undoStack.getHistory();
-    if (history.length === 0) {
-      ctx.send({ type: "info", message: "No file modifications in this session." });
+  if (sub === "delete") {
+    const ref = args[1];
+    if (!ref) {
+      ctx.send({ type: "error", message: "Usage: /branch delete <id|title>" });
+      return;
     }
-    const fileMap = /* @__PURE__ */ new Map();
-    for (const entry of history) {
-      if (!fileMap.has(entry.filePath)) {
-        fileMap.set(entry.filePath, { earliest: entry.previousContent });
-      }
+    const id = resolve14(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).` });
     }
-    const statsOnly = args[0]?.toLowerCase() === "--stats";
-    let newFiles = 0;
-    let modifiedFiles = 0;
-    const diffLines2 = [];
-    for (const [filePath, { earliest }] of fileMap) {
-      const currentContent = existsSync28(filePath) ? (() => {
-        try {
-          return readFileSync22(filePath, "utf-8");
-        } catch {
-          return null;
-        }
-      })() : null;
-      const isNew = earliest === null;
-      if (isNew) newFiles++;
-      else modifiedFiles++;
-      if (statsOnly) continue;
-      if (isNew) {
-        diffLines2.push(`
-\u{1F4C4} [NEW] ${filePath}`);
-        if (currentContent !== null) {
-          diffLines2.push(`  ${currentContent.split("\n").length} lines`);
-        } else {
-          diffLines2.push("  (file was deleted after creation)");
-        }
-      } else {
-        diffLines2.push(`
-\u{1F4DD} [MODIFIED] ${filePath}`);
-        const oldText = earliest ?? "";
-        const newText = currentContent ?? "";
-        if (oldText === newText) {
-          diffLines2.push("  (no net change)");
-        } else {
-          diffLines2.push(renderDiff(oldText, newText, { filePath, maxLines: 80 }));
-        }
+    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 = resolve14(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 = resolve14(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.`);
     }
-    diffLines2.push(`
-**Summary:** ${fileMap.size} file(s) \u2014 ${newFiles} new, ${modifiedFiles} modified`);
-    ctx.send({ type: "info", message: diffLines2.join("\n") });
+    ctx.send({ type: "info", message: lines.join("\n") });
+    return;
   }
-}
-async function handleInit(args, ctx) {
-  {
-    const cwd = process.cwd();
-    const targetPath = join23(cwd, "AICLI.md");
-    const force = args.includes("--force");
-    if (existsSync28(targetPath) && !force) {
-      ctx.send({ type: "info", message: `AICLI.md already exists at ${targetPath}
-Use /init --force to overwrite.` });
+  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: "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 });
-      writeFileSync3(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}` });
+    const id = resolve14(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 handleScaffold(args, ctx) {
-  {
-    const description = args.join(" ").trim();
-    if (!description) {
-      ctx.send({ type: "error", message: "Usage: /scaffold <project description>" });
+async function handleFork(args, ctx) {
+  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;
     }
-    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);
+    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}` });
   }
 }
+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." });
+    return;
+  }
+  const rewindSub = args[0];
+  if (rewindSub === "list" || !rewindSub) {
+    const lines = [`Conversation messages (${session.messages.length} total):
+`];
+    const cpIndices = (await import("./file-checkpoint-CGH6OJVI.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-CGH6OJVI.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/memory-commands.ts
-import { existsSync as existsSync29, statSync as statSync12 } from "fs";
-import { resolve as resolve12 } 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):
-
-${preview}` });
-      } else {
-        ctx.send({ type: "info", message: "No custom system prompt set. Using default.\nUsage: /system <prompt>" });
-      }
+// src/web/commands/tooling-commands.ts
+async function handleTools(_args, ctx) {
+  ctx.sendToolsList();
+}
+async function handlePlugins(_args, ctx) {
+  const configDir = ctx.config.getConfigDir();
+  const pluginsDir = join24(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 (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).` });
+    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") });
 }
-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");
+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") });
+      return;
     }
-    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})` : ""}`);
-      }
+    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;
     }
-    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") });
+    if (sub === "trust") {
+      const name = args[1];
+      if (!name) throw new Error("Usage: /plugin trust <name>");
+      const state2 = trustPlugin(configDir, name);
+      ctx.send({ type: "info", message: `Trusted plugin ${state2.name}.` });
+      return;
+    }
+    if (sub === "enable" || sub === "disable") {
+      const name = args[1];
+      if (!name) throw new Error(`Usage: /plugin ${sub} <name>`);
+      const state2 = setPluginEnabled(configDir, name, sub === "enable");
+      ctx.send({ type: "info", message: `${sub === "enable" ? "Enabled" : "Disabled"} plugin ${state2.name}. Restart Web UI for changes to take effect.` });
+      return;
+    }
+    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;
+    }
+    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 handleIndex(args, ctx) {
-  {
-    const sub = (args[0] ?? "status").toLowerCase();
-    const root = process.cwd();
-    const { loadIndex: loadIndex2, clearIndex } = await import("./store-VO37H6LS.js");
-    const { indexProject: indexProject2 } = await import("./indexer-4WWS3VIL.js");
-    const { loadVectorStore, clearVectorStore } = await import("./vector-store-JBAE6PS4.js");
-    if (sub === "status") {
-      const idx = loadIndex2(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 indexProject2(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 = loadIndex2(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."
-        });
-      }
-      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-FF6DDJI6.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)" });
+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 state2 = s.connected ? `\u2713 connected \xB7 ${s.serverName} \xB7 ${s.toolCount} tools` : `\u2717 disconnected${s.error ? ` \xB7 ${s.error}` : ""}`;
+    lines.push(`  ${s.serverId}: ${state2}`);
+  }
+  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 {
-      ctx.send({
-        type: "error",
-        message: `Unknown subcommand: ${sub}. Use status/rebuild/clear/semantic-rebuild/semantic-clear.`
+      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 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();
+async function handleCommands(_args, ctx) {
+  const configDir = ctx.config.getConfigDir();
+  const commandsDir = join24(configDir, CUSTOM_COMMANDS_DIR_NAME);
+  if (!existsSync29(commandsDir)) {
+    ctx.send({ type: "info", message: `No custom commands directory.
+Create: ${commandsDir}/ with .md files.` });
+    return;
+  }
+  try {
+    const files = readdirSync13(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 {
-      ctx.memoryShow();
+      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") });
     }
+  } catch {
+    ctx.send({ type: "info", message: `Cannot read: ${commandsDir}` });
   }
 }
-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:
-${[...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 = resolve12(sub);
-    if (!existsSync29(dirPath)) {
-      ctx.send({ type: "error", message: `Directory not found: ${dirPath}` });
-    }
-    if (!statSync12(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.` });
+// src/web/commands/review-commands.ts
+async function handleReview(args, ctx) {
+  const gitCtx = getGitContext();
+  if (!gitCtx) {
+    ctx.send({ type: "error", message: "Not a git repository." });
+    return;
   }
-}
-
-// src/diagnostics/doctor-report.ts
-import { existsSync as existsSync31, statSync as statSync14 } from "fs";
-import { join as join26 } from "path";
-import { arch as arch2, platform as platform6, release as release2 } from "os";
-
-// src/diagnostics/crash-log.ts
-import {
-  existsSync as existsSync30,
-  mkdirSync as mkdirSync16,
-  readdirSync as readdirSync15,
-  readFileSync as readFileSync24,
-  statSync as statSync13,
-  unlinkSync as unlinkSync6,
-  writeFileSync as writeFileSync5
-} from "fs";
-import { join as join25 } from "path";
-import { homedir as homedir8, platform as platform5, release, arch } from "os";
-var LOGS_DIR_NAME = "logs";
-var CRASH_LOG_PREFIX = "crash-";
-function getLogsDir(configDir) {
-  const base = configDir ?? join25(homedir8(), CONFIG_DIR_NAME);
-  return join25(base, LOGS_DIR_NAME);
-}
-function truncate(s, n) {
-  return s.length <= n ? s : s.slice(0, n) + "\u2026";
-}
-function listRecentCrashes(limit = 10, configDir) {
-  const dir = getLogsDir(configDir);
-  if (!existsSync30(dir)) return [];
-  const files = [];
-  let names;
+  const staged = args.includes("--staged");
+  const detailed = args.includes("--detailed");
+  let diff;
   try {
-    names = readdirSync15(dir);
+    diff = readGitDiff({ staged });
   } catch {
-    return [];
+    ctx.send({ type: "error", message: "Failed to run git diff." });
+    return;
   }
-  for (const name of names) {
-    if (!name.startsWith(CRASH_LOG_PREFIX) || !name.endsWith(".log")) continue;
-    const full = join25(dir, name);
-    try {
-      const st = statSync13(full);
-      const head = readFileSync24(full, "utf-8").split("\n").slice(0, 20);
-      const tsLine = head.find((l) => l.startsWith("timestamp:"));
-      const kindLine = head.find((l) => l.startsWith("kind:"));
-      const msgIdx = head.findIndex((l) => l.trim() === "## message");
-      const message = msgIdx >= 0 && head[msgIdx + 1] ? head[msgIdx + 1] : "";
-      files.push({
-        file: full,
-        timestamp: tsLine ? tsLine.replace("timestamp:", "").trim() : st.mtime.toISOString(),
-        kind: kindLine ? kindLine.replace("kind:", "").trim() : "unknown",
-        message: truncate(message, 200),
-        sizeBytes: st.size
-      });
-    } catch {
-    }
+  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}` });
   }
-  files.sort((a, b) => a.timestamp < b.timestamp ? 1 : -1);
-  return files.slice(0, limit);
 }
-function getConfigDirUsage(configDir) {
-  const base = configDir ?? join25(homedir8(), CONFIG_DIR_NAME);
-  if (!existsSync30(base)) return { totalBytes: 0, entries: [] };
-  const entries = [];
-  let total = 0;
-  let names;
+async function handleSecurityReview(args, ctx) {
+  const gitCtx = getGitContext();
+  if (!gitCtx) {
+    ctx.send({ type: "error", message: "Not a git repository." });
+    return;
+  }
+  const secStaged = args.includes("--staged");
+  let secDiff;
   try {
-    names = readdirSync15(base);
+    secDiff = readGitDiff({ staged: secStaged });
   } catch {
-    return { totalBytes: 0, entries: [] };
+    ctx.send({ type: "error", message: "Failed to run git diff." });
+    return;
   }
-  for (const name of names) {
-    const full = join25(base, name);
-    const bytes = dirSize(full);
-    entries.push({ name, bytes });
-    total += bytes;
+  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}` });
   }
-  entries.sort((a, b) => b.bytes - a.bytes);
-  return { totalBytes: total, entries };
 }
-function dirSize(path3) {
+async function handleTest(args, ctx) {
+  ctx.send({ type: "info", message: "\u{1F9EA} Running tests..." });
   try {
-    const st = statSync13(path3);
-    if (st.isFile()) return st.size;
-    if (!st.isDirectory()) return 0;
-    let sum = 0;
-    for (const name of readdirSync15(path3)) {
-      sum += dirSize(join25(path3, name));
-    }
-    return sum;
-  } catch {
-    return 0;
+    const { executeTests } = await import("./run-tests-4PNOUHC3.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}` });
   }
 }
-
-// src/diagnostics/doctor-report.ts
-function checkFile(label, path3) {
-  const exists = existsSync31(path3);
-  let sizeBytes = null;
-  if (exists) {
-    try {
-      sizeBytes = statSync14(path3).size;
-    } catch {
+async function handleDiff(args, ctx) {
+  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 });
     }
   }
-  return { label, path: path3, exists, sizeBytes };
-}
-function buildDoctorReport(options) {
-  const config = options.config;
-  const cwd = options.cwd ?? process.cwd();
-  const configDir = config.getConfigDir();
-  const projectRoot = getGitRoot(cwd) ?? cwd;
-  const contextCfg = config.get("context");
-  const contextSetting = config.get("contextFile");
-  const context = loadContextFiles({
-    cwd,
-    configDir,
-    projectRoot,
-    setting: contextSetting,
-    maxBytes: contextCfg.projectDocMaxBytes,
-    fallbackFilenames: contextCfg.projectDocFallbackFilenames
-  });
-  const hooksConfig = config.get("hooks");
-  const hooks = listHooks(hooksConfig, configDir);
-  const pendingHooks = getPendingHookTrust(hooksConfig, configDir);
-  const plugins = listInstalledPlugins(configDir);
-  const activeAssets = getActivePluginAssets(configDir);
-  const network = config.get("networkPolicy");
-  const mcpServers = config.get("mcpServers");
-  const allStats = getStatsSnapshot();
-  return {
-    version: VERSION,
-    npmCheck: options.npmCheck,
-    node: process.version,
-    platform: `${platform6()} ${release2()} (${arch2()})`,
-    cwd,
-    projectRoot,
-    configDir,
-    providers: options.providers.listAll().map((p) => ({ id: p.id, displayName: p.displayName, configured: p.configured })),
-    files: [
-      checkFile("config.json", join26(configDir, "config.json")),
-      checkFile("memory.md", join26(configDir, MEMORY_FILE_NAME)),
-      checkFile("memory.jsonl", join26(configDir, "memory.jsonl")),
-      checkFile("dev-state.md", join26(configDir, DEV_STATE_FILE_NAME)),
-      checkFile("hooks-trust.json", join26(configDir, "hooks-trust.json")),
-      checkFile("plugin-state.json", join26(configDir, "plugins", "plugin-state.json"))
-    ],
-    context: {
-      enabled: contextSetting !== false,
-      setting: contextSetting,
-      candidates: context.candidates,
-      maxBytes: context.maxBytes,
-      layers: context.layers.map((l) => ({ level: l.level, fileName: l.fileName, displayPath: l.displayPath, bytes: l.byteCount, chars: l.charCount, truncated: l.truncated })),
-      skipped: context.skipped.map((s) => ({ level: s.level, fileName: s.fileName, displayPath: s.displayPath, reason: s.reason, message: s.message }))
-    },
-    permissions: {
-      defaultProfile: config.get("defaultPermissionProfile"),
-      allowedProfiles: config.get("allowedPermissionProfiles"),
-      customProfileCount: Object.keys(config.get("permissionProfiles")).length,
-      legacyDefaultAction: config.get("defaultPermission"),
-      ruleCount: config.get("permissionRules").length
-    },
-    networkPolicy: {
-      enabled: network.enabled,
-      defaultAction: network.defaultAction,
-      allowDomains: network.allowDomains.length,
-      denyDomains: network.denyDomains.length,
-      allowPorts: network.allowPorts.length,
-      denyPorts: network.denyPorts.length,
-      allowPrivateNetwork: network.allowPrivateNetwork,
-      toolOverrides: Object.fromEntries(Object.entries(network.tools).filter(([, v]) => v !== void 0))
-    },
-    hooks: {
-      enabled: hooksConfig?.enabled !== false,
-      total: hooks.length,
-      project: hooks.filter((h) => h.source === "project").length,
-      pendingTrust: pendingHooks.length,
-      disabled: hooks.filter((h) => h.disabled).length
-    },
-    plugins: {
-      root: join26(configDir, "plugins"),
-      installed: plugins.length,
-      active: activeAssets.plugins.length,
-      invalid: plugins.filter((p) => !p.valid).length,
-      untrusted: plugins.filter((p) => p.valid && !p.trusted).length,
-      disabled: plugins.filter((p) => p.valid && !p.enabled).length,
-      mcpServers: Object.keys(activeAssets.mcpServers).length,
-      skillDirs: activeAssets.skillDirs.length,
-      commandDirs: activeAssets.commandDirs.length,
-      agentDirs: activeAssets.agentDirs.length,
-      entries: plugins.map((p) => ({ name: p.name, version: p.manifest.version, enabled: p.enabled, trusted: p.trusted, valid: p.valid, error: p.error }))
-    },
-    mcp: {
-      enabled: config.get("mcpEnabled"),
-      configured: Object.keys(mcpServers).length,
-      projectConfigExists: existsSync31(join26(projectRoot, MCP_PROJECT_CONFIG_NAME)),
-      statuses: options.mcpStatuses ?? []
-    },
-    recentCrashes: listRecentCrashes(5, configDir),
-    diskUsage: getConfigDirUsage(configDir),
-    toolStats: {
-      totalCalls: allStats.reduce((a, b) => a + b.calls, 0),
-      totalFailures: allStats.reduce((a, b) => a + b.failures, 0),
-      topUsed: getTopUsedTools(5),
-      topFailing: getTopFailingTools(5)
+  const statsOnly = args[0]?.toLowerCase() === "--stats";
+  let newFiles = 0;
+  let modifiedFiles = 0;
+  const diffLines2 = [];
+  for (const [filePath, { earliest }] of fileMap) {
+    const currentContent = existsSync29(filePath) ? (() => {
+      try {
+        return readFileSync22(filePath, "utf-8");
+      } catch {
+        return null;
+      }
+    })() : null;
+    const isNew = earliest === null;
+    if (isNew) newFiles++;
+    else modifiedFiles++;
+    if (statsOnly) continue;
+    if (isNew) {
+      diffLines2.push(`
+\u{1F4C4} [NEW] ${filePath}`);
+      if (currentContent !== null) {
+        diffLines2.push(`  ${currentContent.split("\n").length} lines`);
+      } else {
+        diffLines2.push("  (file was deleted after creation)");
+      }
+    } else {
+      diffLines2.push(`
+\u{1F4DD} [MODIFIED] ${filePath}`);
+      const oldText = earliest ?? "";
+      const newText = currentContent ?? "";
+      if (oldText === newText) {
+        diffLines2.push("  (no net change)");
+      } else {
+        diffLines2.push(renderDiff(oldText, newText, { filePath, maxLines: 80 }));
+      }
     }
-  };
+  }
+  diffLines2.push(`
+**Summary:** ${fileMap.size} file(s) \u2014 ${newFiles} new, ${modifiedFiles} modified`);
+  ctx.send({ type: "info", message: diffLines2.join("\n") });
+}
+async function handleInit(args, ctx) {
+  const cwd = process.cwd();
+  const targetPath = join24(cwd, "AICLI.md");
+  const force = args.includes("--force");
+  if (existsSync29(targetPath) && !force) {
+    ctx.send({ type: "info", message: `AICLI.md already exists at ${targetPath}
+Use /init --force to overwrite.` });
+    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 });
+    writeFileSync3(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}` });
+  }
 }
+async function handleScaffold(args, ctx) {
+  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}
 
-// src/diagnostics/doctor-cli.ts
-function formatBytes(n) {
-  if (n < 1024) return `${n} B`;
-  if (n < 1024 * 1024) return `${(n / 1024).toFixed(1)} KB`;
-  if (n < 1024 * 1024 * 1024) return `${(n / 1024 / 1024).toFixed(1)} MB`;
-  return `${(n / 1024 / 1024 / 1024).toFixed(2)} GB`;
+Create the necessary files and directory structure. Use write_file and bash tools to set up the project.`;
+  await ctx.handleChat(scaffoldPrompt);
 }
-function formatDoctorReport(report, ansi = true) {
-  const wrap = (code, s) => ansi ? `${code}${s}\x1B[0m` : s;
-  const B = (s) => wrap("\x1B[1m", s);
-  const D = (s) => wrap("\x1B[2m", s);
-  const G = (s) => wrap("\x1B[32m", s);
-  const Y = (s) => wrap("\x1B[33m", s);
-  const R = (s) => wrap("\x1B[31m", s);
-  const out = [];
-  out.push("");
-  out.push(B("\u{1FA7A} AI-CLI Health Check"));
-  out.push("");
-  const nc = report.npmCheck;
-  let versionLine = `  version:  ${report.version}`;
-  if (nc?.status === "up-to-date") versionLine += `  ${D("(latest on npm)")}`;
-  else if (nc?.status === "outdated" && nc.latest) versionLine += `  ${Y(`\u2192 ${nc.latest} available`)}  ${D("(npm i -g jinzd-ai-cli@latest)")}`;
-  else if (nc?.status === "skipped") versionLine += `  ${D(`(npm check skipped: ${nc.reason ?? "unknown"})`)}`;
-  out.push(versionLine);
-  out.push(`  node:     ${report.node}`);
-  out.push(`  platform: ${report.platform}`);
-  out.push(`  cwd:      ${report.cwd}`);
-  out.push(`  project:  ${report.projectRoot}`);
-  out.push(`  config:   ${report.configDir}`);
-  out.push("");
-  out.push(B("API Keys:"));
-  for (const p of report.providers) {
-    out.push(`  ${p.configured ? G("\u2713") : D("\u25CB")}  ${p.id.padEnd(14)} ${p.configured ? G("configured") : D("not configured")}`);
+
+// src/web/commands/memory-commands.ts
+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):
+
+${preview}` });
+    } else {
+      ctx.send({ type: "info", message: "No custom system prompt set. Using default.\nUsage: /system <prompt>" });
+    }
+    return;
   }
-  out.push("");
-  out.push(B("Context Files:"));
-  out.push(`  status: ${report.context.enabled ? G("enabled") : D("disabled")} \xB7 max ${formatBytes(report.context.maxBytes)}`);
-  if (report.context.layers.length === 0) out.push(`  ${D("(no context files loaded)")}`);
-  for (const l of report.context.layers) {
-    out.push(`  ${G("\u2713")}  ${l.level.padEnd(7)} ${l.displayPath} ${D(`(${formatBytes(l.bytes)}${l.truncated ? ", truncated" : ""})`)}`);
+  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).` });
   }
-  if (report.context.skipped.length > 0) {
-    out.push(`  ${D("skipped:")}`);
-    for (const s of report.context.skipped.slice(0, 5)) {
-      out.push(`    ${Y("!")} ${s.level}:${s.fileName} ${s.reason}${s.message ? ` \xB7 ${s.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");
   }
-  out.push("");
-  out.push(B("Permissions / Network:"));
-  out.push(`  profile: ${report.permissions.defaultProfile} \xB7 allowed ${report.permissions.allowedProfiles.join(", ")} \xB7 rules ${report.permissions.ruleCount} \xB7 custom profiles ${report.permissions.customProfileCount}`);
-  const np = report.networkPolicy;
-  out.push(`  networkPolicy: ${np.enabled ? G("enabled") : D("disabled")} \xB7 default ${np.defaultAction} \xB7 allow ${np.allowDomains} domain(s)/${np.allowPorts} port(s) \xB7 deny ${np.denyDomains} domain(s)/${np.denyPorts} port(s) \xB7 private ${np.allowPrivateNetwork ? "allow" : "block/confirm"}`);
-  const overrides = Object.entries(np.toolOverrides).map(([k, v]) => `${k}=${v}`).join(", ");
-  if (overrides) out.push(`  tool overrides: ${overrides}`);
-  out.push("");
-  out.push(B("Hooks / Plugins:"));
-  out.push(`  hooks: ${report.hooks.enabled ? G("enabled") : D("disabled")} \xB7 total ${report.hooks.total} \xB7 project ${report.hooks.project} \xB7 pending trust ${report.hooks.pendingTrust} \xB7 disabled ${report.hooks.disabled}`);
-  out.push(`  plugins: installed ${report.plugins.installed} \xB7 active ${report.plugins.active} \xB7 disabled ${report.plugins.disabled} \xB7 untrusted ${report.plugins.untrusted} \xB7 invalid ${report.plugins.invalid}`);
-  out.push(`  plugin assets: ${report.plugins.skillDirs} skill dir(s), ${report.plugins.commandDirs} command dir(s), ${report.plugins.agentDirs} agent dir(s), ${report.plugins.mcpServers} MCP server(s)`);
-  if (report.plugins.entries.length > 0) {
-    for (const p of report.plugins.entries.slice(0, 5)) {
-      const state2 = p.valid ? `${p.enabled ? "enabled" : "disabled"} \xB7 ${p.trusted ? "trusted" : "untrusted"}` : `invalid \xB7 ${p.error ?? ""}`;
-      out.push(`    ${p.valid ? G("\u2713") : R("\u2717")} ${p.name}@${p.version} ${D(state2)}`);
+  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})` : ""}`);
     }
   }
-  out.push("");
-  out.push(B("MCP Servers:"));
-  out.push(`  global configured: ${report.mcp.configured} \xB7 project .mcp.json: ${report.mcp.projectConfigExists ? "yes" : "no"} \xB7 mcpEnabled: ${report.mcp.enabled ? "true" : "false"}`);
-  if (report.mcp.statuses.length === 0) out.push(`  ${D("(no connected manager status in this mode)")}`);
-  for (const s of report.mcp.statuses) {
-    const state2 = s.connected ? `${G("connected")} \xB7 ${s.serverName} \xB7 ${s.toolCount} tools` : `${R("disconnected")}${s.error ? D(` \xB7 ${s.error}`) : ""}`;
-    out.push(`  ${s.connected ? G("\u2713") : R("\u2717")}  ${s.serverId.padEnd(16)} ${state2}`);
+  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: loadIndex2, clearIndex } = await import("./store-VO37H6LS.js");
+  const { indexProject: indexProject2 } = await import("./indexer-4WWS3VIL.js");
+  const { loadVectorStore, clearVectorStore } = await import("./vector-store-JBAE6PS4.js");
+  if (sub === "status") {
+    const idx = loadIndex2(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 indexProject2(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 = loadIndex2(root);
+    if (!idx) {
+      ctx.send({ type: "error", message: "No symbol index yet. Run /index rebuild first." });
+      return;
+    }
+    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-FF6DDJI6.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.`
+    });
   }
-  out.push("");
-  out.push(B("Config Files:"));
-  for (const f of report.files) {
-    const extra = f.exists && f.sizeBytes !== null ? ` ${D(`(${formatBytes(f.sizeBytes)})`)}` : "";
-    out.push(`  ${f.exists ? G("\u2713") : D("\u2013")}  ${f.label.padEnd(16)} ${f.exists ? f.path : D("(not found)")}${extra}`);
+}
+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();
   }
-  out.push("");
-  out.push(B("Recent Crashes (last 5):"));
-  if (report.recentCrashes.length === 0) out.push(`  ${D("(none - clean!)")}`);
-  for (const c of report.recentCrashes) {
-    out.push(`  ${R("\u2717")}  ${c.timestamp}  ${Y(c.kind)}`);
-    out.push(`     ${D(c.message)}`);
-    out.push(`     ${D(c.file)}`);
+}
+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:
+${[...ctx.addedDirs].map((d) => `  \u2022 ${d}`).join("\n")}
+
+Use /add-dir remove to clear.` : "No directories added.\nUsage: /add-dir <path> | /add-dir remove" });
+    return;
   }
-  out.push("");
-  const ts = report.toolStats;
-  out.push(B("Tool Usage:"));
-  out.push(`  total: ${ts.totalCalls} calls \xB7 ${ts.totalFailures} failures (${ts.totalCalls ? (ts.totalFailures * 100 / ts.totalCalls).toFixed(1) : "0.0"}%)`);
-  if (ts.topUsed.length > 0) {
-    out.push(`  ${D("top used:")}`);
-    for (const t of ts.topUsed) out.push(`    ${t.name.padEnd(20)} ${String(t.calls).padStart(6)} calls \xB7 avg ${t.calls ? (t.totalDurationMs / t.calls).toFixed(0) : "0"}ms`);
+  if (sub === "remove" || sub === "clear") {
+    ctx.addedDirs.clear();
+    ctx.send({ type: "info", message: "\u2713 All added directories removed from context." });
+    return;
   }
-  if (ts.topFailing.length > 0) {
-    out.push(`  ${D("top failing:")}`);
-    for (const t of ts.topFailing) out.push(`    ${R(t.name.padEnd(20))} ${t.failures}/${t.calls} (${(t.failures * 100 / Math.max(1, t.calls)).toFixed(1)}%)  ${D(t.lastFailureMessage ?? "")}`.slice(0, 200));
+  const dirPath = resolve10(sub);
+  if (!existsSync29(dirPath)) {
+    ctx.send({ type: "error", message: `Directory not found: ${dirPath}` });
+    return;
   }
-  out.push("");
-  const dirAnnotations = {
-    models: "semantic search model -> /index semantic-clear",
-    index: "symbol index -> /index clear",
-    history: "conversation history",
-    logs: "crash logs",
-    "memory-index": "chat memory index -> /memory index-clear",
-    plugins: "installed package plugins"
-  };
-  out.push(B("Disk Usage (~/.aicli):"));
-  out.push(`  total: ${formatBytes(report.diskUsage.totalBytes)}`);
-  for (const e of report.diskUsage.entries.slice(0, 10)) {
-    const note = dirAnnotations[e.name];
-    out.push(`    ${e.name.padEnd(18)} ${formatBytes(e.bytes)}${note ? `  ${D(`\xB7 ${note}`)}` : ""}`);
+  if (!statSync12(dirPath).isDirectory()) {
+    ctx.send({ type: "error", message: `Not a directory: ${dirPath}` });
+    return;
   }
-  out.push("");
-  out.push(G("\u2713 Health check complete"));
-  out.push("");
-  return out.join("\n");
+  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 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 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") });
 }
 
 // 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 runs2 = listAgentRuns();
+    if (runs2.length === 0) {
+      ctx.send({ type: "info", message: "No sub-agent runs yet." });
+      return;
     }
-    if (sub === "summary") {
-      const runs2 = listAgentRuns();
-      if (runs2.length === 0) {
-        ctx.send({ type: "info", message: "No sub-agent runs yet." });
-      }
-      const lines = [`Recent agent runs (${runs2.length})`, ""];
-      for (const run of runs2.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 (${runs2.length})`, ""];
+    for (const run of runs2.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: [
@@ -16227,90 +16245,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")}` });
-    }
   }
 }
 
@@ -16359,20 +16374,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;
@@ -16551,10 +16552,10 @@ var SessionHandler = class {
         return;
       }
       case "ask_user_response": {
-        const resolve15 = this.pendingAskUser.get(msg.requestId);
-        if (resolve15) {
+        const resolve14 = this.pendingAskUser.get(msg.requestId);
+        if (resolve14) {
           this.pendingAskUser.delete(msg.requestId);
-          resolve15(msg.answer);
+          resolve14(msg.answer);
         }
         return;
       }
@@ -16567,10 +16568,10 @@ var SessionHandler = class {
       case "memory_manage":
         return this.handleMemoryManage(msg.action, msg.id, msg.expiresAt);
       case "auto_pause_response": {
-        const resolve15 = this.pendingAutoPause.get(msg.requestId);
-        if (resolve15) {
+        const resolve14 = this.pendingAutoPause.get(msg.requestId);
+        if (resolve14) {
           this.pendingAutoPause.delete(msg.requestId);
-          resolve15({ action: msg.action, message: msg.message });
+          resolve14({ action: msg.action, message: msg.message });
         }
         return;
       }
@@ -16585,10 +16586,10 @@ var SessionHandler = class {
         this.hubOrchestrator?.abort();
         return;
       case "hub_steer": {
-        const resolve15 = this.pendingHubReview.get(msg.requestId);
-        if (resolve15) {
+        const resolve14 = this.pendingHubReview.get(msg.requestId);
+        if (resolve14) {
           this.pendingHubReview.delete(msg.requestId);
-          resolve15({ action: msg.action, message: msg.message });
+          resolve14({ action: msg.action, message: msg.message });
         }
         return;
       }
@@ -16601,9 +16602,9 @@ 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 resolve15 of this.pendingAskUser.values()) resolve15(null);
+    for (const resolve14 of this.pendingAskUser.values()) resolve14(null);
     this.pendingAskUser.clear();
-    for (const resolve15 of this.pendingAutoPause.values()) resolve15({ action: "stop" });
+    for (const resolve14 of this.pendingAutoPause.values()) resolve14({ action: "stop" });
     this.pendingAutoPause.clear();
     this.saveIfNeeded();
   }
@@ -16737,9 +16738,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((resolve15) => {
+      orchestrator.onRoundReview = ({ round, maxRounds }) => new Promise((resolve14) => {
         const requestId = `hubrev_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-        this.pendingHubReview.set(requestId, resolve15);
+        this.pendingHubReview.set(requestId, resolve14);
         this.send({ type: "hub_review", requestId, round, maxRounds });
       });
     }
@@ -17072,7 +17073,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 {
-              mkdirSync17(dirname11(pendingTeeSave), { recursive: true });
+              mkdirSync16(dirname10(pendingTeeSave), { recursive: true });
               const bodyToSave = stripOuterCodeFence(content);
               atomicWriteFileSync(pendingTeeSave, bodyToSave);
               undoStack.push(pendingTeeSave, `save_last_response (deferred): ${pendingTeeSave}`);
@@ -17097,8 +17098,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((resolve15) => {
-            this.pendingAutoPause.set(requestId, resolve15);
+          const pauseResp = await new Promise((resolve14) => {
+            this.pendingAutoPause.set(requestId, resolve14);
             this.send({
               type: "auto_pause_request",
               requestId,
@@ -17248,8 +17249,8 @@ ${summaryContent}`,
     let isError = false;
     let summary;
     try {
-      mkdirSync17(dirname11(saveToFile), { recursive: true });
-      fileStream = createWriteStream4(saveToFile);
+      mkdirSync16(dirname10(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 = {
@@ -17277,8 +17278,8 @@ ${summaryContent}`,
         }
         if (chunk.done) break;
       }
-      await new Promise((resolve15, reject) => {
-        fileStream.end((err) => err ? reject(err) : resolve15());
+      await new Promise((resolve14, reject) => {
+        fileStream.end((err) => err ? reject(err) : resolve14());
       });
       const verdict = evaluateTeeContent(fullContent, saveToFile, priorContent);
       if (verdict.kind === "reject") {
@@ -17304,7 +17305,7 @@ ${summaryContent}`,
     } catch (err) {
       if (fileStream) {
         try {
-          await new Promise((resolve15) => fileStream.end(() => resolve15()));
+          await new Promise((resolve14) => fileStream.end(() => resolve14()));
         } catch {
         }
       }
@@ -17541,7 +17542,7 @@ ${entry.content}`;
     const configDir = this.config.getConfigDir();
     try {
       atomicWriteFileSync(memoryStorePath(configDir), "");
-      atomicWriteFileSync(join27(configDir, MEMORY_FILE_NAME), "");
+      atomicWriteFileSync(join26(configDir, MEMORY_FILE_NAME), "");
       this.send({ type: "info", message: "\u{1F5D1}\uFE0F Persistent memory cleared." });
       this.sendMemoryEntries();
     } catch (err) {
@@ -17823,8 +17824,8 @@ async function setupProxy(configProxy) {
 }
 
 // src/web/auth.ts
-import { existsSync as existsSync33, readFileSync as readFileSync26, writeFileSync as writeFileSync7, mkdirSync as mkdirSync18, readdirSync as readdirSync17, copyFileSync } from "fs";
-import { join as join28 } from "path";
+import { existsSync as existsSync32, readFileSync as readFileSync25, writeFileSync as writeFileSync6, mkdirSync as mkdirSync17, readdirSync as readdirSync16, copyFileSync } from "fs";
+import { join as join27 } from "path";
 import { createHmac, randomBytes, timingSafeEqual, pbkdf2Sync } from "crypto";
 var USERS_FILE = "users.json";
 var TOKEN_EXPIRY_HOURS = 24;
@@ -17839,7 +17840,7 @@ var AuthManager = class {
   db;
   constructor(baseDir) {
     this.baseDir = baseDir;
-    this.usersFile = join28(baseDir, USERS_FILE);
+    this.usersFile = join27(baseDir, USERS_FILE);
     this.db = this.loadOrCreate();
   }
   // ── Public API ─────────────────────────────────────────────────
@@ -17868,9 +17869,9 @@ var AuthManager = class {
     }
     const salt = randomBytes(16).toString("hex");
     const passwordHash = this.hashPassword(password, salt);
-    const dataDir = join28(USERS_DIR, username);
-    const fullDataDir = join28(this.baseDir, dataDir);
-    mkdirSync18(join28(fullDataDir, "history"), { recursive: true });
+    const dataDir = join27(USERS_DIR, username);
+    const fullDataDir = join27(this.baseDir, dataDir);
+    mkdirSync17(join27(fullDataDir, "history"), { recursive: true });
     const user = {
       username,
       passwordHash,
@@ -17985,7 +17986,7 @@ var AuthManager = class {
   getUserDataDir(username) {
     const user = this.db.users.find((u) => u.username === username);
     if (!user) throw new Error(`User not found: ${username}`);
-    return join28(this.baseDir, user.dataDir);
+    return join27(this.baseDir, user.dataDir);
   }
   /** List all usernames */
   listUsers() {
@@ -18021,30 +18022,30 @@ var AuthManager = class {
     const err = this.register(username, password);
     if (err) return err;
     const userDir = this.getUserDataDir(username);
-    const globalConfig = join28(this.baseDir, "config.json");
-    if (existsSync33(globalConfig)) {
+    const globalConfig = join27(this.baseDir, "config.json");
+    if (existsSync32(globalConfig)) {
       try {
-        const content = readFileSync26(globalConfig, "utf-8");
-        writeFileSync7(join28(userDir, "config.json"), content, "utf-8");
+        const content = readFileSync25(globalConfig, "utf-8");
+        writeFileSync6(join27(userDir, "config.json"), content, "utf-8");
       } catch {
       }
     }
-    const globalMemory = join28(this.baseDir, "memory.md");
-    if (existsSync33(globalMemory)) {
+    const globalMemory = join27(this.baseDir, "memory.md");
+    if (existsSync32(globalMemory)) {
       try {
-        const content = readFileSync26(globalMemory, "utf-8");
-        writeFileSync7(join28(userDir, "memory.md"), content, "utf-8");
+        const content = readFileSync25(globalMemory, "utf-8");
+        writeFileSync6(join27(userDir, "memory.md"), content, "utf-8");
       } catch {
       }
     }
-    const globalHistory = join28(this.baseDir, "history");
-    if (existsSync33(globalHistory)) {
+    const globalHistory = join27(this.baseDir, "history");
+    if (existsSync32(globalHistory)) {
       try {
-        const files = readdirSync17(globalHistory).filter((f) => f.endsWith(".json"));
-        const userHistory = join28(userDir, "history");
+        const files = readdirSync16(globalHistory).filter((f) => f.endsWith(".json"));
+        const userHistory = join27(userDir, "history");
         for (const f of files) {
           try {
-            copyFileSync(join28(globalHistory, f), join28(userHistory, f));
+            copyFileSync(join27(globalHistory, f), join27(userHistory, f));
           } catch {
           }
         }
@@ -18055,9 +18056,9 @@ var AuthManager = class {
   }
   // ── Private methods ────────────────────────────────────────────
   loadOrCreate() {
-    if (existsSync33(this.usersFile)) {
+    if (existsSync32(this.usersFile)) {
       try {
-        return JSON.parse(readFileSync26(this.usersFile, "utf-8"));
+        return JSON.parse(readFileSync25(this.usersFile, "utf-8"));
       } catch {
       }
     }
@@ -18073,7 +18074,7 @@ var AuthManager = class {
     this.saveDB(this.db);
   }
   saveDB(db) {
-    mkdirSync18(this.baseDir, { recursive: true });
+    mkdirSync17(this.baseDir, { recursive: true });
     atomicWriteFileSync(this.usersFile, JSON.stringify(db, null, 2));
   }
   /** Legacy hash — kept only for migrating old users (v0.2.x) */
@@ -18105,11 +18106,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 dirname12(filePath);
+      return dirname11(filePath);
     }
   } catch {
   }
-  return resolve14(".");
+  return resolve13(".");
 }
 async function startWebServer(options = {}) {
   const port = options.port ?? 3e3;
@@ -18177,8 +18178,8 @@ async function startWebServer(options = {}) {
     }
   }
   let skillManager = null;
-  const skillsDir = join29(config.getConfigDir(), SKILLS_DIR_NAME);
-  if (existsSync34(skillsDir)) {
+  const skillsDir = join28(config.getConfigDir(), SKILLS_DIR_NAME);
+  if (existsSync33(skillsDir)) {
     skillManager = new SkillManager(skillsDir, config.get("ui").skillSizeWarn);
     skillManager.loadSkills(pluginAssets.skillDirs);
     const count = skillManager.listSkills().length;
@@ -18249,18 +18250,18 @@ async function startWebServer(options = {}) {
     next();
   };
   const moduleDir = getModuleDir();
-  let clientDir = join29(moduleDir, "web", "client");
-  if (!existsSync34(clientDir)) {
-    clientDir = join29(moduleDir, "client");
+  let clientDir = join28(moduleDir, "web", "client");
+  if (!existsSync33(clientDir)) {
+    clientDir = join28(moduleDir, "client");
   }
-  if (!existsSync34(clientDir)) {
-    clientDir = join29(moduleDir, "..", "..", "src", "web", "client");
+  if (!existsSync33(clientDir)) {
+    clientDir = join28(moduleDir, "..", "..", "src", "web", "client");
   }
-  if (!existsSync34(clientDir)) {
-    clientDir = join29(process.cwd(), "src", "web", "client");
+  if (!existsSync33(clientDir)) {
+    clientDir = join28(process.cwd(), "src", "web", "client");
   }
   console.log(`   Static files: ${clientDir}`);
-  app.use("/vendor", express.static(join29(clientDir, "vendor"), { maxAge: "1y", immutable: true }));
+  app.use("/vendor", express.static(join28(clientDir, "vendor"), { maxAge: "1y", immutable: true }));
   app.use(express.static(clientDir));
   app.get("/api/status", (_req, res) => {
     res.json({
@@ -18327,10 +18328,10 @@ async function startWebServer(options = {}) {
   app.get("/api/files", requireAuth, (req, res) => {
     const cwd = process.cwd();
     const prefix = req.query.prefix || "";
-    const targetDir = join29(cwd, prefix);
+    const targetDir = join28(cwd, prefix);
     try {
-      const canonicalTarget = realpathSync(resolve14(targetDir));
-      const canonicalCwd = realpathSync(resolve14(cwd));
+      const canonicalTarget = realpathSync(resolve13(targetDir));
+      const canonicalCwd = realpathSync(resolve13(cwd));
       if (!canonicalTarget.startsWith(canonicalCwd + sep3) && canonicalTarget !== canonicalCwd) {
         res.json({ files: [] });
         return;
@@ -18341,10 +18342,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 = readdirSync18(targetDir, { withFileTypes: true });
+      const entries = readdirSync17(targetDir, { withFileTypes: true });
       const files = entries.filter((e) => !SKIP.has(e.name) && !e.name.startsWith(".")).slice(0, 50).map((e) => ({
         name: e.name,
-        path: relative4(cwd, join29(targetDir, e.name)).replace(/\\/g, "/"),
+        path: relative4(cwd, join28(targetDir, e.name)).replace(/\\/g, "/"),
         isDir: e.isDirectory()
       }));
       res.json({ files });
@@ -18384,8 +18385,8 @@ async function startWebServer(options = {}) {
     try {
       const authUser = req._authUser;
       const histDir = authUser ? getUserShared(authUser).config.getHistoryDir() : config.getHistoryDir();
-      const filePath = join29(histDir, `${id}.json`);
-      if (!existsSync34(filePath)) {
+      const filePath = join28(histDir, `${id}.json`);
+      if (!existsSync33(filePath)) {
         res.status(404).json({ error: "Session not found" });
         return;
       }
@@ -18400,7 +18401,7 @@ async function startWebServer(options = {}) {
         res.status(404).json({ error: "Session not found" });
         return;
       }
-      const data = JSON.parse(readFileSync27(filePath, "utf-8"));
+      const data = JSON.parse(readFileSync26(filePath, "utf-8"));
       res.json({ session: data });
     } catch (err) {
       res.status(500).json({ error: err instanceof Error ? err.message : String(err) });
@@ -18413,10 +18414,10 @@ async function startWebServer(options = {}) {
       return;
     }
     const cwd = process.cwd();
-    const fullPath = resolve14(join29(cwd, filePath));
+    const fullPath = resolve13(join28(cwd, filePath));
     try {
       const canonicalFull = realpathSync(fullPath);
-      const canonicalCwd = realpathSync(resolve14(cwd));
+      const canonicalCwd = realpathSync(resolve13(cwd));
       if (!canonicalFull.startsWith(canonicalCwd + sep3) && canonicalFull !== canonicalCwd) {
         res.json({ error: "Access denied" });
         return;
@@ -18426,12 +18427,12 @@ async function startWebServer(options = {}) {
       return;
     }
     try {
-      const stat = statSync16(fullPath);
+      const stat = statSync15(fullPath);
       if (stat.size > 512 * 1024) {
         res.json({ error: `File too large (${(stat.size / 1024).toFixed(0)} KB, max 512 KB)` });
         return;
       }
-      const content = readFileSync27(fullPath, "utf-8");
+      const content = readFileSync26(fullPath, "utf-8");
       res.json({ content, size: stat.size });
     } catch {
       res.json({ error: "Cannot read file" });
@@ -18635,7 +18636,7 @@ async function startWebServer(options = {}) {
   });
   const MAX_PORT_ATTEMPTS = 10;
   let actualPort = port;
-  const result = await new Promise((resolve15, reject) => {
+  const result = await new Promise((resolve14, reject) => {
     const tryListen = (attempt) => {
       server.once("error", (err) => {
         if (err.code === "EADDRINUSE" && attempt < MAX_PORT_ATTEMPTS) {
@@ -18666,7 +18667,7 @@ async function startWebServer(options = {}) {
         }
         console.log(`   Press Ctrl+C to stop
 `);
-        resolve15({ port: actualPort, host, url });
+        resolve14({ port: actualPort, host, url });
       });
     };
     tryListen(1);
@@ -18686,17 +18687,17 @@ function resolveProjectMcpPath() {
   const cwd = process.cwd();
   const gitRoot = getGitRoot(cwd);
   const projectRoot = gitRoot ?? cwd;
-  const configPath = join29(projectRoot, MCP_PROJECT_CONFIG_NAME);
-  return existsSync34(configPath) ? configPath : null;
+  const configPath = join28(projectRoot, MCP_PROJECT_CONFIG_NAME);
+  return existsSync33(configPath) ? configPath : null;
 }
 function loadProjectMcpConfig() {
   const cwd = process.cwd();
   const gitRoot = getGitRoot(cwd);
   const projectRoot = gitRoot ?? cwd;
-  const configPath = join29(projectRoot, MCP_PROJECT_CONFIG_NAME);
-  if (!existsSync34(configPath)) return null;
+  const configPath = join28(projectRoot, MCP_PROJECT_CONFIG_NAME);
+  if (!existsSync33(configPath)) return null;
   try {
-    const raw = JSON.parse(readFileSync27(configPath, "utf-8"));
+    const raw = JSON.parse(readFileSync26(configPath, "utf-8"));
     return raw.mcpServers ?? raw;
   } catch {
     return null;