From 5598c09d08a356a32492c53535b5a6e81f2b8a42 Mon Sep 17 00:00:00 2001
From: Charles Packer <packercharles@gmail.com>
Date: Sun, 1 Feb 2026 17:13:17 -0800
Subject: [PATCH] fix(cli): eliminate slash command menu render flicker (#775)

Co-authored-by: Letta <noreply@letta.com>
---
 src/cli/components/InputRich.tsx              |  6 +-
 .../components/SlashCommandAutocomplete.tsx   | 93 ++++++++++---------
 2 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/src/cli/components/InputRich.tsx b/src/cli/components/InputRich.tsx
index cec3209..0ad1a77 100644
--- a/src/cli/components/InputRich.tsx
+++ b/src/cli/components/InputRich.tsx
@@ -115,6 +115,7 @@ const InputFooter = memo(function InputFooter({
   isOpenAICodexProvider,
   isByokProvider,
   isAutocompleteActive,
+  hideFooter,
 }: {
   ctrlCPressed: boolean;
   escapePressed: boolean;
@@ -127,9 +128,10 @@ const InputFooter = memo(function InputFooter({
   isOpenAICodexProvider: boolean;
   isByokProvider: boolean;
   isAutocompleteActive: boolean;
+  hideFooter: boolean;
 }) {
   // Hide footer when autocomplete is showing
-  if (isAutocompleteActive) {
+  if (hideFooter || isAutocompleteActive) {
     return null;
   }
 
@@ -258,6 +260,7 @@ export function Input({
   const [cursorPos, setCursorPos] = useState<number | undefined>(undefined);
   const [currentCursorPosition, setCurrentCursorPosition] = useState(0);
   const interactionEnabled = visible && inputEnabled;
+  const hideFooter = interactionEnabled && value.startsWith("/");
 
   // Command history
   const [history, setHistory] = useState<string[]>([]);
@@ -1002,6 +1005,7 @@ export function Input({
             currentModelProvider === OPENAI_CODEX_PROVIDER_NAME
           }
           isAutocompleteActive={isAutocompleteActive}
+          hideFooter={hideFooter}
         />
       </Box>
     </Box>
diff --git a/src/cli/components/SlashCommandAutocomplete.tsx b/src/cli/components/SlashCommandAutocomplete.tsx
index ad5055d..b36ca30 100644
--- a/src/cli/components/SlashCommandAutocomplete.tsx
+++ b/src/cli/components/SlashCommandAutocomplete.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useLayoutEffect, useMemo, useState } from "react";
 import { settingsManager } from "../../settings-manager";
 import { commands } from "../commands/registry";
 import { useAutocompleteNavigation } from "../hooks/useAutocompleteNavigation";
@@ -50,10 +50,7 @@ export function SlashCommandAutocomplete({
   agentId,
   workingDirectory = process.cwd(),
 }: AutocompleteProps) {
-  const [matches, setMatches] = useState<CommandMatch[]>([]);
   const [customCommands, setCustomCommands] = useState<CommandMatch[]>([]);
-  // Track if we should show "no matching commands" (non-empty query with no results)
-  const [showNoMatches, setShowNoMatches] = useState(false);
 
   // Load custom commands once on mount
   useEffect(() => {
@@ -108,6 +105,50 @@ export function SlashCommandAutocomplete({
     );
   }, [agentId, workingDirectory, customCommands]);
 
+  const queryInfo = useMemo(
+    () => extractSearchQuery(currentInput, cursorPosition),
+    [currentInput, cursorPosition],
+  );
+
+  const { matches, showNoMatches, hideAutocomplete } = useMemo(() => {
+    if (!queryInfo) {
+      return {
+        matches: [] as CommandMatch[],
+        showNoMatches: false,
+        hideAutocomplete: true,
+      };
+    }
+
+    const { query, hasSpaceAfter } = queryInfo;
+    if (hasSpaceAfter) {
+      return {
+        matches: [] as CommandMatch[],
+        showNoMatches: false,
+        hideAutocomplete: true,
+      };
+    }
+
+    if (query.length === 0) {
+      return {
+        matches: allCommands,
+        showNoMatches: false,
+        hideAutocomplete: allCommands.length === 0,
+      };
+    }
+
+    const lowerQuery = query.toLowerCase();
+    const filtered = allCommands.filter((item) => {
+      const cmdName = item.cmd.slice(1).toLowerCase(); // Remove leading "/"
+      return cmdName.includes(lowerQuery);
+    });
+
+    return {
+      matches: filtered,
+      showNoMatches: filtered.length === 0,
+      hideAutocomplete: false,
+    };
+  }, [queryInfo, allCommands]);
+
   const { selectedIndex } = useAutocompleteNavigation({
     matches,
     onSelect: onSelect ? (item) => onSelect(item.cmd) : undefined,
@@ -119,51 +160,11 @@ export function SlashCommandAutocomplete({
   });
 
   // Manually manage active state to include the "no matches" case
-  useEffect(() => {
+  useLayoutEffect(() => {
     const isActive = matches.length > 0 || showNoMatches;
     onActiveChange?.(isActive);
   }, [matches.length, showNoMatches, onActiveChange]);
 
-  // Update matches when input changes
-  useEffect(() => {
-    const result = extractSearchQuery(currentInput, cursorPosition);
-
-    if (!result) {
-      setMatches([]);
-      setShowNoMatches(false);
-      return;
-    }
-
-    const { query, hasSpaceAfter } = result;
-
-    // If there's a space after the command, user has moved on - hide autocomplete
-    if (hasSpaceAfter) {
-      setMatches([]);
-      setShowNoMatches(false);
-      return;
-    }
-
-    let newMatches: CommandMatch[];
-
-    // If query is empty (just typed "/"), show all commands
-    if (query.length === 0) {
-      newMatches = allCommands;
-      setMatches(newMatches);
-      setShowNoMatches(false);
-    } else {
-      // Filter commands that contain the query (case-insensitive)
-      // Match against the command name without the leading "/"
-      const lowerQuery = query.toLowerCase();
-      newMatches = allCommands.filter((item) => {
-        const cmdName = item.cmd.slice(1).toLowerCase(); // Remove leading "/"
-        return cmdName.includes(lowerQuery);
-      });
-      setMatches(newMatches);
-      // Show "no matches" message if query is non-empty and no results
-      setShowNoMatches(newMatches.length === 0);
-    }
-  }, [currentInput, cursorPosition, allCommands]);
-
   // Don't show if input doesn't start with "/"
   if (!currentInput.startsWith("/")) {
     return null;
@@ -179,7 +180,7 @@ export function SlashCommandAutocomplete({
   }
 
   // Don't show if no matches and query is empty (shouldn't happen, but safety check)
-  if (matches.length === 0) {
+  if (hideAutocomplete || matches.length === 0) {
     return null;
   }