@ridit/lens 0.2.0 → 0.2.2

package/src/components/chat/ChatRunner.tsx

@@ -17,21 +17,17 @@ import {
   extractGithubUrl,
   toCloneUrl,
   parseCloneTag,
-  runShell,
-  fetchUrl,
-  readFile,
-  readFolder,
-  grepFiles,
-  deleteFile,
-  deleteFolder,
-  openUrl,
-  generatePdf,
-  writeFile,
   buildSystemPrompt,
   parseResponse,
   callChat,
-  searchWeb,
 } from "../../utils/chat";
+import {
+  saveChat,
+  loadChat,
+  listChats,
+  deleteChat,
+  getChatNameSuggestions,
+} from "../../utils/chatHistory";
 import { StaticMessage } from "./ChatMessage";
 import {
   PermissionPrompt,
@@ -50,31 +46,56 @@ import { TimelineRunner } from "../timeline/TimelineRunner";
 import type { Provider } from "../../types/config";
 import type { Message, ChatStage } from "../../types/chat";
 import {
-  appendHistory,
-  buildHistorySummary,
-  clearRepoHistory,
-} from "../../utils/history";
+  appendMemory,
+  buildMemorySummary,
+  clearRepoMemory,
+  addMemory,
+  deleteMemory,
+  listMemories,
+} from "../../utils/memory";
 import { readLensFile } from "../../utils/lensfile";
 import { ReviewCommand } from "../../commands/review";
+import { registry } from "../../utils/tools/registry";
 
 const COMMANDS = [
   { cmd: "/timeline", desc: "browse commit history" },
   { cmd: "/clear history", desc: "wipe session memory for this repo" },
-  { cmd: "/review", desc: "review current codebsae" },
+  { cmd: "/review", desc: "review current codebase" },
   { cmd: "/auto", desc: "toggle auto-approve for read/search tools" },
+  { cmd: "/chat", desc: "chat history commands" },
+  { cmd: "/chat list", desc: "list saved chats for this repo" },
+  { cmd: "/chat load", desc: "load a saved chat by name" },
+  { cmd: "/chat rename", desc: "rename the current chat" },
+  { cmd: "/chat delete", desc: "delete a saved chat by name" },
+  { cmd: "/memory", desc: "memory commands" },
+  { cmd: "/memory list", desc: "list all memories for this repo" },
+  { cmd: "/memory add", desc: "add a memory" },
+  { cmd: "/memory delete", desc: "delete a memory by id" },
+  { cmd: "/memory clear", desc: "clear all memories for this repo" },
 ];
 
 function CommandPalette({
   query,
   onSelect,
+  recentChats,
 }: {
   query: string;
   onSelect: (cmd: string) => void;
+  recentChats: string[];
 }) {
   const q = query.toLowerCase();
+  const isChatLoad = q.startsWith("/chat load") || q.startsWith("/chat delete");
+  const chatFilter = isChatLoad
+    ? q.startsWith("/chat load")
+      ? q.slice("/chat load".length).trim()
+      : q.slice("/chat delete".length).trim()
+    : "";
+  const filteredChats = chatFilter
+    ? recentChats.filter((n) => n.toLowerCase().includes(chatFilter))
+    : recentChats;
   const matches = COMMANDS.filter((c) => c.cmd.startsWith(q));
-  if (!matches.length) return null;
-
+  if (!matches.length && !isChatLoad) return null;
+  if (!matches.length && isChatLoad && filteredChats.length === 0) return null;
   return (
     <Box flexDirection="column" marginBottom={1} marginLeft={2}>
       {matches.map((c, i) => {
@@ -90,6 +111,19 @@ function CommandPalette({
           </Box>
         );
       })}
+      {isChatLoad && filteredChats.length > 0 && (
+        <Box flexDirection="column" marginTop={matches.length ? 1 : 0}>
+          <Text color="gray" dimColor>
+            {chatFilter ? `matching "${chatFilter}":` : "recent chats:"}
+          </Text>
+          {filteredChats.map((name, i) => (
+            <Box key={i} gap={1} marginLeft={2}>
+              <Text color={ACCENT}>·</Text>
+              <Text color="white">{name}</Text>
+            </Box>
+          ))}
+        </Box>
+      )}
     </Box>
   );
 }
@@ -106,36 +140,42 @@ export const ChatRunner = ({ repoPath }: { repoPath: string }) => {
   const [showTimeline, setShowTimeline] = useState(false);
   const [showReview, setShowReview] = useState(false);
   const [autoApprove, setAutoApprove] = useState(false);
+  const [chatName, setChatName] = useState<string | null>(null);
+  const chatNameRef = useRef<string | null>(null);
+  const [recentChats, setRecentChats] = useState<string[]>([]);
+  const inputHistoryRef = useRef<string[]>([]);
+  const historyIndexRef = useRef<number>(-1);
+  const [inputKey, setInputKey] = useState(0);
+
+  const updateChatName = (name: string) => {
+    chatNameRef.current = name;
+    setChatName(name);
+  };
 
-  // Abort controller for the currently in-flight API call.
-  // Pressing ESC while thinking aborts the request and drops the response.
   const abortControllerRef = useRef<AbortController | null>(null);
-
-  // Cache of tool results within a single conversation turn to prevent
-  // the model from re-calling tools it already ran with the same args
   const toolResultCache = useRef<Map<string, string>>(new Map());
 
-  const inputBuffer = useRef("");
-  const flushTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
+  // When the user approves a tool that has chained remainder calls, we
+  // automatically approve subsequent tools in the same chain so the user
+  // doesn't have to press y for every file in a 10-file scaffold.
+  // This ref is set to true on the first approval and cleared when the chain ends.
+  const batchApprovedRef = useRef(false);
+
   const thinkingPhrase = useThinkingPhrase(stage.type === "thinking");
 
-  const flushBuffer = () => {
-    const buf = inputBuffer.current;
-    if (!buf) return;
-    inputBuffer.current = "";
-    setInputValue((v) => v + buf);
-  };
+  React.useEffect(() => {
+    const chats = listChats(repoPath);
+    setRecentChats(chats.slice(0, 10).map((c) => c.name));
+  }, [repoPath]);
 
-  const scheduleFlush = () => {
-    if (flushTimer.current !== null) return;
-    flushTimer.current = setTimeout(() => {
-      flushTimer.current = null;
-      flushBuffer();
-    }, 16);
-  };
+  React.useEffect(() => {
+    if (chatNameRef.current && allMessages.length > 1) {
+      saveChat(chatNameRef.current, repoPath, allMessages);
+    }
+  }, [allMessages]);
 
   const handleError = (currentAll: Message[]) => (err: unknown) => {
-    // Silently drop aborted requests — user pressed ESC intentionally
+    batchApprovedRef.current = false;
     if (err instanceof Error && err.name === "AbortError") {
       setStage({ type: "idle" });
       return;
@@ -155,15 +195,38 @@ export const ChatRunner = ({ repoPath }: { repoPath: string }) => {
     currentAll: Message[],
     signal: AbortSignal,
   ) => {
-    // If ESC was pressed before we got here, silently drop the response
     if (signal.aborted) {
+      batchApprovedRef.current = false;
       setStage({ type: "idle" });
       return;
     }
 
-    const parsed = parseResponse(raw);
+    // Handle inline memory operations
+    const memAddMatches = [
+      ...raw.matchAll(/<memory-add>([\s\S]*?)<\/memory-add>/g),
+    ];
+    const memDelMatches = [
+      ...raw.matchAll(/<memory-delete>([\s\S]*?)<\/memory-delete>/g),
+    ];
+    for (const match of memAddMatches) {
+      const content = match[1]!.trim();
+      if (content) addMemory(content, repoPath);
+    }
+    for (const match of memDelMatches) {
+      const id = match[1]!.trim();
+      if (id) deleteMemory(id, repoPath);
+    }
+    const cleanRaw = raw
+      .replace(/<memory-add>[\s\S]*?<\/memory-add>/g, "")
+      .replace(/<memory-delete>[\s\S]*?<\/memory-delete>/g, "")
+      .trim();
+
+    const parsed = parseResponse(cleanRaw);
+
+    // ── changes (diff preview UI) ──────────────────────────────────────────
 
     if (parsed.kind === "changes") {
+      batchApprovedRef.current = false;
       if (parsed.patches.length === 0) {
         const msg: Message = {
           role: "assistant",
@@ -196,52 +259,10 @@ export const ChatRunner = ({ repoPath }: { repoPath: string }) => {
       return;
     }
 
-    if (
-      parsed.kind === "shell" ||
-      parsed.kind === "fetch" ||
-      parsed.kind === "read-file" ||
-      parsed.kind === "read-folder" ||
-      parsed.kind === "grep" ||
-      parsed.kind === "write-file" ||
-      parsed.kind === "delete-file" ||
-      parsed.kind === "delete-folder" ||
-      parsed.kind === "open-url" ||
-      parsed.kind === "generate-pdf" ||
-      parsed.kind === "search"
-    ) {
-      let tool: Parameters<typeof PermissionPrompt>[0]["tool"];
-      if (parsed.kind === "shell") {
-        tool = { type: "shell", command: parsed.command };
-      } else if (parsed.kind === "fetch") {
-        tool = { type: "fetch", url: parsed.url };
-      } else if (parsed.kind === "read-file") {
-        tool = { type: "read-file", filePath: parsed.filePath };
-      } else if (parsed.kind === "read-folder") {
-        tool = { type: "read-folder", folderPath: parsed.folderPath };
-      } else if (parsed.kind === "grep") {
-        tool = { type: "grep", pattern: parsed.pattern, glob: parsed.glob };
-      } else if (parsed.kind === "delete-file") {
-        tool = { type: "delete-file", filePath: parsed.filePath };
-      } else if (parsed.kind === "delete-folder") {
-        tool = { type: "delete-folder", folderPath: parsed.folderPath };
-      } else if (parsed.kind === "open-url") {
-        tool = { type: "open-url", url: parsed.url };
-      } else if (parsed.kind === "generate-pdf") {
-        tool = {
-          type: "generate-pdf",
-          filePath: parsed.filePath,
-          content: parsed.pdfContent,
-        };
-      } else if (parsed.kind === "search") {
-        tool = { type: "search", query: parsed.query };
-      } else {
-        tool = {
-          type: "write-file",
-          filePath: parsed.filePath,
-          fileContent: parsed.fileContent,
-        };
-      }
+    // ── clone (git clone UI flow) ──────────────────────────────────────────
 
+    if (parsed.kind === "clone") {
+      batchApprovedRef.current = false;
       if (parsed.content) {
         const preambleMsg: Message = {
           role: "assistant",
@@ -251,238 +272,166 @@ export const ChatRunner = ({ repoPath }: { repoPath: string }) => {
         setAllMessages([...currentAll, preambleMsg]);
         setCommitted((prev) => [...prev, preambleMsg]);
       }
+      setStage({
+        type: "clone-offer",
+        repoUrl: parsed.repoUrl,
+        launchAnalysis: true,
+      });
+      return;
+    }
 
-      // Safe tools that can be auto-approved (no side effects)
-      const isSafeTool =
-        parsed.kind === "read-file" ||
-        parsed.kind === "read-folder" ||
-        parsed.kind === "grep" ||
-        parsed.kind === "fetch" ||
-        parsed.kind === "open-url" ||
-        parsed.kind === "search";
-
-      const executeAndContinue = async (approved: boolean) => {
-        let result = "(denied by user)";
-        if (approved) {
-          const cacheKey =
-            parsed.kind === "read-file"
-              ? `read-file:${parsed.filePath}`
-              : parsed.kind === "read-folder"
-                ? `read-folder:${parsed.folderPath}`
-                : parsed.kind === "grep"
-                  ? `grep:${parsed.pattern}:${parsed.glob}`
-                  : null;
-
-          if (cacheKey && toolResultCache.current.has(cacheKey)) {
-            result =
-              toolResultCache.current.get(cacheKey)! +
-              "\n\n[NOTE: This result was already retrieved earlier. Do not request it again.]";
-          } else {
-            try {
-              setStage({ type: "thinking" });
-              if (parsed.kind === "shell") {
-                result = await runShell(parsed.command, repoPath);
-              } else if (parsed.kind === "fetch") {
-                result = await fetchUrl(parsed.url);
-              } else if (parsed.kind === "read-file") {
-                result = readFile(parsed.filePath, repoPath);
-              } else if (parsed.kind === "read-folder") {
-                result = readFolder(parsed.folderPath, repoPath);
-              } else if (parsed.kind === "grep") {
-                result = grepFiles(parsed.pattern, parsed.glob, repoPath);
-              } else if (parsed.kind === "delete-file") {
-                result = deleteFile(parsed.filePath, repoPath);
-              } else if (parsed.kind === "delete-folder") {
-                result = deleteFolder(parsed.folderPath, repoPath);
-              } else if (parsed.kind === "open-url") {
-                result = openUrl(parsed.url);
-              } else if (parsed.kind === "generate-pdf") {
-                result = generatePdf(
-                  parsed.filePath,
-                  parsed.pdfContent,
-                  repoPath,
-                );
-              } else if (parsed.kind === "write-file") {
-                result = writeFile(
-                  parsed.filePath,
-                  parsed.fileContent,
-                  repoPath,
-                );
-              } else if (parsed.kind === "search") {
-                result = await searchWeb(parsed.query);
-              }
-              if (cacheKey) {
-                toolResultCache.current.set(cacheKey, result);
-              }
-            } catch (err: unknown) {
-              result = `Error: ${err instanceof Error ? err.message : "failed"}`;
+    // ── text ──────────────────────────────────────────────────────────────
+
+    if (parsed.kind === "text") {
+      batchApprovedRef.current = false;
+      const msg: Message = {
+        role: "assistant",
+        content: parsed.content,
+        type: "text",
+      };
+      const withMsg = [...currentAll, msg];
+      setAllMessages(withMsg);
+      setCommitted((prev) => [...prev, msg]);
+      const lastUserMsg = [...currentAll]
+        .reverse()
+        .find((m) => m.role === "user");
+      const githubUrl = lastUserMsg
+        ? extractGithubUrl(lastUserMsg.content)
+        : null;
+      if (githubUrl && !clonedUrls.has(githubUrl)) {
+        setTimeout(
+          () => setStage({ type: "clone-offer", repoUrl: githubUrl }),
+          80,
+        );
+      } else {
+        setStage({ type: "idle" });
+      }
+      return;
+    }
+
+    // ── generic tool ──────────────────────────────────────────────────────
+
+    const tool = registry.get(parsed.toolName);
+    if (!tool) {
+      batchApprovedRef.current = false;
+      setStage({ type: "idle" });
+      return;
+    }
+
+    if (parsed.content) {
+      const preambleMsg: Message = {
+        role: "assistant",
+        content: parsed.content,
+        type: "text",
+      };
+      setAllMessages([...currentAll, preambleMsg]);
+      setCommitted((prev) => [...prev, preambleMsg]);
+    }
+
+    const remainder = parsed.remainder;
+    const isSafe = tool.safe ?? false;
+
+    const executeAndContinue = async (approved: boolean) => {
+      // If the user approved this tool and there are more in the chain,
+      // mark the batch as approved so subsequent tools skip the prompt.
+      if (approved && remainder) {
+        batchApprovedRef.current = true;
+      }
+
+      let result = "(denied by user)";
+
+      if (approved) {
+        const cacheKey = isSafe
+          ? `${parsed.toolName}:${parsed.rawInput}`
+          : null;
+        if (cacheKey && toolResultCache.current.has(cacheKey)) {
+          result =
+            toolResultCache.current.get(cacheKey)! +
+            "\n\n[NOTE: This result was already retrieved earlier. Do not request it again.]";
+        } else {
+          try {
+            setStage({ type: "thinking" });
+            const toolResult = await tool.execute(parsed.input, {
+              repoPath,
+              messages: currentAll,
+            });
+            result = toolResult.value;
+            if (cacheKey && toolResult.kind === "text") {
+              toolResultCache.current.set(cacheKey, result);
             }
+          } catch (err: unknown) {
+            result = `Error: ${err instanceof Error ? err.message : "failed"}`;
           }
         }
+      }
 
-        if (approved && !result.startsWith("Error:")) {
-          const kindMap = {
-            shell: "shell-run",
-            fetch: "url-fetched",
-            "read-file": "file-read",
-            "read-folder": "file-read",
-            grep: "file-read",
-            "delete-file": "file-written",
-            "delete-folder": "file-written",
-            "open-url": "url-fetched",
-            "generate-pdf": "file-written",
-            "write-file": "file-written",
-            search: "url-fetched",
-          } as const;
-          appendHistory({
-            kind: kindMap[parsed.kind as keyof typeof kindMap] ?? "shell-run",
-            detail:
-              parsed.kind === "shell"
-                ? parsed.command
-                : parsed.kind === "fetch"
-                  ? parsed.url
-                  : parsed.kind === "search"
-                    ? parsed.query
-                    : parsed.kind === "read-folder"
-                      ? parsed.folderPath
-                      : parsed.kind === "grep"
-                        ? `${parsed.pattern} ${parsed.glob}`
-                        : parsed.kind === "delete-file"
-                          ? parsed.filePath
-                          : parsed.kind === "delete-folder"
-                            ? parsed.folderPath
-                            : parsed.kind === "open-url"
-                              ? parsed.url
-                              : parsed.kind === "generate-pdf"
-                                ? parsed.filePath
-                                : parsed.filePath,
-            summary: result.split("\n")[0]?.slice(0, 120) ?? "",
-            repoPath,
-          });
-        }
-
-        const toolName =
-          parsed.kind === "shell"
-            ? "shell"
-            : parsed.kind === "fetch"
-              ? "fetch"
-              : parsed.kind === "read-file"
-                ? "read-file"
-                : parsed.kind === "read-folder"
-                  ? "read-folder"
-                  : parsed.kind === "grep"
-                    ? "grep"
-                    : parsed.kind === "delete-file"
-                      ? "delete-file"
-                      : parsed.kind === "delete-folder"
-                        ? "delete-folder"
-                        : parsed.kind === "open-url"
-                          ? "open-url"
-                          : parsed.kind === "generate-pdf"
-                            ? "generate-pdf"
-                            : parsed.kind === "search"
-                              ? "search"
-                              : "write-file";
-
-        const toolContent =
-          parsed.kind === "shell"
-            ? parsed.command
-            : parsed.kind === "fetch"
-              ? parsed.url
-              : parsed.kind === "search"
-                ? parsed.query
-                : parsed.kind === "read-folder"
-                  ? parsed.folderPath
-                  : parsed.kind === "grep"
-                    ? `${parsed.pattern} — ${parsed.glob}`
-                    : parsed.kind === "delete-file"
-                      ? parsed.filePath
-                      : parsed.kind === "delete-folder"
-                        ? parsed.folderPath
-                        : parsed.kind === "open-url"
-                          ? parsed.url
-                          : parsed.kind === "generate-pdf"
-                            ? parsed.filePath
-                            : parsed.filePath;
-
-        const toolMsg: Message = {
-          role: "assistant",
-          type: "tool",
-          toolName,
-          content: toolContent,
-          result,
-          approved,
-        };
-
-        const withTool = [...currentAll, toolMsg];
-        setAllMessages(withTool);
-        setCommitted((prev) => [...prev, toolMsg]);
+      if (approved && !result.startsWith("Error:")) {
+        appendMemory({
+          kind: "shell-run",
+          detail: tool.summariseInput
+            ? String(tool.summariseInput(parsed.input))
+            : parsed.rawInput,
+          summary: result.split("\n")[0]?.slice(0, 120) ?? "",
+          repoPath,
+        });
+      }
 
-        // Create a fresh abort controller for the follow-up call
-        const nextAbort = new AbortController();
-        abortControllerRef.current = nextAbort;
+      const displayContent = tool.summariseInput
+        ? String(tool.summariseInput(parsed.input))
+        : parsed.rawInput;
 
-        setStage({ type: "thinking" });
-        callChat(provider!, systemPrompt, withTool, nextAbort.signal)
-          .then((r: string) => processResponse(r, withTool, nextAbort.signal))
-          .catch(handleError(withTool));
+      const toolMsg: Message = {
+        role: "assistant",
+        type: "tool",
+        toolName: parsed.toolName as any,
+        content: displayContent,
+        result,
+        approved,
       };
 
-      if (autoApprove && isSafeTool) {
-        executeAndContinue(true);
+      const withTool = [...currentAll, toolMsg];
+      setAllMessages(withTool);
+      setCommitted((prev) => [...prev, toolMsg]);
+
+      // Chain: process remainder immediately, no API round-trip needed.
+      if (approved && remainder && remainder.length > 0) {
+        processResponse(remainder, withTool, signal);
         return;
       }
 
-      setStage({
-        type: "permission",
-        tool,
-        pendingMessages: currentAll,
-        resolve: executeAndContinue,
-      });
-      return;
-    }
+      // Chain ended (or was never chained) — clear batch approval.
+      batchApprovedRef.current = false;
 
-    if (parsed.kind === "clone") {
-      if (parsed.content) {
-        const preambleMsg: Message = {
-          role: "assistant",
-          content: parsed.content,
-          type: "text",
-        };
-        setAllMessages([...currentAll, preambleMsg]);
-        setCommitted((prev) => [...prev, preambleMsg]);
-      }
-      setStage({
-        type: "clone-offer",
-        repoUrl: parsed.repoUrl,
-        launchAnalysis: true,
-      });
+      const nextAbort = new AbortController();
+      abortControllerRef.current = nextAbort;
+      setStage({ type: "thinking" });
+      callChat(provider!, systemPrompt, withTool, nextAbort.signal)
+        .then((r: string) => processResponse(r, withTool, nextAbort.signal))
+        .catch(handleError(withTool));
+    };
+
+    // Auto-approve if: tool is safe, or global auto-approve is on, or we're
+    // already inside a user-approved batch chain.
+    if ((autoApprove && isSafe) || batchApprovedRef.current) {
+      executeAndContinue(true);
       return;
     }
 
-    const msg: Message = {
-      role: "assistant",
-      content: parsed.content,
-      type: "text",
-    };
-    const withMsg = [...currentAll, msg];
-    setAllMessages(withMsg);
-    setCommitted((prev) => [...prev, msg]);
-
-    const lastUserMsg = [...currentAll]
-      .reverse()
-      .find((m) => m.role === "user");
-    const githubUrl = lastUserMsg
-      ? extractGithubUrl(lastUserMsg.content)
-      : null;
-
-    if (githubUrl && !clonedUrls.has(githubUrl)) {
-      setTimeout(() => {
-        setStage({ type: "clone-offer", repoUrl: githubUrl });
-      }, 80);
-    } else {
-      setStage({ type: "idle" });
-    }
+    const permLabel = tool.permissionLabel ?? tool.name;
+    const permValue = tool.summariseInput
+      ? String(tool.summariseInput(parsed.input))
+      : parsed.rawInput;
+
+    setStage({
+      type: "permission",
+      tool: {
+        type: parsed.toolName as any,
+        _display: permValue,
+        _label: permLabel,
+      } as any,
+      pendingMessages: currentAll,
+      resolve: executeAndContinue,
+    });
   };
 
   const sendMessage = (text: string) => {
@@ -492,7 +441,6 @@ export const ChatRunner = ({ repoPath }: { repoPath: string }) => {
       setShowTimeline(true);
       return;
     }
-
     if (text.trim().toLowerCase() === "/review") {
       setShowReview(true);
       return;
@@ -504,7 +452,7 @@ export const ChatRunner = ({ repoPath }: { repoPath: string }) => {
       const msg: Message = {
         role: "assistant",
         content: next
-          ? "Auto-approve ON — read, search, grep and folder tools will run without asking. Write and code changes still require approval."
+          ? "Auto-approve ON — safe tools (read, search, fetch) will run without asking."
           : "Auto-approve OFF — all tools will ask for permission.",
         type: "text",
       };
@@ -514,14 +462,233 @@ export const ChatRunner = ({ repoPath }: { repoPath: string }) => {
     }
 
     if (text.trim().toLowerCase() === "/clear history") {
-      clearRepoHistory(repoPath);
-      const clearedMsg: Message = {
+      clearRepoMemory(repoPath);
+      const msg: Message = {
         role: "assistant",
         content: "History cleared for this repo.",
         type: "text",
       };
-      setCommitted((prev) => [...prev, clearedMsg]);
-      setAllMessages((prev) => [...prev, clearedMsg]);
+      setCommitted((prev) => [...prev, msg]);
+      setAllMessages((prev) => [...prev, msg]);
+      return;
+    }
+
+    if (text.trim().toLowerCase() === "/chat") {
+      const msg: Message = {
+        role: "assistant",
+        content:
+          "Chat commands: `/chat list` · `/chat load <n>` · `/chat rename <n>` · `/chat delete <n>`",
+        type: "text",
+      };
+      setCommitted((prev) => [...prev, msg]);
+      setAllMessages((prev) => [...prev, msg]);
+      return;
+    }
+
+    if (text.trim().toLowerCase().startsWith("/chat rename")) {
+      const parts = text.trim().split(/\s+/);
+      const newName = parts.slice(2).join("-");
+      if (!newName) {
+        const msg: Message = {
+          role: "assistant",
+          content: "Usage: `/chat rename <new-name>`",
+          type: "text",
+        };
+        setCommitted((prev) => [...prev, msg]);
+        setAllMessages((prev) => [...prev, msg]);
+        return;
+      }
+      const oldName = chatNameRef.current;
+      if (oldName) deleteChat(oldName);
+      updateChatName(newName);
+      saveChat(newName, repoPath, allMessages);
+      setRecentChats((prev) =>
+        [newName, ...prev.filter((n) => n !== newName && n !== oldName)].slice(
+          0,
+          10,
+        ),
+      );
+      const msg: Message = {
+        role: "assistant",
+        content: `Chat renamed to **${newName}**.`,
+        type: "text",
+      };
+      setCommitted((prev) => [...prev, msg]);
+      setAllMessages((prev) => [...prev, msg]);
+      return;
+    }
+
+    if (text.trim().toLowerCase().startsWith("/chat delete")) {
+      const parts = text.trim().split(/\s+/);
+      const name = parts.slice(2).join("-");
+      if (!name) {
+        const msg: Message = {
+          role: "assistant",
+          content: "Usage: `/chat delete <n>`",
+          type: "text",
+        };
+        setCommitted((prev) => [...prev, msg]);
+        setAllMessages((prev) => [...prev, msg]);
+        return;
+      }
+      const deleted = deleteChat(name);
+      if (!deleted) {
+        const msg: Message = {
+          role: "assistant",
+          content: `Chat **${name}** not found.`,
+          type: "text",
+        };
+        setCommitted((prev) => [...prev, msg]);
+        setAllMessages((prev) => [...prev, msg]);
+        return;
+      }
+      if (chatNameRef.current === name) {
+        chatNameRef.current = null;
+        setChatName(null);
+      }
+      setRecentChats((prev) => prev.filter((n) => n !== name));
+      const msg: Message = {
+        role: "assistant",
+        content: `Chat **${name}** deleted.`,
+        type: "text",
+      };
+      setCommitted((prev) => [...prev, msg]);
+      setAllMessages((prev) => [...prev, msg]);
+      return;
+    }
+
+    if (text.trim().toLowerCase() === "/chat list") {
+      const chats = listChats(repoPath);
+      const content =
+        chats.length === 0
+          ? "No saved chats for this repo yet."
+          : `Saved chats:\n\n${chats
+              .map(
+                (c) =>
+                  `- **${c.name}** · ${c.userMessageCount} messages · ${new Date(c.savedAt).toLocaleString()}`,
+              )
+              .join("\n")}`;
+      const msg: Message = { role: "assistant", content, type: "text" };
+      setCommitted((prev) => [...prev, msg]);
+      setAllMessages((prev) => [...prev, msg]);
+      return;
+    }
+
+    if (text.trim().toLowerCase().startsWith("/chat load")) {
+      const parts = text.trim().split(/\s+/);
+      const name = parts.slice(2).join("-");
+      if (!name) {
+        const chats = listChats(repoPath);
+        const content =
+          chats.length === 0
+            ? "No saved chats found."
+            : `Specify a chat name. Recent chats:\n\n${chats
+                .slice(0, 10)
+                .map((c) => `- **${c.name}**`)
+                .join("\n")}`;
+        const msg: Message = { role: "assistant", content, type: "text" };
+        setCommitted((prev) => [...prev, msg]);
+        setAllMessages((prev) => [...prev, msg]);
+        return;
+      }
+      const saved = loadChat(name);
+      if (!saved) {
+        const msg: Message = {
+          role: "assistant",
+          content: `Chat **${name}** not found. Use \`/chat list\` to see saved chats.`,
+          type: "text",
+        };
+        setCommitted((prev) => [...prev, msg]);
+        setAllMessages((prev) => [...prev, msg]);
+        return;
+      }
+      updateChatName(name);
+      setAllMessages(saved.messages);
+      setCommitted(saved.messages);
+      const notice: Message = {
+        role: "assistant",
+        content: `Loaded chat **${name}** · ${saved.userMessageCount} messages · saved ${new Date(saved.savedAt).toLocaleString()}`,
+        type: "text",
+      };
+      setCommitted((prev) => [...prev, notice]);
+      setAllMessages((prev) => [...prev, notice]);
+      return;
+    }
+
+    if (
+      text.trim().toLowerCase() === "/memory list" ||
+      text.trim().toLowerCase() === "/memory"
+    ) {
+      const mems = listMemories(repoPath);
+      const content =
+        mems.length === 0
+          ? "No memories stored for this repo yet."
+          : `Memories for this repo:\n\n${mems
+              .map((m) => `- [${m.id}] ${m.content}`)
+              .join("\n")}`;
+      const msg: Message = { role: "assistant", content, type: "text" };
+      setCommitted((prev) => [...prev, msg]);
+      setAllMessages((prev) => [...prev, msg]);
+      return;
+    }
+
+    if (text.trim().toLowerCase().startsWith("/memory add")) {
+      const content = text.trim().slice("/memory add".length).trim();
+      if (!content) {
+        const msg: Message = {
+          role: "assistant",
+          content: "Usage: `/memory add <content>`",
+          type: "text",
+        };
+        setCommitted((prev) => [...prev, msg]);
+        setAllMessages((prev) => [...prev, msg]);
+        return;
+      }
+      const mem = addMemory(content, repoPath);
+      const msg: Message = {
+        role: "assistant",
+        content: `Memory saved **[${mem.id}]**: ${mem.content}`,
+        type: "text",
+      };
+      setCommitted((prev) => [...prev, msg]);
+      setAllMessages((prev) => [...prev, msg]);
+      return;
+    }
+
+    if (text.trim().toLowerCase().startsWith("/memory delete")) {
+      const id = text.trim().split(/\s+/)[2];
+      if (!id) {
+        const msg: Message = {
+          role: "assistant",
+          content: "Usage: `/memory delete <id>`",
+          type: "text",
+        };
+        setCommitted((prev) => [...prev, msg]);
+        setAllMessages((prev) => [...prev, msg]);
+        return;
+      }
+      const deleted = deleteMemory(id, repoPath);
+      const msg: Message = {
+        role: "assistant",
+        content: deleted
+          ? `Memory **[${id}]** deleted.`
+          : `Memory **[${id}]** not found.`,
+        type: "text",
+      };
+      setCommitted((prev) => [...prev, msg]);
+      setAllMessages((prev) => [...prev, msg]);
+      return;
+    }
+
+    if (text.trim().toLowerCase() === "/memory clear") {
+      clearRepoMemory(repoPath);
+      const msg: Message = {
+        role: "assistant",
+        content: "All memories cleared for this repo.",
+        type: "text",
+      };
+      setCommitted((prev) => [...prev, msg]);
+      setAllMessages((prev) => [...prev, msg]);
       return;
     }
 
@@ -530,8 +697,25 @@ export const ChatRunner = ({ repoPath }: { repoPath: string }) => {
     setCommitted((prev) => [...prev, userMsg]);
     setAllMessages(nextAll);
     toolResultCache.current.clear();
+    batchApprovedRef.current = false;
+
+    inputHistoryRef.current = [
+      text,
+      ...inputHistoryRef.current.filter((m) => m !== text),
+    ].slice(0, 50);
+    historyIndexRef.current = -1;
+
+    if (!chatName) {
+      const name =
+        getChatNameSuggestions(nextAll)[0] ??
+        `chat-${new Date().toISOString().slice(0, 10)}`;
+      updateChatName(name);
+      setRecentChats((prev) =>
+        [name, ...prev.filter((n) => n !== name)].slice(0, 10),
+      );
+      saveChat(name, repoPath, nextAll);
+    }
 
-    // Create a fresh abort controller for this request
     const abort = new AbortController();
     abortControllerRef.current = abort;
 
@@ -544,10 +728,10 @@ export const ChatRunner = ({ repoPath }: { repoPath: string }) => {
   useInput((input, key) => {
     if (showTimeline) return;
 
-    // ESC while thinking → abort the in-flight request and go idle
     if (stage.type === "thinking" && key.escape) {
       abortControllerRef.current?.abort();
       abortControllerRef.current = null;
+      batchApprovedRef.current = false;
       setStage({ type: "idle" });
       return;
     }
@@ -557,7 +741,23 @@ export const ChatRunner = ({ repoPath }: { repoPath: string }) => {
         process.exit(0);
         return;
       }
-
+      if (key.upArrow && inputHistoryRef.current.length > 0) {
+        const next = Math.min(
+          historyIndexRef.current + 1,
+          inputHistoryRef.current.length - 1,
+        );
+        historyIndexRef.current = next;
+        setInputValue(inputHistoryRef.current[next]!);
+        setInputKey((k) => k + 1);
+        return;
+      }
+      if (key.downArrow) {
+        const next = historyIndexRef.current - 1;
+        historyIndexRef.current = next;
+        setInputValue(next < 0 ? "" : inputHistoryRef.current[next]!);
+        setInputKey((k) => k + 1);
+        return;
+      }
       if (key.tab && inputValue.startsWith("/")) {
         const q = inputValue.toLowerCase();
         const match = COMMANDS.find((c) => c.cmd.startsWith(q));
@@ -582,7 +782,7 @@ export const ChatRunner = ({ repoPath }: { repoPath: string }) => {
                 ?.replace(/\.git$/, "") ?? "repo";
             const destPath = path.join(os.tmpdir(), repoName);
             const fileCount = walkDir(destPath).length;
-            appendHistory({
+            appendMemory({
               kind: "url-fetched",
               detail: repoUrl,
               summary: `Cloned ${repoName} — ${fileCount} files`,
@@ -622,37 +822,36 @@ export const ChatRunner = ({ repoPath }: { repoPath: string }) => {
     if (stage.type === "clone-exists") {
       if (input === "y" || input === "Y") {
         const { repoUrl, repoPath: existingPath } = stage;
-        const cloneUrl = toCloneUrl(repoUrl);
         setStage({ type: "cloning", repoUrl });
-        startCloneRepo(cloneUrl, { forceReclone: true }).then((result) => {
-          if (result.done) {
-            const fileCount = walkDir(existingPath).length;
-            setStage({
-              type: "clone-done",
-              repoUrl,
-              destPath: existingPath,
-              fileCount,
-            });
-          } else {
-            setStage({
-              type: "clone-error",
-              message:
-                !result.folderExists && result.error
-                  ? result.error
-                  : "Clone failed",
-            });
-          }
-        });
+        startCloneRepo(toCloneUrl(repoUrl), { forceReclone: true }).then(
+          (result) => {
+            if (result.done) {
+              setStage({
+                type: "clone-done",
+                repoUrl,
+                destPath: existingPath,
+                fileCount: walkDir(existingPath).length,
+              });
+            } else {
+              setStage({
+                type: "clone-error",
+                message:
+                  !result.folderExists && result.error
+                    ? result.error
+                    : "Clone failed",
+              });
+            }
+          },
+        );
         return;
       }
       if (input === "n" || input === "N") {
         const { repoUrl, repoPath: existingPath } = stage;
-        const fileCount = walkDir(existingPath).length;
         setStage({
           type: "clone-done",
           repoUrl,
           destPath: existingPath,
-          fileCount,
+          fileCount: walkDir(existingPath).length,
         });
         return;
       }
@@ -663,19 +862,17 @@ export const ChatRunner = ({ repoPath }: { repoPath: string }) => {
       if (key.return || key.escape) {
         if (stage.type === "clone-done") {
           const repoName = stage.repoUrl.split("/").pop() ?? "repo";
-
           const summaryMsg: Message = {
             role: "assistant",
             type: "text",
             content: `Cloned **${repoName}** (${stage.fileCount} files) to \`${stage.destPath}\`.\n\nAsk me anything about it — I can read files, explain how it works, or suggest improvements.`,
           };
-
           const contextMsg: Message = {
             role: "assistant",
             type: "tool",
             toolName: "fetch",
             content: stage.repoUrl,
-            result: `Clone complete. Repo: ${repoName}. Local path: ${stage.destPath}. ${stage.fileCount} files. Use read-file with full path e.g. read-file ${stage.destPath}/README.md`,
+            result: `Clone complete. Repo: ${repoName}. Local path: ${stage.destPath}. ${stage.fileCount} files.`,
             approved: true,
           };
           const withClone = [...allMessages, contextMsg, summaryMsg];
@@ -697,6 +894,7 @@ export const ChatRunner = ({ repoPath }: { repoPath: string }) => {
         return;
       }
       if (input === "n" || input === "N" || key.escape) {
+        batchApprovedRef.current = false;
         stage.resolve(false);
         return;
       }
@@ -720,7 +918,7 @@ export const ChatRunner = ({ repoPath }: { repoPath: string }) => {
           const msg = allMessages[pendingMsgIndex];
           if (msg?.type === "plan") {
             setCommitted((prev) => [...prev, { ...msg, applied: false }]);
-            appendHistory({
+            appendMemory({
               kind: "code-skipped",
               detail: msg.patches
                 .map((p: { path: string }) => p.path)
@@ -737,7 +935,7 @@ export const ChatRunner = ({ repoPath }: { repoPath: string }) => {
       if (key.return || input === "a" || input === "A") {
         try {
           applyPatches(repoPath, stage.patches);
-          appendHistory({
+          appendMemory({
             kind: "code-applied",
             detail: stage.patches.map((p) => p.path).join(", "),
             summary: `Applied changes to ${stage.patches.length} file(s)`,
@@ -788,29 +986,19 @@ export const ChatRunner = ({ repoPath }: { repoPath: string }) => {
       .catch(() => walkDir(repoPath))
       .then((fileTree) => {
         const importantFiles = readImportantFiles(repoPath, fileTree);
-        const historySummary = buildHistorySummary(repoPath);
+        const historySummary = buildMemorySummary(repoPath);
         const lensFile = readLensFile(repoPath);
         const lensContext = lensFile
-          ? `
-
-## LENS.md (previous analysis)
-${lensFile.overview}
-
-Important folders: ${lensFile.importantFolders.join(", ")}
-Suggestions: ${lensFile.suggestions.slice(0, 3).join("; ")}`
+          ? `\n\n## LENS.md (previous analysis)\n${lensFile.overview}\n\nImportant folders: ${lensFile.importantFolders.join(", ")}\nSuggestions: ${lensFile.suggestions.slice(0, 3).join("; ")}`
           : "";
+        const toolsSection = registry.buildSystemPromptSection();
         setSystemPrompt(
-          buildSystemPrompt(importantFiles, historySummary) + lensContext,
+          buildSystemPrompt(importantFiles, historySummary, toolsSection) +
+            lensContext,
         );
-        const historyNote = historySummary
-          ? "\n\nI have memory of previous actions in this repo."
-          : "";
-        const lensGreetNote = lensFile
-          ? "\n\nFound LENS.md — I have context from a previous analysis of this repo."
-          : "";
         const greeting: Message = {
           role: "assistant",
-          content: `Welcome to Lens \nCodebase loaded — ${importantFiles.length} files indexed.${historyNote}${lensGreetNote}\nAsk me anything, tell me what to build, share a URL, or ask me to read/write files.\n\nTip: type /timeline to browse commit history.`,
+          content: `Welcome to Lens\nCodebase loaded — ${importantFiles.length} files indexed.${historySummary ? "\n\nI have memory of previous actions in this repo." : ""}${lensFile ? "\n\nFound LENS.md — I have context from a previous analysis of this repo." : ""}\nAsk me anything, tell me what to build, share a URL, or ask me to read/write files.\n\nTip: type /timeline to browse commit history.`,
           type: "text",
         };
         setCommitted([greeting]);
@@ -822,8 +1010,7 @@ Suggestions: ${lensFile.suggestions.slice(0, 3).join("; ")}`
 
   if (stage.type === "picking-provider")
     return <ProviderPicker onDone={handleProviderDone} />;
-
-  if (stage.type === "loading") {
+  if (stage.type === "loading")
     return (
       <Box gap={1} marginTop={1}>
         <Text color={ACCENT}>*</Text>
@@ -835,23 +1022,17 @@ Suggestions: ${lensFile.suggestions.slice(0, 3).join("; ")}`
         </Text>
       </Box>
     );
-  }
-
-  if (showTimeline) {
+  if (showTimeline)
     return (
       <TimelineRunner
         repoPath={repoPath}
         onExit={() => setShowTimeline(false)}
       />
     );
-  }
-
-  if (showReview) {
+  if (showReview)
     return (
       <ReviewCommand path={repoPath} onExit={() => setShowReview(false)} />
     );
-  }
-
   if (stage.type === "clone-offer")
     return <CloneOfferView stage={stage} committed={committed} />;
   if (stage.type === "cloning")
@@ -892,18 +1073,21 @@ Suggestions: ${lensFile.suggestions.slice(0, 3).join("; ")}`
           {inputValue.startsWith("/") && (
             <CommandPalette
               query={inputValue}
-              onSelect={(cmd) => {
-                setInputValue(cmd);
-              }}
+              onSelect={(cmd) => setInputValue(cmd)}
+              recentChats={recentChats}
             />
           )}
           <InputBox
             value={inputValue}
-            onChange={setInputValue}
+            onChange={(v) => {
+              historyIndexRef.current = -1;
+              setInputValue(v);
+            }}
             onSubmit={(val) => {
               if (val.trim()) sendMessage(val.trim());
               setInputValue("");
             }}
+            inputKey={inputKey}
           />
           <ShortcutBar autoApprove={autoApprove} />
         </Box>