[3/3] Ehayesdev/m 5448 integrate web search support

js/app/packages/block-md/component/InstructionsEditor.tsx

@@ -53,7 +53,6 @@ import {
   type PeerIdValidator,
   peerIdPlugin,
 } from '@lexical-core';
-import type { MarkdownRewriteOutput } from '@service-cognition/generated/tools/types';
 import { debounce } from '@solid-primitives/scheduled';
 import { createMethodRegistration } from 'core/orchestrator';
 import type { EditorState } from 'lexical';
@@ -67,6 +66,7 @@ import {
   Show,
 } from 'solid-js';
 import { blockDataSignal, mdStore } from '../signal/markdownBlockData';
+import type { MarkdownRewriteOutput } from '../signal/rewriteSignal';
 import { useBlockSave, useSaveMarkdownDocument } from '../signal/save';
 import { MarkdownCollabProvider } from './MarkdownCollabProvider';
 

js/app/packages/block-md/component/MarkdownEditor.tsx

@@ -139,7 +139,6 @@ import {
   type PeerIdValidator,
   peerIdPlugin,
 } from '@lexical-core';
-import type { MarkdownRewriteOutput } from '@service-cognition/generated/tools/types';
 import { waitBulkUploadStatus } from '@service-connection/bulkUpload';
 import { fileExtension } from '@service-storage/util/filename';
 import { createCallback } from '@solid-primitives/rootless';
@@ -159,7 +158,6 @@ import {
   $isElementNode,
   type EditorState,
 } from 'lexical';
-
 import {
   type Accessor,
   createEffect,
@@ -179,6 +177,7 @@ import {
   isGeneratingSignal,
 } from '../signal/generateSignal';
 import { blockDataSignal, mdStore } from '../signal/markdownBlockData';
+import type { MarkdownRewriteOutput } from '../signal/rewriteSignal';
 import { useBlockSave, useSaveMarkdownDocument } from '../signal/save';
 import { MarkdownCollabProvider } from './MarkdownCollabProvider';
 import { MarkdownPopup } from './MarkdownPopup';

js/app/packages/block-md/definition.ts

@@ -10,7 +10,6 @@ import { serializedStateFromBlob } from '@core/component/LexicalMarkdown/collabo
 import { ENABLE_MARKDOWN_LIVE_COLLABORATION } from '@core/constant/featureFlags';
 import { isErr, ok } from '@core/util/maybeResult';
 import { type SchemaType, schema } from '@loro-mirror/packages/core/src';
-import type { MarkdownRewriteOutput } from '@service-cognition/generated/tools/types';
 import { storageServiceClient } from '@service-storage/client';
 import { fetchBinary } from '@service-storage/util/fetchBinary';
 import { makeFileFromBlob } from '@service-storage/util/makeFileFromBlob';
@@ -19,6 +18,7 @@ import { createSyncServiceSource } from '@service-sync/source';
 import { untrack } from 'solid-js';
 import { createStore } from 'solid-js/store';
 import MarkdownBlock from './component/Block';
+import type { MarkdownRewriteOutput } from './signal/rewriteSignal';
 
 const nodeSchema = schema.LoroMap({
   $: schema.LoroMap({} as any, {

js/app/packages/block-md/signal/rewriteSignal.ts

@@ -1,5 +1,10 @@
 import { createBlockSignal } from '@core/block';
-import type { MarkdownRewriteOutput } from '@service-cognition/generated/tools/types';
+import type { NamedTool } from '@service-cognition/generated/tools/tool';
+
+export type MarkdownRewriteOutput = NamedTool<
+  'MarkdownRewrite',
+  'response'
+>['data'];
 
 export const rewriteSignal = createBlockSignal<boolean>(false);
 export const isRewritingSignal = createBlockSignal<boolean>(false);

js/app/packages/core/component/AI/component/debug/Component.tsx

@@ -276,7 +276,7 @@ function ToolCallResponseRender() {
         {
           type: 'toolCall',
           tool: {
-            name: 'WebSearch',
+            name: 'web_search',
             data: {
               query: 'most important headlines today',
             },
@@ -285,10 +285,16 @@ function ToolCallResponseRender() {
         {
           type: 'toolResponse',
           tool: {
-            name: 'WebSearch',
+            name: 'web_search',
             data: {
-              results: [{ name: 'news.com', url: 'www.news.com' }],
-              content: 'I read the results and there is news!!!',
+              content: [
+                {
+                  type: 'web_search_result',
+                  title: 'news.com',
+                  url: 'www.news.com',
+                },
+              ],
+              tool_use_id: 'I read the results and there is news!!!',
             },
           },
         },

js/app/packages/core/component/AI/component/debug/Tool.tsx

@@ -25,7 +25,7 @@ function ToolCall() {
     {
       type: 'toolCall',
       tool: {
-        name: 'WebSearch',
+        name: 'web_search',
         data: {
           query: 'Weather in nyc now',
         },
@@ -48,7 +48,7 @@ function ToolResponse() {
     {
       type: 'toolCall',
       tool: {
-        name: 'WebSearch',
+        name: 'web_search',
         data: {
           query: 'Weather in nyc now',
         },
@@ -58,15 +58,16 @@ function ToolResponse() {
       type: 'toolResponse',
       tool: {
         data: {
-          content: 'it is sunny',
-          results: [
+          tool_use_id: 'hehexd',
+          content: [
             {
-              name: 'weather.com',
+              title: 'its sunny',
+              type: 'web_search_result',
               url: 'https://weather.com',
             },
           ],
         },
-        name: 'WebSearch',
+        name: 'web_search',
       },
     },
     {
@@ -90,7 +91,7 @@ function ToolResponsStreamEnd() {
     {
       type: 'toolCall',
       tool: {
-        name: 'WebSearch',
+        name: 'web_search',
         data: {
           query: 'Weather in nyc now',
         },
@@ -100,15 +101,16 @@ function ToolResponsStreamEnd() {
       type: 'toolResponse',
       tool: {
         data: {
-          content: 'it is sunny',
-          results: [
+          tool_use_id: 'hehexd',
+          content: [
             {
-              name: 'weather.com',
+              title: 'its sunny',
+              type: 'web_search_result',
               url: 'https://weather.com',
             },
           ],
         },
-        name: 'WebSearch',
+        name: 'web_search',
       },
     },
     {

js/app/packages/core/component/AI/component/tool/ListDocuments.tsx

@@ -4,14 +4,19 @@ import { fileTypeToBlockName } from '@core/constant/allBlocks';
 import ChevronDown from '@icon/regular/caret-down.svg?component-solid';
 import ChevronUp from '@icon/regular/caret-up.svg?component-solid';
 import List from '@phosphor-icons/core/regular/list.svg';
-import type { ListDocumentsResult } from '@service-cognition/toolTypes';
+import type { NamedTool } from '@service-cognition/generated/tools/tool';
 import type { FileType } from '@service-storage/generated/schemas/fileType';
 import { useSplitLayout } from 'app/component/split-layout/layout';
 import { createMemo, createSignal, Show } from 'solid-js';
 import { VList } from 'virtua/solid';
 import { BaseTool } from './BaseTool';
 import { createToolRenderer } from './ToolRenderer';
 
+type ListDocumentsResult = NamedTool<
+  'ListDocuments',
+  'response'
+>['data']['results'][number];
+
 const ListDocumentsToolResponse = (props: {
   results: ListDocumentsResult[];
 }) => {

js/app/packages/core/component/AI/component/tool/ListEmails.tsx

@@ -3,13 +3,18 @@ import { TruncatedText } from '@core/component/FileList/TruncatedText';
 import ChevronDown from '@icon/regular/caret-down.svg?component-solid';
 import ChevronUp from '@icon/regular/caret-up.svg?component-solid';
 import List from '@phosphor-icons/core/regular/list.svg';
-import type { ListEmailsResult } from '@service-cognition/toolTypes';
+import type { NamedTool } from '@service-cognition/generated/tools/tool';
 import { useSplitLayout } from 'app/component/split-layout/layout';
 import { createMemo, createSignal, Show } from 'solid-js';
 import { VList } from 'virtua/solid';
 import { BaseTool } from './BaseTool';
 import { createToolRenderer } from './ToolRenderer';
 
+type ListEmailsResult = NamedTool<
+  'ListEmails',
+  'response'
+>['data']['items'][number];
+
 const ListEmailsToolResponse = (props: { results: ListEmailsResult[] }) => {
   const [isExpanded, setIsExpanded] = createSignal(false);
 

js/app/packages/core/component/AI/component/tool/UnifiedSearch.tsx

@@ -4,14 +4,19 @@ import { fileTypeToBlockName } from '@core/constant/allBlocks';
 import ChevronDown from '@icon/regular/caret-down.svg?component-solid';
 import ChevronUp from '@icon/regular/caret-up.svg?component-solid';
 import MagnifyingGlass from '@phosphor-icons/core/regular/magnifying-glass.svg';
-import type { UnifiedSearchResult } from '@service-cognition/toolTypes';
+import type { NamedTool } from '@service-cognition/generated/tools/tool';
 import type { FileType } from '@service-storage/generated/schemas/fileType';
 import { useSplitLayout } from 'app/component/split-layout/layout';
 import { createMemo, createSignal, Show } from 'solid-js';
 import { VList } from 'virtua/solid';
 import { BaseTool } from './BaseTool';
 import { createToolRenderer } from './ToolRenderer';
 
+type UnifiedSearchResult = NamedTool<
+  'UnifiedSearch',
+  'response'
+>['data']['response']['results'][number];
+
 const UnifiedSearchToolResponse = (props: {
   results: UnifiedSearchResult[];
 }) => {

js/app/packages/core/component/AI/component/tool/WebSearch.tsx

@@ -4,7 +4,7 @@ import { BaseTool } from './BaseTool';
 import { createToolRenderer } from './ToolRenderer';
 
 const handler = createToolRenderer({
-  name: 'WebSearch',
+  name: 'web_search',
   renderCall: (ctx) => (
     <BaseTool
       icon={Globe}
@@ -23,8 +23,8 @@ const handler = createToolRenderer({
       type="response"
     >
       <UnfurledLinkCollection
-        links={ctx.tool.data.results.map((result) => ({
-          title: result.name,
+        links={ctx.tool.data.content.map((result) => ({
+          title: result.title,
           url: result.url,
         }))}
       />

js/app/packages/core/component/AI/component/tool/handler.tsx

@@ -24,7 +24,7 @@ const [renderStore, setRenderStore] = createStore<
 
 const toolHandlers: ToolHandlerMap<RenderContext> = {
   UnifiedSearch: unifiedSearchHandler,
-  WebSearch: webSearchHandler,
+  web_search: webSearchHandler,
   MarkdownRewrite: rewriteHandler,
   Read: readHandler,
   ListDocuments: listDocumentsHandler,

js/app/packages/core/component/LexicalMarkdown/plugins/diff/diffPlugin.ts

@@ -9,7 +9,7 @@ import {
   $getNodeById,
   $isDiffNode,
 } from '@lexical-core';
-import type { MarkdownRewriteOutput } from '@service-cognition/generated/tools/types';
+import type { NamedTool } from '@service-cognition/generated/tools/tool';
 import { useUserId } from '@service-gql/client';
 import type { LexicalEditor } from 'lexical';
 import {
@@ -20,7 +20,7 @@ import {
 import { createEffect } from 'solid-js';
 import { mapRegisterDelete } from '../shared/utils';
 
-type Diff = MarkdownRewriteOutput['diffs'][number];
+type Diff = NamedTool<'MarkdownRewrite', 'response'>['data']['diffs'][number];
 
 export type DiffPluginArgs = {
   revisionsSignal: ReturnType<typeof createBlockSignal<Diff[] | undefined>>;