feat(tabby-chat-panel): adding capability check in tabby-ui and adding applyInEditorV2

clients/tabby-chat-panel/src/index.ts

@@ -60,7 +60,14 @@ export interface ClientApiMethods {
 
   onSubmitMessage: (msg: string, relevantContext?: Context[]) => Promise<void>
 
-  onApplyInEditor: (content: string, opts?: { languageId: string, smart: boolean }) => void
+  // apply content into active editor, version 1, not support smart apply
+  onApplyInEditor: (content: string) => void
+
+  // version 2, support smart apply and normal apply
+  onApplyInEditorV2?: (
+    content: string,
+    opts?: { languageId: string, smart: boolean }
+  ) => void
 
   // On current page is loaded.
   onLoaded: (params?: OnLoadedParams | undefined) => void
@@ -78,6 +85,17 @@ export interface ClientApi extends ClientApiMethods {
   hasCapability: (method: keyof ClientApiMethods) => Promise<boolean>
 }
 
+export const clientApiKeys: (keyof ClientApiMethods)[] = [
+  'navigate',
+  'refresh',
+  'onSubmitMessage',
+  'onApplyInEditor',
+  'onApplyInEditorV2',
+  'onLoaded',
+  'onCopy',
+  'onKeyboardEvent',
+]
+
 export interface ChatMessage {
   message: string
 

clients/vscode/src/chat/WebviewHelper.ts

@@ -394,6 +394,36 @@ export class WebviewHelper {
   }
 
   public createChatClient(webview: Webview) {
+    const getIndentInfo = (document: TextDocument, selection: Selection) => {
+      // Determine the indentation for the content
+      // The calculation is based solely on the indentation of the first line
+      const lineText = document.lineAt(selection.start.line).text;
+      const match = lineText.match(/^(\s*)/);
+      const indent = match ? match[0] : "";
+
+      // Determine the indentation for the content's first line
+      // Note:
+      // If using spaces, selection.start.character = 1 means 1 space
+      // If using tabs, selection.start.character = 1 means 1 tab
+      const indentUnit = indent[0];
+      const indentAmountForTheFirstLine = Math.max(indent.length - selection.start.character, 0);
+      const indentForTheFirstLine = indentUnit?.repeat(indentAmountForTheFirstLine) || "";
+
+      return { indent, indentForTheFirstLine };
+    };
+
+    const applyInEditor = (editor: TextEditor, content: string) => {
+      const document = editor.document;
+      const selection = editor.selection;
+      const { indent, indentForTheFirstLine } = getIndentInfo(document, selection);
+      // Indent the content
+      const indentedContent = indentForTheFirstLine + content.replaceAll("\n", "\n" + indent);
+      // Apply into the editor
+      editor.edit((editBuilder) => {
+        editBuilder.replace(selection, indentedContent);
+      });
+    };
+
     return createClient(webview, {
       navigate: async (context: Context, opts?: NavigateOpts) => {
         if (opts?.openInEditor) {
@@ -444,41 +474,20 @@ export class WebviewHelper {
         // FIXME: maybe deduplicate on chatMessage.relevantContext
         this.sendMessage(chatMessage);
       },
-      onApplyInEditor: async (content: string, opts?: { languageId: string; smart: boolean }) => {
-        const getIndentInfo = (document: TextDocument, selection: Selection) => {
-          // Determine the indentation for the content
-          // The calculation is based solely on the indentation of the first line
-          const lineText = document.lineAt(selection.start.line).text;
-          const match = lineText.match(/^(\s*)/);
-          const indent = match ? match[0] : "";
-
-          // Determine the indentation for the content's first line
-          // Note:
-          // If using spaces, selection.start.character = 1 means 1 space
-          // If using tabs, selection.start.character = 1 means 1 tab
-          const indentUnit = indent[0];
-          const indentAmountForTheFirstLine = Math.max(indent.length - selection.start.character, 0);
-          const indentForTheFirstLine = indentUnit?.repeat(indentAmountForTheFirstLine) || "";
-
-          return { indent, indentForTheFirstLine };
-        };
-
-        const applyInEditor = (editor: TextEditor) => {
-          const document = editor.document;
-          const selection = editor.selection;
-          const { indent, indentForTheFirstLine } = getIndentInfo(document, selection);
-          // Indent the content
-          const indentedContent = indentForTheFirstLine + content.replaceAll("\n", "\n" + indent);
-          // Apply into the editor
-          editor.edit((editBuilder) => {
-            editBuilder.replace(selection, indentedContent);
-          });
-        };
+      onApplyInEditor: async (content: string) => {
+        const editor = window.activeTextEditor;
+        if (!editor) {
+          window.showErrorMessage("No active editor found.");
+          return;
+        }
+        applyInEditor(editor, content);
+      },
+      onApplyInEditorV2: async (content: string, opts?: { languageId: string; smart: boolean }) => {
         const smartApplyInEditor = async (editor: TextEditor, opts: { languageId: string; smart: boolean }) => {
           if (editor.document.languageId !== opts.languageId) {
             this.logger.debug("Editor's languageId:", editor.document.languageId, "opts.languageId:", opts.languageId);
             window.showInformationMessage("The active editor is not in the correct language. Did normal apply.");
-            applyInEditor(editor);
+            applyInEditor(editor, content);
             return;
           }
 
@@ -524,7 +533,7 @@ export class WebviewHelper {
           return;
         }
         if (!opts || !opts.smart) {
-          applyInEditor(editor);
+          applyInEditor(editor, content);
         } else {
           smartApplyInEditor(editor, opts);
         }

clients/vscode/src/chat/chatPanel.ts

@@ -29,8 +29,9 @@ export function createClient(webview: Webview, api: ClientApiMethods): ServerApi
       refresh: api.refresh,
       onSubmitMessage: api.onSubmitMessage,
       onApplyInEditor: api.onApplyInEditor,
-      onCopy: api.onCopy,
+      onApplyInEditorV2: api.onApplyInEditorV2,
       onLoaded: api.onLoaded,
+      onCopy: api.onCopy,
       onKeyboardEvent: api.onKeyboardEvent,
     },
   });

ee/tabby-ui/app/chat/page.tsx

@@ -71,6 +71,10 @@ export default function ChatPage() {
   const isInEditor = !!client || undefined
   const useMacOSKeyboardEventHandler = useRef<boolean>()
 
+  // server feature support check
+  const [supportsOnApplyInEditorV2, setSupportsOnApplyInEditorV2] =
+    useState(false)
+
   const sendMessage = (message: ChatMessage) => {
     if (chatRef.current) {
       chatRef.current.sendUserChat(message)
@@ -227,6 +231,14 @@ export default function ChatPage() {
       server?.onLoaded({
         apiVersion: TABBY_CHAT_PANEL_API_VERSION
       })
+
+      const checkCapabilities = async () => {
+        server
+          ?.hasCapability('onApplyInEditorV2')
+          .then(setSupportsOnApplyInEditorV2)
+      }
+
+      checkCapabilities()
     }
   }, [server])
 
@@ -369,7 +381,13 @@ export default function ChatPage() {
         maxWidth={client === 'vscode' ? '5xl' : undefined}
         onCopyContent={isInEditor && server?.onCopy}
         onSubmitMessage={isInEditor && server?.onSubmitMessage}
-        onApplyInEditor={isInEditor && server?.onApplyInEditor}
+        onApplyInEditor={
+          isInEditor &&
+          (supportsOnApplyInEditorV2
+            ? server?.onApplyInEditorV2
+            : server?.onApplyInEditor)
+        }
+        supportsOnApplyInEditorV2={supportsOnApplyInEditorV2}
       />
     </ErrorBoundary>
   )

ee/tabby-ui/app/files/components/chat-side-bar.tsx

@@ -76,7 +76,7 @@ export const ChatSideBar: React.FC<ChatSideBarProps> = ({
       })
     },
     async onSubmitMessage(_msg, _relevantContext) {},
-    onApplyInEditor(_content, _args) {},
+    onApplyInEditor(_content) {},
     onLoaded() {},
     onCopy(_content) {},
     onKeyboardEvent() {}

ee/tabby-ui/app/search/components/assistant-message-section.tsx

@@ -56,6 +56,7 @@ import {
   TooltipContent,
   TooltipTrigger
 } from '@/components/ui/tooltip'
+import { ChatContext } from '@/components/chat/chat'
 import { CodeReferences } from '@/components/chat/code-references'
 import { CopyButton } from '@/components/copy-button'
 import {
@@ -94,6 +95,8 @@ export function AssistantMessageSection({
     onUpdateMessage
   } = useContext(SearchContext)
 
+  const { supportsOnApplyInEditorV2 } = useContext(ChatContext)
+
   const [isEditing, setIsEditing] = useState(false)
   const [showMoreSource, setShowMoreSource] = useState(false)
   const [relevantCodeHighlightIndex, setRelevantCodeHighlightIndex] = useState<
@@ -328,6 +331,7 @@ export function AssistantMessageSection({
               contextInfo={contextInfo}
               fetchingContextInfo={fetchingContextInfo}
               canWrapLongLines={!isLoading}
+              supportsOnApplyInEditorV2={supportsOnApplyInEditorV2}
             />
             {/* if isEditing, do not display error message block */}
             {message.error && <ErrorMessageBlock error={message.error} />}

ee/tabby-ui/app/search/components/user-message-section.tsx

@@ -1,6 +1,7 @@
 import { HTMLAttributes, useContext } from 'react'
 
 import { cn } from '@/lib/utils'
+import { ChatContext } from '@/components/chat/chat'
 import { MessageMarkdown } from '@/components/message-markdown'
 
 import { ConversationMessage, SearchContext } from './search'
@@ -15,12 +16,13 @@ export function UserMessageSection({
   ...props
 }: QuestionBlockProps) {
   const { contextInfo, fetchingContextInfo } = useContext(SearchContext)
-
+  const { supportsOnApplyInEditorV2 } = useContext(ChatContext)
   return (
     <div className={cn('font-semibold', className)} {...props}>
       <MessageMarkdown
         message={message.content}
         contextInfo={contextInfo}
+        supportsOnApplyInEditorV2={supportsOnApplyInEditorV2}
         fetchingContextInfo={fetchingContextInfo}
         className="text-xl prose-p:mb-2 prose-p:mt-0"
         headline

ee/tabby-ui/components/chat/chat.tsx

@@ -42,14 +42,14 @@ type ChatContextValue = {
   onClearMessages: () => void
   container?: HTMLDivElement
   onCopyContent?: (value: string) => void
-  onApplyInEditor?: (
-    content: string,
-    opts?: { languageId: string; smart: boolean }
-  ) => void
+  onApplyInEditor?:
+    | ((content: string) => void)
+    | ((content: string, opts?: { languageId: string; smart: boolean }) => void)
   relevantContext: Context[]
   activeSelection: Context | null
   removeRelevantContext: (index: number) => void
   chatInputRef: RefObject<HTMLTextAreaElement>
+  supportsOnApplyInEditorV2: boolean
 }
 
 export const ChatContext = React.createContext<ChatContextValue>(
@@ -80,11 +80,11 @@ interface ChatProps extends React.ComponentProps<'div'> {
   promptFormClassname?: string
   onCopyContent?: (value: string) => void
   onSubmitMessage?: (msg: string, relevantContext?: Context[]) => Promise<void>
-  onApplyInEditor?: (
-    content: string,
-    opts?: { languageId: string; smart: boolean }
-  ) => void
+  onApplyInEditor?:
+    | ((content: string) => void)
+    | ((content: string, opts?: { languageId: string; smart: boolean }) => void)
   chatInputRef: RefObject<HTMLTextAreaElement>
+  supportsOnApplyInEditorV2: boolean
 }
 
 function ChatRenderer(
@@ -104,7 +104,8 @@ function ChatRenderer(
     onCopyContent,
     onSubmitMessage,
     onApplyInEditor,
-    chatInputRef
+    chatInputRef,
+    supportsOnApplyInEditorV2
   }: ChatProps,
   ref: React.ForwardedRef<ChatRef>
 ) {
@@ -531,7 +532,8 @@ function ChatRenderer(
         relevantContext,
         removeRelevantContext,
         chatInputRef,
-        activeSelection
+        activeSelection,
+        supportsOnApplyInEditorV2
       }}
     >
       <div className="flex justify-center overflow-x-hidden">

ee/tabby-ui/components/chat/question-answer.tsx

@@ -108,7 +108,8 @@ function UserMessageCard(props: { message: UserMessage }) {
   const { message } = props
   const [{ data }] = useMe()
   const selectContext = message.selectContext
-  const { onNavigateToContext } = React.useContext(ChatContext)
+  const { onNavigateToContext, supportsOnApplyInEditorV2 } =
+    React.useContext(ChatContext)
   const selectCodeSnippet = React.useMemo(() => {
     if (!selectContext?.content) return ''
     const language = selectContext?.filepath
@@ -162,7 +163,11 @@ function UserMessageCard(props: { message: UserMessage }) {
 
       <div className="group relative flex w-full justify-between gap-x-2">
         <div className="flex-1 space-y-2 overflow-hidden px-1 md:ml-4">
-          <MessageMarkdown message={message.message} canWrapLongLines />
+          <MessageMarkdown
+            message={message.message}
+            canWrapLongLines
+            supportsOnApplyInEditorV2={supportsOnApplyInEditorV2}
+          />
           <div className="hidden md:block">
             <UserMessageCardActions {...props} />
           </div>
@@ -252,8 +257,12 @@ function AssistantMessageCard(props: AssistantMessageCardProps) {
     enableRegenerating,
     ...rest
   } = props
-  const { onNavigateToContext, onApplyInEditor, onCopyContent } =
-    React.useContext(ChatContext)
+  const {
+    onNavigateToContext,
+    onApplyInEditor,
+    onCopyContent,
+    supportsOnApplyInEditorV2
+  } = React.useContext(ChatContext)
   const [relevantCodeHighlightIndex, setRelevantCodeHighlightIndex] =
     React.useState<number | undefined>(undefined)
   const serverCode: Array<Context> = React.useMemo(() => {
@@ -389,6 +398,7 @@ function AssistantMessageCard(props: AssistantMessageCardProps) {
               onCodeCitationMouseEnter={onCodeCitationMouseEnter}
               onCodeCitationMouseLeave={onCodeCitationMouseLeave}
               canWrapLongLines={!isLoading}
+              supportsOnApplyInEditorV2={supportsOnApplyInEditorV2}
             />
             {!!message.error && <ErrorMessageBlock error={message.error} />}
           </>