Open Leo from search #26082

yrliou · 2024-10-17T22:22:03Z

open_leo_from_search_480p.mov

UI was updated on search side after the above demo video was recorded, it now looks like this, with a "Save chat in Brave Leo" at upper-right corner:

Add a new permission for opening Leo from Brave Search
Add a navigation throttle to intercept the request for opening Leo from Brave Search (specifically, https://search.brave.com/leo#noncevalue). If the request is from Brave Search (last committed URL) and nonce is valid (identical between the one in URL and the one in nonce property), a permission prompt will be shown by default and Leo side panel would be opened with entries from Brave Search conversations staged in Leo side panel.
A side change which removes the limitation of only have staged entries at the beginning of the conversation to accommodate that user could choose to click continue with Leo button in search UI multiple times and not only when there's empty Leo chat history. When need to remove staged entries, for example, when page context is unlinked, all staged entries will be cleared instead of whole chat history.

See Requirements #2 and #3 in https://docs.google.com/document/d/1idelFPpUEcKDNcyKYf3M5yw91tuIddjrlYfpaWEJjNk/edit?tab=t.0 for reference.

S&P review: https://github.com/brave/reviews/issues/1776

Submitter Checklist:

I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
There is a ticket for my issue
Used Github auto-closing keywords in the PR description above
Wrote a good PR/commit description
Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
Checked the PR locally:
- npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
- npm run presubmit wiki, npm run gn_check, npm run tslint
Ran git rebase master (if needed)

Reviewer Checklist:

A security review is not needed, or a link to one is included in the PR description
New files have MPL-2.0 license header
Adequate test coverage exists to prevent regressions
Major classes, functions and non-trivial code blocks are well-commented
Changes in component dependencies are properly reflected in gn
Code follows the style guide
Test plan is specified in PR before merging

After-merge Checklist:

The associated issue milestone is set to the smallest version that the
changes has landed on
All relevant documentation has been updated, for instance:

Test Plan:

Go to search.brave.com with experimental flags enabled.
Type a query and click Answer with AI
Type a follow-up question in search conversation mode UI
Once answer is generated, click "Save chat in Brave Leo" at the upper-right corner.
Check permission prompt is shown, and Leo side panel should be opened when permission is allowed, entries from search.brave.com should be staged in Leo.
Visit brave://settings/content -> Additional permissions -> Leo AI chat, search.brave.com should be in the allow list.
Remove the allow entry in settings UI.
Open a new tab and repeat step 1 to 4.
Permission prompt should be shown again, reject the prompt, Leo panel should not be opened.

Test opt-out case:
Try the feature in a profile that hasn't opted-in to Leo, when the continue with Leo button is clicked, accept the permission prompt, Leo should be opened with opt-in screen with disclaimer, search entries should appear after opt-in.

Test private window:
Try the feature in private window, shouldn't have any actions such as opening Leo or permission prompt.

browser/about_flags.cc

brave-builds · 2024-10-19T00:46:59Z

A Storybook has been deployed to preview UI for the latest push

cdesouza-chromium

Leaving some comments for now. Be back later.

app/brave_settings_strings.grdp

browser/ai_chat/ai_chat_brave_search_throttle_browsertest.cc

browser/ai_chat/page_content_fetcher_browsertest.cc

browser/ui/ai_chat/ai_chat_brave_search_throttle_delegate_impl.h

browser/ui/sidebar/sidebar_utils.cc

components/ai_chat/renderer/page_content_extractor.cc

components/ai_chat/content/browser/page_content_fetcher.cc

petemill

Nice work - my review mainly focuses on naming and keeping consistent with "AI Chat" and not "Leo" - sorry!

browser/ui/ai_chat/utils.h

browser/ui/webui/settings/brave_privacy_handler.cc

chromium_src/components/content_settings/core/common/content_settings_types.mojom

components/ai_chat/content/browser/ai_chat_brave_search_throttle.h

components/ai_chat/core/common/features.cc

components/permissions/contexts/brave_ai_chat_permission_context.h

components/resources/permissions_strings.grdp

test/data/leo/open_leo_button.html

petemill

👍

petemill · 2024-10-31T18:34:35Z

chromium_src/components/permissions/permission_request.cc

+  const RequestType kExcludedTypes[] = {RequestType::kDiskQuota,
+                                        RequestType::kMultipleDownloads,
 #if BUILDFLAG(IS_ANDROID)
-    RequestType::kProtectedMediaIdentifier,
+                                        RequestType::kProtectedMediaIdentifier,
 #else
    RequestType::kRegisterProtocolHandler,
 #endif  // BUILDFLAG(IS_ANDROID)
 #if BUILDFLAG(ENABLE_WIDEVINE)
-    RequestType::kWidevine
+                                        RequestType::kWidevine


nit: what's happened here with whitespace change?

vscode auto formatting, seems to be a good format tho.

- Add a new permission for opening Leo from Brave Search - Add a NavigationThrottle to intercept specific URL requests and open Leo

github-actions · 2024-10-31T19:06:55Z

[puLL-Merge] - brave/brave-core@26082

Description

This pull request adds functionality to open Leo AI chat from Brave Search. It includes new permission settings, UI elements, and backend logic to handle the feature. The changes span across multiple components including browser settings, content settings, permissions, and AI chat-related modules.

Possible Issues

The new feature is conditionally compiled based on the ENABLE_AI_CHAT flag. Ensure that this flag is properly set in all relevant build configurations.
The changes touch sensitive areas like permissions and content settings. Thorough testing is needed to ensure no regressions in existing functionality.

Security Hotspots

The new permission context (BraveOpenAIChatPermissionContext) only allows the feature for https://search.brave.com. Ensure this restriction is maintained and not bypassed.
The AIChatBraveSearchThrottle class handles opening the AI chat. Verify that it properly checks permissions and doesn't allow unauthorized access.

Changes

Changes

app/brave_settings_strings.grdp:
- Added new strings for Leo AI chat settings.
browser/about_flags.cc:
- Reorganized AI chat feature entries.
- Added a new feature flag for opening Leo AI chat from Brave Search.
browser/ai_chat/BUILD.gn:
- Added new test files for AI chat functionality.
browser/ai_chat/ai_chat_brave_search_throttle_browsertest.cc:
- New browser test for the AI chat Brave Search throttle.
browser/ai_chat/brave_open_ai_chat_permission_context_unittest.cc:
- New unit tests for the Brave Open AI chat permission context.
browser/brave_content_browser_client.cc:
- Added logic to create the AI chat Brave Search throttle.
browser/resources/settings/brave_overrides/:
- Updated various TypeScript files to include new AI chat settings.
browser/ui/ai_chat/utils.cc and utils.h:
- New utility functions for opening AI chat.
components/ai_chat/:
- Various updates to AI chat components, including new throttle logic and permission handling.
components/permissions/:
- Added new permission context for Brave Open AI chat.
chromium_src/:
- Updated various Chromium files to include new Brave-specific permission types.
test/data/leo/:
- Added test HTML files for Leo AI chat functionality.

These changes collectively implement the feature to open Leo AI chat from Brave Search, including necessary permissions, settings, and backend logic.

brave-builds · 2024-11-01T00:04:39Z

Released in v1.73.66

fallaciousreasoning · 2024-11-03T23:25:06Z

@yrliou don't know if this is already reported but site settings are failing to load with

I think maybe we removed Leo from the name?

srirambv · 2024-11-06T09:47:45Z

Verification passed on

Brave	1.73.70 Chromium: 131.0.6778.24 (Official Build) nightly (64-bit)
Revision	`4ee1e6a`
OS	Windows 11 Version 23H2 (Build 22631.4317)

Verified steps from PR description
Verified enabling search flags and asking a question shows Save chat in Brave Leo
Verified clicking on Save chat in Brave Leo opens Leo in side panel
Verified if Leo is not enabled/opted-in clicking on Save chat in Brave Leo opens Leo in side panel and shows opt-in disclaimer. Once opted in opening a new chat loads the chat query in Leo
Verified the Save chat in Brave Leo option is not shown on private tabs
Encountered #42112

Leo Premium	Private Tabs	Leo Opt-in
26082-Premium.mp4	26082-Private.Tab.mp4	26082-Leo.Opt-in.mp4

* Uplift of #26082 (squashed) to beta * Fix site settings --------- Co-authored-by: Jocelyn Liu <[email protected]>

yrliou self-assigned this Oct 17, 2024

github-actions bot added CI/storybook-url Deploy storybook and provide a unique URL for each build CI/run-upstream-tests Run upstream unit and browser tests on Linux and Windows (otherwise only on Linux) labels Oct 17, 2024

yrliou commented Oct 17, 2024

View reviewed changes

browser/about_flags.cc Show resolved Hide resolved

yrliou force-pushed the open_leo_from_search branch 3 times, most recently from dce4a3c to 1f2c4c1 Compare October 19, 2024 00:13

yrliou force-pushed the open_leo_from_search branch 6 times, most recently from 0c99be2 to 9ef822a Compare October 19, 2024 06:15

yrliou marked this pull request as ready for review October 21, 2024 17:17

yrliou requested review from a team as code owners October 21, 2024 17:17

yrliou requested review from petemill, fallaciousreasoning and darkdh October 21, 2024 17:18

cdesouza-chromium reviewed Oct 21, 2024

View reviewed changes

github-actions bot added the puLL-Merge label Oct 21, 2024

github-actions bot reviewed Oct 21, 2024

View reviewed changes

components/ai_chat/renderer/page_content_extractor.cc Outdated Show resolved Hide resolved

components/ai_chat/content/browser/page_content_fetcher.cc Show resolved Hide resolved

github-actions bot added the needs-security-review label Oct 21, 2024

github-actions bot assigned bridiver and diracdeltas Oct 21, 2024

github-actions bot assigned thypon Oct 29, 2024

yrliou force-pushed the open_leo_from_search branch from c973c0b to 0db3a85 Compare October 29, 2024 18:52

yrliou unassigned bridiver, diracdeltas, thypon, iefremov and goodov Oct 29, 2024

petemill reviewed Oct 30, 2024

View reviewed changes

yrliou force-pushed the open_leo_from_search branch from 763155e to be1b396 Compare October 30, 2024 03:22

bridiver approved these changes Oct 30, 2024

View reviewed changes

petemill approved these changes Oct 31, 2024

View reviewed changes

Support Open Leo from Brave Search

b7d48f3

- Add a new permission for opening Leo from Brave Search - Add a NavigationThrottle to intercept specific URL requests and open Leo

yrliou force-pushed the open_leo_from_search branch from e882251 to b7d48f3 Compare October 31, 2024 19:06

yrliou merged commit f9ad5a4 into master Oct 31, 2024
17 checks passed

yrliou deleted the open_leo_from_search branch October 31, 2024 21:03

github-actions bot added this to the 1.73.x - Nightly milestone Oct 31, 2024

brave-builds added a commit that referenced this pull request Oct 31, 2024

Uplift of #26082 (squashed) to beta

acd7df5

brave-builds mentioned this pull request Oct 31, 2024

Open Leo from search (uplift to 1.72.x) #26328

Merged

7 tasks

This was referenced Nov 4, 2024

Fix site settings #26351

Merged

Add a unit test for kOpenAIChatFromBraveSearch feature flag brave/brave-browser#42073

Open

Update icon in open AI chat from Brave Search permission prompt brave/brave-browser#42074

Open

srirambv mentioned this pull request Nov 6, 2024

Opening Leo from search should auto populate after user agrees to opt-in brave/brave-browser#42112

Closed

6 tasks

kjozwiak pushed a commit that referenced this pull request Nov 6, 2024

Open Leo from search (uplift to 1.72.x) (#26328)

48bb61d

* Uplift of #26082 (squashed) to beta * Fix site settings --------- Co-authored-by: Jocelyn Liu <[email protected]>

bsclifton modified the milestones: 1.73.x - Nightly, 1.74.x - Nightly Nov 6, 2024

srirambv mentioned this pull request Nov 11, 2024

[SERP->Leo] Support Save chat in Brave Leo button from Brave Search brave/brave-browser#41711

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Open Leo from search #26082

Open Leo from search #26082

yrliou commented Oct 17, 2024 •

edited

Loading

brave-builds commented Oct 19, 2024

cdesouza-chromium left a comment

petemill left a comment

petemill left a comment

petemill Oct 31, 2024

yrliou Oct 31, 2024

github-actions bot commented Oct 31, 2024

Changes

brave-builds commented Nov 1, 2024

fallaciousreasoning commented Nov 3, 2024

srirambv commented Nov 6, 2024

Open Leo from search #26082

Open Leo from search #26082

Conversation

yrliou commented Oct 17, 2024 • edited Loading

Submitter Checklist:

Reviewer Checklist:

After-merge Checklist:

Test Plan:

brave-builds commented Oct 19, 2024

cdesouza-chromium left a comment

Choose a reason for hiding this comment

petemill left a comment

Choose a reason for hiding this comment

petemill left a comment

Choose a reason for hiding this comment

petemill Oct 31, 2024

Choose a reason for hiding this comment

yrliou Oct 31, 2024

Choose a reason for hiding this comment

github-actions bot commented Oct 31, 2024

Description

Possible Issues

Security Hotspots

Changes

brave-builds commented Nov 1, 2024

fallaciousreasoning commented Nov 3, 2024

srirambv commented Nov 6, 2024

yrliou commented Oct 17, 2024 •

edited

Loading