diff --git a/README.md b/README.md
index 1691d070..4a7cb01f 100644
--- a/README.md
+++ b/README.md
@@ -175,14 +175,6 @@ interface RequestAtCommandPreview extends ActionFromChat {
   payload: { id: string; query: string; cursor: number };
 }
 
-/**
- * This message is sent from the host to the chat contains the result of command preview request.
- */
-interface ReceiveAtCommandPreview extends ActionToChat {
-  type: EVENT_NAMES_TO_CHAT.RECEIVE_AT_COMMAND_PREVIEW; // = "chat_receive_at_command_preview"
-  payload: { id: string; preview: ChatContextFileMessage[] };
-}
-
 /**
  * This message is sent from the chat component to the host when the response to the question is received.
  */
diff --git a/src/components/ChatForm/CharForm.test.tsx b/src/components/ChatForm/CharForm.test.tsx
index 6c5db8eb..b7e773e7 100644
--- a/src/components/ChatForm/CharForm.test.tsx
+++ b/src/components/ChatForm/CharForm.test.tsx
@@ -1,44 +1,50 @@
 import { render } from "../../utils/test-utils";
 import { describe, expect, test, vi } from "vitest";
-import { ChatForm } from "./ChatForm";
+import { ChatForm, ChatFormProps } from "./ChatForm";
+import React from "react";
+
+const noop = () => ({});
+
+const App: React.FC<Partial<ChatFormProps>> = (props) => {
+  const defaultProps: ChatFormProps = {
+    removePreviewFileByName: noop,
+    selectedSnippet: { code: "", language: "" },
+    onSubmit: noop,
+    isStreaming: false,
+    onStopStreaming: noop,
+    onSetChatModel: noop,
+    model: "gpt-3.5-turbo",
+    caps: { fetching: false, default_cap: "foo", available_caps: [] },
+    error: "",
+    clearError: noop,
+    canChangeModel: false,
+    handleContextFile: noop,
+    hasContextFile: false,
+    commands: {
+      available_commands: [],
+      selected_command: "",
+      arguments: [],
+      is_cmd_executable: false,
+    },
+    requestCommandsCompletion: noop,
+    attachFile: {
+      name: "",
+      can_paste: false,
+      attach: false,
+    },
+    setSelectedCommand: noop,
+    filesInPreview: [],
+    ...props,
+  };
+
+  return <ChatForm {...defaultProps} />;
+};
 
 describe("ChatForm", () => {
   test("when I push enter it should call onSubmit", async () => {
     const fakeOnSubmit = vi.fn();
 
-    const { user, ...app } = render(
-      <ChatForm
-        removePreviewFileByName={() => ({})}
-        selectedSnippet={{ code: "", language: "" }}
-        onSubmit={fakeOnSubmit}
-        isStreaming={false}
-        onStopStreaming={vi.fn}
-        onSetChatModel={vi.fn}
-        model="gpt-3.5-turbo"
-        caps={{ fetching: false, default_cap: "foo", available_caps: [] }}
-        error=""
-        clearError={vi.fn}
-        canChangeModel={false}
-        handleContextFile={vi.fn}
-        hasContextFile={false}
-        commands={{
-          available_commands: [],
-          selected_command: "",
-          arguments: [],
-          is_cmd_executable: false,
-        }}
-        requestCommandsCompletion={() => ({})}
-        attachFile={{
-          name: "",
-          can_paste: false,
-          attach: false,
-        }}
-        setSelectedCommand={() => ({})}
-        executeCommand={() => ({})}
-        filesInPreview={[]}
-        // setSelectedCommand={() => ({})}
-      />,
-    );
+    const { user, ...app } = render(<App onSubmit={fakeOnSubmit} />);
 
     const textarea: HTMLTextAreaElement | null =
       app.container.querySelector("textarea");
@@ -54,38 +60,7 @@ describe("ChatForm", () => {
   test("when I hole shift and push enter it should not call onSubmit", async () => {
     const fakeOnSubmit = vi.fn();
 
-    const { user, ...app } = render(
-      <ChatForm
-        removePreviewFileByName={() => ({})}
-        selectedSnippet={{ code: "", language: "" }}
-        onSubmit={fakeOnSubmit}
-        isStreaming={false}
-        onStopStreaming={vi.fn}
-        onSetChatModel={vi.fn}
-        model="gpt-3.5-turbo"
-        caps={{ fetching: false, default_cap: "foo", available_caps: [] }}
-        error=""
-        clearError={vi.fn}
-        canChangeModel={false}
-        handleContextFile={vi.fn}
-        hasContextFile={false}
-        commands={{
-          available_commands: [],
-          selected_command: "",
-          arguments: [],
-          is_cmd_executable: false,
-        }}
-        requestCommandsCompletion={() => ({})}
-        attachFile={{
-          name: "",
-          can_paste: false,
-          attach: false,
-        }}
-        setSelectedCommand={() => ({})}
-        executeCommand={() => ({})}
-        filesInPreview={[]}
-      />,
-    );
+    const { user, ...app } = render(<App onSubmit={fakeOnSubmit} />);
     const textarea = app.container.querySelector("textarea");
     expect(textarea).not.toBeNull();
     if (textarea) {
diff --git a/src/components/ChatForm/ChatForm.stories.tsx b/src/components/ChatForm/ChatForm.stories.tsx
index a78165ed..337f4b65 100644
--- a/src/components/ChatForm/ChatForm.stories.tsx
+++ b/src/components/ChatForm/ChatForm.stories.tsx
@@ -81,7 +81,6 @@ const meta = {
     selectedSnippet: { code: "", language: "" },
     removePreviewFileByName: () => ({}),
     requestCommandsCompletion: () => ({}),
-    executeCommand: () => ({}),
     setSelectedCommand: () => ({}),
   },
 } satisfies Meta<typeof ChatForm>;
diff --git a/src/components/ChatForm/ChatForm.tsx b/src/components/ChatForm/ChatForm.tsx
index d2e7fafb..26f1aa73 100644
--- a/src/components/ChatForm/ChatForm.tsx
+++ b/src/components/ChatForm/ChatForm.tsx
@@ -41,7 +41,7 @@ const CapsSelect: React.FC<{
   );
 };
 
-export const ChatForm: React.FC<{
+export type ChatFormProps = {
   onSubmit: (str: string) => void;
   onClose?: () => void;
   className?: string;
@@ -63,11 +63,12 @@ export const ChatForm: React.FC<{
     number?: number,
   ) => void;
   setSelectedCommand: (command: string) => void;
-  executeCommand: (command: string, cursor: number) => void;
   filesInPreview: ChatContextFile[];
   selectedSnippet: ChatState["selected_snippet"];
   removePreviewFileByName: ComboBoxProps["removePreviewFileByName"];
-}> = ({
+};
+
+export const ChatForm: React.FC<ChatFormProps> = ({
   onSubmit,
   onClose,
   className,
@@ -85,12 +86,10 @@ export const ChatForm: React.FC<{
   attachFile,
   requestCommandsCompletion,
   setSelectedCommand,
-  executeCommand,
   filesInPreview,
   selectedSnippet,
   removePreviewFileByName,
 }) => {
-  //TODO: handle attached snippet, when code is highlighted and chat is opened
   const [value, setValue] = React.useState("");
   const [snippetAdded, setSnippetAdded] = React.useState(false);
 
@@ -185,7 +184,6 @@ export const ChatForm: React.FC<{
             commands.available_commands.length > 0 ? "Type @ for commands" : ""
           }
           render={(props) => <TextArea disabled={isStreaming} {...props} />}
-          executeCommand={executeCommand}
           selectedCommand={commands.selected_command}
           setSelectedCommand={setSelectedCommand}
           removePreviewFileByName={removePreviewFileByName}
diff --git a/src/components/ComboBox/ComboBox.stories.tsx b/src/components/ComboBox/ComboBox.stories.tsx
index 90a62a4c..b04dd27b 100644
--- a/src/components/ComboBox/ComboBox.stories.tsx
+++ b/src/components/ComboBox/ComboBox.stories.tsx
@@ -15,7 +15,6 @@ const App: React.FC<ComboBoxProps> = (props) => {
         onChange={setValue}
         selectedCommand={selectedCommand}
         setSelectedCommand={setSelectedCommand}
-        executeCommand={() => ({})}
       />
     </Card>
   );
diff --git a/src/components/ComboBox/ComboBox.test.tsx b/src/components/ComboBox/ComboBox.test.tsx
index b7d685c1..c5c66f32 100644
--- a/src/components/ComboBox/ComboBox.test.tsx
+++ b/src/components/ComboBox/ComboBox.test.tsx
@@ -19,7 +19,6 @@ const App = (props: Partial<ComboBoxProps>) => {
     onSubmit: onSubmitSpy,
     placeholder: "Type @ for commands",
     render: (props: TextAreaProps) => <TextArea {...props} />,
-    executeCommand: () => ({}),
     selectedCommand,
     setSelectedCommand,
     removePreviewFileByName: () => ({}),
@@ -128,7 +127,9 @@ describe("ComboBox", () => {
 
   test("clicking on an executable command", async () => {
     const executableSpy = vi.fn();
-    const { user, ...app } = render(<App executeCommand={executableSpy} />);
+    const { user, ...app } = render(
+      <App requestCommandsCompletion={executableSpy} />,
+    );
     const textarea = app.getByRole("combobox");
     await user.type(textarea, "@");
 
@@ -140,7 +141,9 @@ describe("ComboBox", () => {
 
   test("execute command when pressing enter", async () => {
     const executableSpy = vi.fn();
-    const { user, ...app } = render(<App executeCommand={executableSpy} />);
+    const { user, ...app } = render(
+      <App requestCommandsCompletion={executableSpy} />,
+    );
     const textarea = app.getByRole("combobox");
     await user.type(textarea, "@wo{Enter}");
     expect(executableSpy).toHaveBeenLastCalledWith("@workspace ", 11);
@@ -148,7 +151,9 @@ describe("ComboBox", () => {
 
   test("execute command when pressing tab", async () => {
     const executableSpy = vi.fn();
-    const { user, ...app } = render(<App executeCommand={executableSpy} />);
+    const { user, ...app } = render(
+      <App requestCommandsCompletion={executableSpy} />,
+    );
     const textarea = app.getByRole("combobox");
     await user.type(textarea, "@wo{Tab}");
     expect(executableSpy).toHaveBeenLastCalledWith("@workspace ", 11);
@@ -156,7 +161,9 @@ describe("ComboBox", () => {
 
   test("typing executable command and pressing space", async () => {
     const executableSpy = vi.fn();
-    const { user, ...app } = render(<App executeCommand={executableSpy} />);
+    const { user, ...app } = render(
+      <App requestCommandsCompletion={executableSpy} />,
+    );
     const textarea = app.getByRole("combobox");
     await user.type(textarea, "@workspace{Space}");
     expect(executableSpy).toHaveBeenLastCalledWith("@workspace ", 11);
diff --git a/src/components/ComboBox/ComboBox.tsx b/src/components/ComboBox/ComboBox.tsx
index c31c153d..d5686793 100644
--- a/src/components/ComboBox/ComboBox.tsx
+++ b/src/components/ComboBox/ComboBox.tsx
@@ -21,7 +21,6 @@ export type ComboBoxProps = {
     cursor: number,
     number?: number,
   ) => void;
-  executeCommand: (command: string, cursor: number) => void;
   setSelectedCommand: (command: string) => void;
   selectedCommand: string;
   removePreviewFileByName: (name: string) => void;
@@ -36,7 +35,6 @@ export const ComboBox: React.FC<ComboBoxProps> = ({
   render,
   commandArguments,
   requestCommandsCompletion,
-  executeCommand,
   setSelectedCommand,
   selectedCommand,
   removePreviewFileByName,
@@ -76,8 +74,6 @@ export const ComboBox: React.FC<ComboBoxProps> = ({
     if (startPosition === null) return;
     if (!trigger) return;
     requestCommandsCompletion(value, ref.current.selectionStart);
-    executeCommand(value, ref.current.selectionStart);
-
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [startPosition, trigger, value]);
 
@@ -260,14 +256,6 @@ export const ComboBox: React.FC<ComboBoxProps> = ({
       onChange(nextValue.value);
       setEndPosition(nextValue.endPosition);
     };
-
-  console.log({
-    start: ref.current?.selectionStart,
-    end: ref.current?.selectionEnd,
-    statePositions: { endPosition, startPosition },
-    value,
-    cState: combobox.getState(),
-  });
   return (
     <>
       <Combobox
diff --git a/src/events/chat.ts b/src/events/chat.ts
index 86546274..bc70f54b 100644
--- a/src/events/chat.ts
+++ b/src/events/chat.ts
@@ -21,7 +21,6 @@ export enum EVENT_NAMES_FROM_CHAT {
   NEW_FILE = "chat_create_new_file",
   PASTE_DIFF = "chat_paste_diff",
   REQUEST_AT_COMMAND_COMPLETION = "chat_request_at_command_completion",
-  REQUEST_AT_COMMAND_PREVIEW = "chat_request_at_command_preview",
 }
 
 export enum EVENT_NAMES_TO_CHAT {
@@ -92,17 +91,6 @@ export function isRequestAtCommandCompletion(
   return action.type === EVENT_NAMES_FROM_CHAT.REQUEST_AT_COMMAND_COMPLETION;
 }
 
-export interface RequestAtCommandPreview extends ActionFromChat {
-  type: EVENT_NAMES_FROM_CHAT.REQUEST_AT_COMMAND_PREVIEW;
-  payload: { id: string; query: string; cursor: number };
-}
-
-export function isRequestAtCommandPreview(
-  action: unknown,
-): action is RequestAtCommandPreview {
-  if (!isActionFromChat(action)) return false;
-  return action.type === EVENT_NAMES_FROM_CHAT.REQUEST_AT_COMMAND_PREVIEW;
-}
 export interface NewFileFromChat extends ActionFromChat {
   type: EVENT_NAMES_FROM_CHAT.NEW_FILE;
   payload: {
diff --git a/src/features/Chat.tsx b/src/features/Chat.tsx
index 26fe0f85..0a2a6601 100644
--- a/src/features/Chat.tsx
+++ b/src/features/Chat.tsx
@@ -6,7 +6,7 @@ import { Flex, Responsive, Button } from "@radix-ui/themes";
 import { isChatContextFileMessage } from "../services/refact";
 import { useConfig } from "../contexts/config-context";
 import { ArrowLeftIcon } from "@radix-ui/react-icons";
-import { useEffectOnce } from "usehooks-ts";
+import { useEffectOnce } from "../hooks";
 
 export const Chat: React.FC<{ style?: React.CSSProperties }> = (props) => {
   useEffectOnce(() => {
@@ -31,7 +31,6 @@ export const Chat: React.FC<{ style?: React.CSSProperties }> = (props) => {
     handlePasteDiffClick,
     requestCommandsCompletion,
     setSelectedCommand,
-    executeCommand,
     removePreviewFileByName,
     retryQuestion,
   } = useEventBusForChat();
@@ -123,7 +122,6 @@ export const Chat: React.FC<{ style?: React.CSSProperties }> = (props) => {
         setSelectedCommand={setSelectedCommand}
         onClose={maybeSendToSideBar}
         attachFile={state.active_file}
-        executeCommand={executeCommand}
         filesInPreview={state.files_in_preview}
         selectedSnippet={state.selected_snippet}
         removePreviewFileByName={removePreviewFileByName}
diff --git a/src/hooks/index.ts b/src/hooks/index.ts
index fe5c7595..4c58b3ae 100644
--- a/src/hooks/index.ts
+++ b/src/hooks/index.ts
@@ -5,3 +5,5 @@ export * from "./useIsOnline";
 export * from "./useOnPressedEnter";
 export * from "./useEventBusForSidebar";
 export * from "./useApiKey";
+export * from "./useEffectOnce";
+export * from "./usePostMessage";
diff --git a/src/hooks/useEffectOnce.ts b/src/hooks/useEffectOnce.ts
new file mode 100644
index 00000000..200580f4
--- /dev/null
+++ b/src/hooks/useEffectOnce.ts
@@ -0,0 +1,8 @@
+import { useEffect } from "react";
+
+import type { EffectCallback } from "react";
+
+export function useEffectOnce(effect: EffectCallback) {
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  useEffect(effect, []);
+}
diff --git a/src/hooks/useEventBusForChat.ts b/src/hooks/useEventBusForChat.ts
index 5d0894b3..61a1a48c 100644
--- a/src/hooks/useEventBusForChat.ts
+++ b/src/hooks/useEventBusForChat.ts
@@ -38,7 +38,6 @@ import {
   isReceiveAtCommandCompletion,
   SetSelectedAtCommand,
   isSetSelectedAtCommand,
-  RequestAtCommandPreview,
   isReceiveAtCommandPreview,
   isRemoveLastUserMessage,
   isChatUserMessageResponse,
@@ -687,21 +686,6 @@ export const useEventBusForChat = () => {
     dispatch(action);
   }
 
-  const executeCommand = useDebounceCallback(
-    (command: string, cursor: number) => {
-      const action: RequestAtCommandPreview = {
-        type: EVENT_NAMES_FROM_CHAT.REQUEST_AT_COMMAND_PREVIEW,
-        payload: { id: state.chat.id, query: command, cursor },
-      };
-      if (!state.chat.model) {
-        setChatModel(state.caps.default_cap);
-      }
-      postMessage(action);
-    },
-    500,
-    { leading: true },
-  );
-
   function removePreviewFileByName(name: string) {
     const action: RemovePreviewFileByName = {
       type: EVENT_NAMES_TO_CHAT.REMOVE_PREVIEW_FILE_BY_NAME,
@@ -742,7 +726,6 @@ export const useEventBusForChat = () => {
     handlePasteDiffClick,
     requestCommandsCompletion,
     setSelectedCommand,
-    executeCommand,
     removePreviewFileByName,
     retryQuestion,
   };
diff --git a/src/hooks/useEventBusForHost.ts b/src/hooks/useEventBusForHost.ts
index 69b61d59..c2dd7994 100644
--- a/src/hooks/useEventBusForHost.ts
+++ b/src/hooks/useEventBusForHost.ts
@@ -17,7 +17,6 @@ import {
   isStopStreamingFromChat,
   isRequestForFileFromChat,
   isRequestAtCommandCompletion,
-  isRequestAtCommandPreview,
   ReceiveAtCommandCompletion,
   ReceiveAtCommandPreview,
   RemoveLastUserMessage,
@@ -150,10 +149,7 @@ export function useEventBusForHost() {
             // eslint-disable-next-line no-console
             console.error(error);
           });
-      }
 
-      if (isRequestAtCommandPreview(event.data)) {
-        const { id, query } = event.data.payload;
         getAtCommandPreview(query, lspUrl)
           .then((res) => {
             if (isDetailMessage(res)) return;