From 7b71b388c302c76ff047a9431943bb38a241c0d7 Mon Sep 17 00:00:00 2001
From: Lifei Zhou <lifei@squareup.com>
Date: Wed, 4 Mar 2026 15:53:57 -0500
Subject: [PATCH] fix: resolve parameters in initial message with autosubmit
 (#7659)

---
 ui/desktop/src/components/BaseChat.tsx | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/ui/desktop/src/components/BaseChat.tsx b/ui/desktop/src/components/BaseChat.tsx
index c813ed204f..cee981fb93 100644
--- a/ui/desktop/src/components/BaseChat.tsx
+++ b/ui/desktop/src/components/BaseChat.tsx
@@ -107,12 +107,23 @@ export default function BaseChat({
 
   const recipe = session?.recipe;
 
+  const resolvedInitialMessage = useMemo((): UserInput | undefined => {
+    if (!initialMessage) return undefined;
+    if (recipe?.prompt && session?.user_recipe_values) {
+      return {
+        ...initialMessage,
+        msg: substituteParameters(initialMessage.msg, session.user_recipe_values),
+      };
+    }
+    return initialMessage;
+  }, [initialMessage, recipe?.prompt, session?.user_recipe_values]);
+
   useAutoSubmit({
     sessionId,
     session,
     messages,
     chatState,
-    initialMessage,
+    initialMessage: resolvedInitialMessage,
     handleSubmit,
   });