Skip to content

Always show recipe activities at the top of chat when recipe accepted and active #4616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zanesq merged 2 commits into from
Sep 12, 2025
Merged

Always show recipe activities at the top of chat when recipe accepted and active #4616

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aeefa09
always show recipe activities at the top when recipe accepted and active
zanesq Sep 11, 2025
ce82720
Merge branch 'main' of github.com:block/goose into zane/always-show-r…
zanesq Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 17 additions & 25 deletions ui/desktop/src/components/BaseChat.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,31 +372,23 @@ function BaseChatContent({
{/* Custom content before messages */}
{renderBeforeMessages && renderBeforeMessages()}

{/* Messages or RecipeActivities or Popular Topics */}
{/* Recipe Activities - always show when recipe is active and accepted */}
{recipeConfig && recipeAccepted && !suppressEmptyState && (
<div className={hasStartedUsingRecipe ? 'mb-6' : ''}>
<RecipeActivities
append={(text: string) => appendWithTracking(text)}
activities={
Array.isArray(recipeConfig.activities) ? recipeConfig.activities : null
}
title={recipeConfig.title}
parameterValues={recipeParameters || {}}
/>
</div>
)}

{/* Messages or Popular Topics */}
{
// Check if we should show splash instead of messages
// Show splash if we have a recipe and user hasn't started using it yet, and recipe has been accepted
loadingChat ? null : recipeConfig &&
recipeAccepted &&
!hasStartedUsingRecipe &&
!suppressEmptyState ? (
<>
{/* Show RecipeActivities when we have a recipe config and user hasn't started using it */}
{recipeConfig ? (
<RecipeActivities
append={(text: string) => appendWithTracking(text)}
activities={
Array.isArray(recipeConfig.activities) ? recipeConfig.activities : null
}
title={recipeConfig.title}
parameterValues={recipeParameters || {}}
/>
) : showPopularTopics ? (
/* Show PopularChatTopics when no real messages, no recipe, and showPopularTopics is true (Pair view) */
<PopularChatTopics append={(text: string) => appendWithTracking(text)} />
) : null}
</>
) : filteredMessages.length > 0 ||
loadingChat ? null : filteredMessages.length > 0 ||
(recipeConfig && recipeAccepted && hasStartedUsingRecipe) ? (
<>
{disableSearch ? (
Expand Down Expand Up @@ -476,7 +468,7 @@ function BaseChatContent({

<div className="block h-8" />
</>
) : showPopularTopics ? (
) : !recipeConfig && showPopularTopics ? (
/* Show PopularChatTopics when no messages, no recipe, and showPopularTopics is true (Pair view) */
<PopularChatTopics append={(text: string) => append(text)} />
) : null /* Show nothing when messages.length === 0 && suppressEmptyState === true */
Expand Down
Loading