feat: add metadata to code apply call for debugging (#2580)

Author: eborgnia

apps/web/client/src/components/tools.ts

@@ -148,10 +148,16 @@ async function handleEditFileTool(
         throw new Error('Binary files are not supported for editing');
     }
 
+    const metadata = {
+        projectId: editorEngine.projectId,
+        conversationId: editorEngine.chat.conversation.current?.id,
+    };
+
     const updatedContent = await api.code.applyDiff.mutate({
         originalCode: originalFile.content,
         updateSnippet: args.content,
         instruction: args.instruction,
+        metadata,
     });
     if (!updatedContent.result) {
         throw new Error('Error applying code change: ' + updatedContent.error);

apps/web/client/src/server/api/routers/code.ts

@@ -9,11 +9,20 @@ export const codeRouter = createTRPCRouter({
         .input(z.object({
             originalCode: z.string(),
             updateSnippet: z.string(),
-            instruction: z.string()
+            instruction: z.string(),
+            metadata: z.object({
+                projectId: z.string().optional(),
+                conversationId: z.string().optional(),
+            }).optional(),
         }))
-        .mutation(async ({ input }): Promise<{ result: string | null, error: string | null }> => {
+        .mutation(async ({ input, ctx }): Promise<{ result: string | null, error: string | null }> => {
             try {
-                const result = await applyCodeChange(input.originalCode, input.updateSnippet, input.instruction);
+                const user = ctx.user;
+                const metadata = {
+                    ...input.metadata,
+                    userId: user.id,
+                };
+                const result = await applyCodeChange(input.originalCode, input.updateSnippet, input.instruction, metadata);
                 if (!result) {
                     throw new Error('Failed to apply code change. Please try again.');
                 }

packages/ai/src/apply/client.ts

@@ -1,5 +1,11 @@
 import OpenAI from 'openai';
 
+export interface ApplyCodeChangeMetadata {
+    userId?: string;
+    projectId?: string;
+    conversationId?: string;
+}
+
 const createPrompt = (originalCode: string, updateSnippet: string, instruction: string) =>
     `<instruction>${instruction}</instruction>\n<code>${originalCode}</code>\n<update>${updateSnippet}</update>`;
 
@@ -37,6 +43,8 @@ export async function applyCodeChangeWithMorph(
 export async function applyCodeChangeWithRelace(
     originalCode: string,
     updateSnippet: string,
+    instruction: string,
+    metadata?: ApplyCodeChangeMetadata,
 ): Promise<string | null> {
     const apiKey = process.env.RELACE_API_KEY;
     if (!apiKey) {
@@ -51,6 +59,14 @@ export async function applyCodeChangeWithRelace(
     const data = {
         initialCode: originalCode,
         editSnippet: updateSnippet,
+        instructions: instruction,
+        relaceMetadata: metadata
+            ? {
+                  onlookUserId: metadata.userId,
+                  onlookProjectId: metadata.projectId,
+                  onlookConversationId: metadata.conversationId,
+              }
+            : undefined,
     };
 
     const response = await fetch(url, {
@@ -69,6 +85,7 @@ export async function applyCodeChange(
     originalCode: string,
     updateSnippet: string,
     instruction: string,
+    metadata?: ApplyCodeChangeMetadata,
     preferredProvider: FastApplyProvider = FastApplyProvider.RELACE,
 ): Promise<string | null> {
     const providerAttempts = [
@@ -104,6 +121,8 @@ export async function applyCodeChange(
                     : await (applyFn as typeof applyCodeChangeWithRelace)(
                           originalCode,
                           updateSnippet,
+                          instruction,
+                          metadata,
                       );
             if (result) return result;
         } catch (error) {

packages/ai/test/apply.test.ts

@@ -48,6 +48,11 @@ async function fetchUserData(userId: string): Promise<User> {
             originalCode,
             updateSnippet,
             'I will add email field to User interface and improve fetchUserData function with proper typing and error handling',
+            {
+                userId: '123',
+                projectId: '456',
+                conversationId: '789',
+            },
         );
         expect(result).toBe(expectedResult);
     });