diff --git a/packages/ai/src/agents/think-and-prep-agent/think-and-prep-agent.ts b/packages/ai/src/agents/think-and-prep-agent/think-and-prep-agent.ts
index 43fdd6ac8..0009dbff3 100644
--- a/packages/ai/src/agents/think-and-prep-agent/think-and-prep-agent.ts
+++ b/packages/ai/src/agents/think-and-prep-agent/think-and-prep-agent.ts
@@ -53,7 +53,6 @@ export type ThinkAndPrepAgentOptions = z.infer<typeof ThinkAndPrepAgentOptionsSc
 export type ThinkAndPrepStreamOptions = z.infer<typeof ThinkAndPrepStreamOptionsSchema>;
 
 export function createThinkAndPrepAgent(thinkAndPrepAgentSchema: ThinkAndPrepAgentOptions) {
-  const steps: never[] = [];
   const { messageId } = thinkAndPrepAgentSchema;
 
   const systemMessage = {
@@ -147,12 +146,7 @@ export function createThinkAndPrepAgent(thinkAndPrepAgentSchema: ThinkAndPrepAge
     throw new Error('Max retry attempts exceeded');
   }
 
-  async function getSteps() {
-    return steps;
-  }
-
   return {
     stream,
-    getSteps,
   };
 }
diff --git a/packages/ai/src/steps/analyst-agent-steps/create-todos-step/create-todos-step.ts b/packages/ai/src/steps/analyst-agent-steps/create-todos-step/create-todos-step.ts
index 3e8741187..65fc8d11a 100644
--- a/packages/ai/src/steps/analyst-agent-steps/create-todos-step/create-todos-step.ts
+++ b/packages/ai/src/steps/analyst-agent-steps/create-todos-step/create-todos-step.ts
@@ -74,7 +74,7 @@ export async function runCreateTodosStep(params: CreateTodosParams): Promise<Cre
     const todos = await generateTodosWithLLM(params.messages);
 
     const todosMessage: ModelMessage = {
-      role: 'assistant',
+      role: 'user',
       content: todos,
     };
 
diff --git a/packages/ai/src/steps/analyst-agent-steps/extract-values-step/extract-values-search-step.ts b/packages/ai/src/steps/analyst-agent-steps/extract-values-step/extract-values-search-step.ts
index e9998078b..3f06109bc 100644
--- a/packages/ai/src/steps/analyst-agent-steps/extract-values-step/extract-values-search-step.ts
+++ b/packages/ai/src/steps/analyst-agent-steps/extract-values-step/extract-values-search-step.ts
@@ -184,10 +184,13 @@ export async function runExtractValuesAndSearchStep(
 
     return {
       values: extractedValues,
-      valuesMessage: {
-        role: 'assistant',
-        content: storedValuesResult.searchResults,
-      },
+      valuesMessage:
+        extractedValues.length > 0
+          ? {
+              role: 'user',
+              content: storedValuesResult.searchResults,
+            }
+          : undefined,
     };
   } catch (error) {
     // Handle AbortError gracefully