Fixes after rebase

Author: fkling

web/demo/App.tsx

@@ -36,16 +36,18 @@ const INITIAL_CONTEXT: InitialContext = {
     isDirectory: true,
 }
 
+const agentPromise = createCodyAgent({
+    accessToken,
+    serverEndpoint,
+    createAgentWorker: CREATE_AGENT_WORKER,
+    telemetryClientName: 'codydemo.testing',
+})
+
 export const App: FC = () => {
     const [agent, setAgent] = useState<CodyWebAgent | null>(null)
 
     useEffect(() => {
-        createCodyAgent({
-            accessToken,
-            serverEndpoint,
-            createAgentWorker: CREATE_AGENT_WORKER,
-            telemetryClientName: 'codydemo.testing',
-        }).then(agent => {
+        agentPromise.then(agent => {
             agent?.createNewChat()
             setAgent(agent)
         }, setAgent)

web/lib/agent/agent.client.ts

@@ -21,7 +21,6 @@ interface AgentClientOptions {
     createAgentWorker: () => Worker
     telemetryClientName?: string
     customHeaders?: Record<string, string>
-    repository?: string
     debug?: boolean
     trace?: boolean
 }
@@ -31,7 +30,6 @@ export async function createAgentClient({
     accessToken,
     createAgentWorker,
     customHeaders,
-    repository,
     telemetryClientName,
     debug = true,
     trace = false,
@@ -70,9 +68,7 @@ export async function createAgentClient({
     const serverInfo: ServerInfo = await rpc.sendRequest('initialize', {
         name: process.env.CODY_WEB_DEMO_STANDALONE_MODE === 'true' ? 'standalone-web' : 'web',
         version: '0.0.1',
-        // Empty root URI leads to openctx configuration resolution failure, any non-empty
-        // mock value (Cody Web doesn't really use any workspace related features)
-        workspaceRootUri: `repo:${repository ?? ''}`,
+        workspaceRootUri: '',
         capabilities: {
             edit: 'none',
             completions: 'none',

web/lib/components/CodyWebChat.tsx

@@ -3,6 +3,7 @@ import {
     type FC,
     type FunctionComponent,
     useCallback,
+    useEffect,
     useLayoutEffect,
     useMemo,
     useRef,
@@ -128,6 +129,12 @@ export const CodyWebChat: FunctionComponent<CodyWebChatProps> = ({
         return <ChatSkeleton className={classNames(className, styles.root)} />
     }
 
+    useEffect(() => {
+        agent.client.rpc.sendNotification('workspaceFolder/didChange', {
+            uris: initialContext?.repository.name ? [`repo:${initialContext.repository.name}`] : [],
+        })
+    }, [initialContext?.repository, agent.client])
+
     return (
         <AppWrapper>
             <div className={classNames(className, styles.root)}>

web/lib/components/use-cody-agent.ts

@@ -26,6 +26,7 @@ interface UseCodyWebAgentInput {
 }
 
 export interface CodyWebAgent {
+    client: AgentClient
     vscodeAPI: VSCodeWrapper
     createNewChat: () => Promise<void>
 }
@@ -41,7 +42,7 @@ export async function createCodyAgent(input: UseCodyWebAgentInput): Promise<Cody
     const activeWebviewPanelIDRef = { current: '' }
 
     try {
-        const agent = await createAgentClient({
+        const client = await createAgentClient({
             customHeaders,
             telemetryClientName,
             createAgentWorker,
@@ -52,24 +53,24 @@ export async function createCodyAgent(input: UseCodyWebAgentInput): Promise<Cody
         // Special override for chat creating for Cody Web, otherwise the create new chat doesn't work
         // TODO: Move this special logic to the Cody Web agent handle "chat/web/new"
         const createNewChat = async () => {
-            const { panelId, chatId } = await agent.rpc.sendRequest<{
+            const { panelId, chatId } = await client.rpc.sendRequest<{
                 panelId: string
                 chatId: string
             }>('chat/web/new', null)
 
             activeWebviewPanelIDRef.current = panelId
 
-            await agent.rpc.sendRequest('webview/receiveMessage', {
+            await client.rpc.sendRequest('webview/receiveMessage', {
                 id: activeWebviewPanelIDRef.current,
                 message: { chatID: chatId, command: 'restoreHistory' },
             })
         }
 
-        const vscodeAPI = createVSCodeAPI({ activeWebviewPanelIDRef, createNewChat, client: agent })
+        const vscodeAPI = createVSCodeAPI({ activeWebviewPanelIDRef, createNewChat, client: client })
         // Runtime sync side effect, ensure that later any cody UI
         // components will have access to the mocked/synthetic VSCode API
         setVSCodeWrapper(vscodeAPI)
-        return { vscodeAPI, createNewChat }
+        return { vscodeAPI, createNewChat, client }
     } catch (error) {
         console.error('Cody Web Agent creation failed', error)
         throw error