fix: chat context picker not getting the full svelte context (#9158)

Author: AdityaHegde

web-common/src/features/chat/core/context/editor-plugins.svelte.ts

@@ -8,27 +8,21 @@ import Document from "@tiptap/extension-document";
 import Paragraph from "@tiptap/extension-paragraph";
 import Text from "@tiptap/extension-text";
 import { Placeholder, UndoRedo } from "@tiptap/extensions";
-import { mount, unmount } from "svelte";
+import { mount, unmount, getAllContexts } from "svelte";
 import {
   convertContextToInlinePrompt,
   INLINE_CHAT_CONTEXT_TAG,
   type InlineContext,
   normalizeInlineContext,
   parseInlineAttr,
 } from "@rilldata/web-common/features/chat/core/context/inline-context.ts";
-import {
-  RUNTIME_CONTEXT_KEY,
-  RuntimeClient,
-} from "@rilldata/web-common/runtime-client/v2";
 
 export function getEditorPlugins({
   placeholder,
   onSubmit,
-  runtimeClient,
 }: {
   placeholder: string;
   onSubmit: () => void;
-  runtimeClient: RuntimeClient;
 }) {
   const sharedEditorStore = new SharedEditorStore();
 
@@ -40,7 +34,7 @@ export function getEditorPlugins({
       placeholder,
     }),
     EditorSubmitExtension.configure({ onSubmit, sharedEditorStore }),
-    configureInlineContextTipTapExtension(sharedEditorStore, runtimeClient),
+    configureInlineContextTipTapExtension(sharedEditorStore),
     UndoRedo,
   ];
 
@@ -103,7 +97,7 @@ const EditorSubmitExtension = Extension.create(() => {
 
 type InlineContextOptions = MentionOptions<never, InlineContext> & {
   sharedEditorStore: SharedEditorStore;
-  runtimeClient: RuntimeClient;
+  allParentContexts: Map<any, any>;
 };
 
 // Add the startMention command to the Commands type.
@@ -127,7 +121,7 @@ const InlineContextExtension = Mention.extend<InlineContextOptions>({
       // These have to be configured for the extension to work
       manager: {} as ConversationManager,
       sharedEditorStore: {} as SharedEditorStore,
-      runtimeClient: {} as RuntimeClient,
+      allParentContexts: new Map(),
     };
   },
 
@@ -188,7 +182,7 @@ const InlineContextExtension = Mention.extend<InlineContextOptions>({
       // We need this here to make sure the component is rendered inline.
       target.className = "inline-block";
 
-      const { sharedEditorStore, runtimeClient } = this.options;
+      const { sharedEditorStore, allParentContexts } = this.options;
 
       // Create the inline chat context component. Pass the wrapper as the target.
       const comp = mount(InlineContextComponent, {
@@ -216,7 +210,7 @@ const InlineContextExtension = Mention.extend<InlineContextOptions>({
               }
             : { mode: "readonly" },
         },
-        context: new Map([[RUNTIME_CONTEXT_KEY, runtimeClient]]),
+        context: allParentContexts,
       }) as InlineContextExports;
       sharedEditorStore.componentAdded(comp);
 
@@ -237,15 +231,16 @@ const InlineContextExtension = Mention.extend<InlineContextOptions>({
  */
 export function configureInlineContextTipTapExtension(
   sharedEditorStore: SharedEditorStore,
-  runtimeClient: RuntimeClient,
 ) {
   let comp: Record<string, unknown> | null = null;
   const pickerProps: Record<string, unknown> = $state({});
   let selected = false;
 
+  const allParentContexts = getAllContexts();
+
   return InlineContextExtension.configure({
     sharedEditorStore,
-    runtimeClient,
+    allParentContexts,
     suggestion: {
       char: "@",
       allowSpaces: true,
@@ -264,7 +259,7 @@ export function configureInlineContextTipTapExtension(
           comp = mount(InlineContextPicker, {
             target: document.body,
             props: pickerProps,
-            context: new Map([[RUNTIME_CONTEXT_KEY, runtimeClient]]),
+            context: allParentContexts,
           });
           sharedEditorStore.contextOpen = true;
         },

web-common/src/features/chat/core/input/ChatInput.svelte

@@ -10,7 +10,6 @@
   import type { ChatConfig } from "@rilldata/web-common/features/chat/core/types.ts";
   import Button from "@rilldata/web-common/components/button/Button.svelte";
   import { ArrowUp } from "lucide-svelte";
-  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
   export let conversationManager: ConversationManager;
   export let onSend: (() => void) | undefined = undefined;
@@ -21,8 +20,6 @@
 
   let value = "";
 
-  const runtimeClient = useRuntimeClient();
-
   $: ({ placeholder, additionalContextStoreGetter } = config);
   $: additionalContextStore = additionalContextStoreGetter();
   // Since additionalContextStore is only used within sendMessage it will not be fetched unless used.
@@ -90,7 +87,6 @@
       extensions: getEditorPlugins({
         placeholder,
         onSubmit: () => void sendMessage(),
-        runtimeClient,
       }),
       content: "",
       editorProps: {

web-common/src/features/chat/core/messages/text/UserMessage.svelte

@@ -5,12 +5,9 @@
   import { onMount } from "svelte";
   import type { V1Message } from "../../../../../runtime-client";
   import { extractMessageText } from "../../utils";
-  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
 
   export let message: V1Message;
 
-  const runtimeClient = useRuntimeClient();
-
   let element: HTMLDivElement;
   let editor: Editor;
 
@@ -26,7 +23,6 @@
       extensions: getEditorPlugins({
         placeholder: "",
         onSubmit: () => {},
-        runtimeClient,
       }),
       content,
     });