diff --git a/src/components/ChatForm/ChatForm.tsx b/src/components/ChatForm/ChatForm.tsx
index c53371ea..3da20382 100644
--- a/src/components/ChatForm/ChatForm.tsx
+++ b/src/components/ChatForm/ChatForm.tsx
@@ -55,6 +55,7 @@ export const ChatForm: React.FC<{
   hasContextFile: boolean;
   commands: ChatState["rag_commands"];
   attachFile: ChatState["active_file"];
+  setSelectedCommand: (command: string) => void;
   requestCommandsCompletion: (
     query: string,
     cursor: number,
@@ -76,7 +77,8 @@ export const ChatForm: React.FC<{
   hasContextFile,
   commands,
   attachFile,
-  // requestCommandsCompletion,
+  requestCommandsCompletion,
+  setSelectedCommand,
 }) => {
   const [value, setValue] = React.useState("");
 
@@ -91,6 +93,28 @@ export const ChatForm: React.FC<{
   };
 
   const handleEnter = useOnPressedEnter(handleSubmit);
+
+  const handleChange = (command: React.SetStateAction<string>) => {
+    setValue(command);
+
+    const str = typeof command === "function" ? command(value) : command;
+
+    if (
+      str.endsWith(" ") &&
+      commands.available_commands.includes(str.slice(0, -1))
+    ) {
+      setSelectedCommand(str);
+    } else {
+      setSelectedCommand("");
+    }
+
+    // TODO: get the  cursor position
+    // Does order matter here?
+    if (str.startsWith("@")) {
+      requestCommandsCompletion(str, str.length);
+    }
+    // set selected command if value ends with space and is in commands
+  };
   if (error) {
     return (
       <ErrorCallout mt="2" onClick={clearError} timeout={null}>
@@ -99,6 +123,8 @@ export const ChatForm: React.FC<{
     );
   }
 
+  // console.log({ commands });
+
   return (
     <Box mt="1" position="relative">
       {!isOnline && <Callout type="info">Offline</Callout>}
@@ -136,11 +162,19 @@ export const ChatForm: React.FC<{
         onSubmit={() => handleSubmit()}
       >
         <ComboBox
-          commands={commands.available_commands}
+          // maybe add a ref for cursor position?
+          commands={commands.available_commands.map(
+            (c) => commands.selected_command + c,
+          )}
           value={value}
-          onChange={setValue}
-          onSubmit={handleEnter}
-          placeholder={commands.length > 0 ? "Type @ for commands" : ""}
+          onChange={handleChange}
+          onSubmit={(event) => {
+            // console.log("submit", event);
+            handleEnter(event);
+          }}
+          placeholder={
+            commands.available_commands.length > 0 ? "Type @ for commands" : ""
+          }
           render={(props) => <TextArea disabled={isStreaming} {...props} />}
         />
         <Flex gap="2" className={styles.buttonGroup}>
diff --git a/src/components/ComboBox/ComboBox.tsx b/src/components/ComboBox/ComboBox.tsx
index d75c3457..9914eb35 100644
--- a/src/components/ComboBox/ComboBox.tsx
+++ b/src/components/ComboBox/ComboBox.tsx
@@ -60,7 +60,7 @@ const Popover: React.FC<
     </Box>
   );
 };
-
+// TODO: force this open when there are commands
 export const ComboBox: React.FC<{
   commands: string[];
   onChange: React.Dispatch<React.SetStateAction<string>>;
diff --git a/src/events/chat.ts b/src/events/chat.ts
index a192acbb..f8a22c9b 100644
--- a/src/events/chat.ts
+++ b/src/events/chat.ts
@@ -41,6 +41,7 @@ export enum EVENT_NAMES_TO_CHAT {
   TOGGLE_ACTIVE_FILE = "chat_toggle_active_file",
   RECEIVE_AT_COMMAND_COMPLETION = "chat_receive_at_command_completion",
   RECEIVE_AT_COMMAND_PREVIEW = "chat_receive_at_command_preview",
+  SET_SELECTED_AT_COMMAND = "chat_set_selected_command",
 }
 
 export type ChatThread = {
@@ -216,6 +217,19 @@ export function isReceiveAtCommandPreview(
   if (!isActionToChat(action)) return false;
   return action.type === EVENT_NAMES_TO_CHAT.RECEIVE_AT_COMMAND_PREVIEW;
 }
+
+export interface SetSelectedAtCommand extends ActionToChat {
+  type: EVENT_NAMES_TO_CHAT.SET_SELECTED_AT_COMMAND;
+  payload: { id: string; command: string };
+}
+
+export function isSetSelectedAtCommand(
+  action: unknown,
+): action is SetSelectedAtCommand {
+  if (!isActionToChat(action)) return false;
+  return action.type === EVENT_NAMES_TO_CHAT.SET_SELECTED_AT_COMMAND;
+}
+
 export interface ToggleActiveFile extends ActionToChat {
   type: EVENT_NAMES_TO_CHAT.TOGGLE_ACTIVE_FILE;
   payload: { id: string; attach_file: boolean };
diff --git a/src/features/Chat.tsx b/src/features/Chat.tsx
index 3752a7b1..1a6dd1fd 100644
--- a/src/features/Chat.tsx
+++ b/src/features/Chat.tsx
@@ -30,6 +30,8 @@ export const Chat: React.FC<{ style?: React.CSSProperties }> = (props) => {
     sendReadyMessage,
     handleNewFileClick,
     handlePasteDiffClick,
+    requestCommandsCompletion,
+    setSelectedCommand,
   } = useEventBusForChat();
 
   const maybeSendToSideBar =
@@ -113,6 +115,8 @@ export const Chat: React.FC<{ style?: React.CSSProperties }> = (props) => {
         handleContextFile={handleContextFile}
         hasContextFile={hasContextFile}
         commands={state.rag_commands}
+        requestCommandsCompletion={requestCommandsCompletion}
+        setSelectedCommand={setSelectedCommand}
         onClose={maybeSendToSideBar}
         attachFile={state.active_file}
       />
diff --git a/src/hooks/useEventBusForChat.ts b/src/hooks/useEventBusForChat.ts
index a9d176a5..bb359238 100644
--- a/src/hooks/useEventBusForChat.ts
+++ b/src/hooks/useEventBusForChat.ts
@@ -36,6 +36,8 @@ import {
   ReadyMessage,
   RequestAtCommandCompletion,
   isReceiveAtCommandCompletion,
+  SetSelectedAtCommand,
+  isSetSelectedAtCommand,
 } from "../events";
 import { useConfig } from "../contexts/config-context";
 import { usePostMessage } from "./usePostMessage";
@@ -273,6 +275,18 @@ function reducer(state: ChatState, action: ActionToChat): ChatState {
       rag_commands: {
         ...state.rag_commands,
         available_commands: action.payload.completions,
+        // arguments: args,
+        is_cmd_executable: action.payload.is_cmd_executable,
+      },
+    };
+  }
+
+  if (isThisChat && isSetSelectedAtCommand(action)) {
+    return {
+      ...state,
+      rag_commands: {
+        ...state.rag_commands,
+        selected_command: action.payload.command,
       },
     };
   }
@@ -538,6 +552,14 @@ export const useEventBusForChat = () => {
     postMessage(action);
   }
 
+  function setSelectedCommand(command: string) {
+    const action: SetSelectedAtCommand = {
+      type: EVENT_NAMES_TO_CHAT.SET_SELECTED_AT_COMMAND,
+      payload: { id: state.chat.id, command },
+    };
+    postMessage(action);
+  }
+
   useEffectOnce(() => {
     requestCommandsCompletion("@", 1);
   });
@@ -558,5 +580,6 @@ export const useEventBusForChat = () => {
     handleNewFileClick,
     handlePasteDiffClick,
     requestCommandsCompletion,
+    setSelectedCommand,
   };
 };
diff --git a/src/services/refact.ts b/src/services/refact.ts
index 85600d93..82111769 100644
--- a/src/services/refact.ts
+++ b/src/services/refact.ts
@@ -1,5 +1,7 @@
 const CHAT_URL = `/v1/chat`;
 const CAPS_URL = `/v1/caps`;
+const AT_COMMAND_COMPLETION = "/v1/at-command-completion";
+const AT_COMMAND_PREVIEW = "/v1/at-command-preview";
 
 export type ChatRole = "user" | "assistant" | "context_file" | "system";
 
@@ -197,3 +199,116 @@ export type CapsResponse = {
   tokenizer_rewrite_path: Record<string, unknown>;
   chat_rag_functions?: string[];
 };
+
+interface Replace {
+  0: number;
+  1: number;
+}
+
+export type CommandCompletionResponse = {
+  completions: string[];
+  replace: Replace;
+  is_cmd_executable: false;
+};
+
+function isCommandCompletionResponse(
+  json: unknown,
+): json is CommandCompletionResponse {
+  if (!json) return false;
+  if (typeof json !== "object") return false;
+  if (!("completions" in json)) return false;
+  if (!("replace" in json)) return false;
+  if (!("is_cmd_executable" in json)) return false;
+  return true;
+}
+
+export async function getAtCommandCompletion(
+  query: string,
+  cursor: number,
+  number: number,
+  lspUrl?: string,
+): Promise<CommandCompletionResponse> {
+  const completionEndpoint = lspUrl
+    ? `${lspUrl.replace(/\/*$/, "")}${AT_COMMAND_COMPLETION}`
+    : AT_COMMAND_COMPLETION;
+
+  const response = await fetch(completionEndpoint, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({ query, cursor, top_n: number }),
+  });
+
+  if (!response.ok) {
+    throw new Error(response.statusText);
+  }
+
+  const json: unknown = await response.json();
+  if (!isCommandCompletionResponse(json)) {
+    throw new Error("Invalid response from completion");
+  }
+
+  return json;
+}
+
+export type CommandPreviewResponse = {
+  messages: {
+    choices: {
+      delta: {
+        content: {
+          file_content: string;
+          file_name: string;
+        };
+        role: "content_file";
+      };
+      finish_reason: null;
+      index: number;
+    }[];
+  }[];
+};
+
+function isCommandPreviewResponse(
+  json: unknown,
+): json is CommandPreviewResponse {
+  if (!json) return false;
+  if (typeof json !== "object") return false;
+  if (!("messages" in json)) return false;
+  if (!Array.isArray(json.messages)) return false;
+  if (!("choices" in json.messages[0])) return false;
+  return true;
+}
+
+export async function getAtCommandPreview(
+  query: string,
+  lspUrl?: string,
+): Promise<{ file_name: string; file_content: string }> {
+  const previewEndpoint = lspUrl
+    ? `${lspUrl.replace(/\/*$/, "")}${AT_COMMAND_PREVIEW}`
+    : AT_COMMAND_PREVIEW;
+
+  const response = await fetch(previewEndpoint, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    redirect: "follow",
+    cache: "no-cache",
+    referrer: "no-referrer",
+    credentials: "same-origin",
+    body: JSON.stringify({ query }),
+  });
+
+  if (!response.ok) {
+    throw new Error(response.statusText);
+  }
+
+  const json: unknown = await response.json();
+
+  if (!isCommandPreviewResponse(json)) {
+    throw new Error("Invalid response from command preview");
+  }
+  const { file_name, file_content } = json.messages[0].choices[0].delta.content;
+
+  return { file_name, file_content };
+}