Ling0925
/
buster
mirror of https://github.com/buster-so/buster.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,847 Commits 151 Branches 17 Tags 116 MiB
Commit Graph

746 Commits

Author SHA1 Message Date
Nate Kelley 4e31af9a9c
code bock nodes 2025-07-28 14:58:12 -06:00
Nate Kelley 9233af8b25
Update useEditor.tsx 2025-07-28 14:44:43 -06:00
Nate Kelley e94ceeb508
Update shiki-instance.ts 2025-07-28 14:44:39 -06:00
Nate Kelley 42b9f0f0e8
Create useCodeHighlighter.tsx 2025-07-28 14:44:35 -06:00
Nate Kelley 8d3a38db60
Add additinional callout and toolbar 2025-07-28 13:15:11 -06:00
Nate Kelley 1a1b0a0bc0
add additional components 
Add
 2025-07-28 12:54:53 -06:00
dal 1a5cc47b58
Reverse message IDs in chat response to ensure they are ordered from oldest to newest. 2025-07-28 12:39:44 -06:00
Nate Kelley 37e12a4791
Initial commit for editor 2025-07-28 11:35:20 -06:00
Nate Kelley 1a6e758863
update optimistic parsing for query requests 2025-07-28 10:54:49 -06:00
Nate Kelley 9c499b647a
add some shadcn tailwind syntax 2025-07-28 10:29:58 -06:00
Nate Kelley 9acc244b2e
Merge branch 'staging' into big-nate/bus-1521-couple-bugz-with-three-dot-menu 2025-07-26 10:23:52 -06:00
Nate Kelley 1608547a3e
Merge branch 'big-nate/bus-1521-couple-bugz-with-three-dot-menu' of https://github.com/buster-so/buster into big-nate/bus-1521-couple-bugz-with-three-dot-menu 2025-07-26 10:23:39 -06:00
Nate Kelley 6a507bd7ff
rename should navigate to different page 2025-07-26 10:23:36 -06:00
Nate Kelley 7b8cbc6213
Merge pull request #631 from buster-so/big-nate/bus-1521-couple-bugz-with-three-dot-menu 
Fix save to collection dropdown
 2025-07-26 10:06:13 -06:00
Nate Kelley 1653ae5af4
Update apps/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/DashboardContainerHeaderButtons/DashboardThreeDotMenu.tsx 
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
 2025-07-26 10:05:07 -06:00
Nate Kelley f3944a6dea
fix bug causing dashboard add menu to flicker 2025-07-26 10:03:28 -06:00
dal 3e821f5609
Merge pull request #633 from buster-so/dallin/should-be-able-to-turbo-build-lint-test-unit-without-env-vars 
Dallin/should-be-able-to-turbo-build-lint-test-unit-without-env-vars
 2025-07-25 18:38:40 -06:00
dal 2833c6bb0c
dry run 2025-07-25 18:29:35 -06:00
dal 168da8a640
Merge pull request #632 from buster-so/dallin/minor-ui-tweaks-and-fixes 
Hide filters for now
 2025-07-25 17:07:47 -06:00
Nate Kelley 2ba9044d13
Invalidation after add to dashboard 2025-07-25 16:49:45 -06:00
dal 45c2846b9b
hiding filters for now since we're noticing LLM isn't ready. 2025-07-25 16:33:33 -06:00
Nate Kelley ac6b63bd6d
close on select false for favorites 2025-07-25 16:30:26 -06:00
Nate Kelley 2a0b727e17
Made icon bigger for dropdown 2025-07-25 16:16:58 -06:00
Nate Kelley efa289fe4d
Fix save to collection dropdown 2025-07-25 16:13:35 -06:00
Nate Kelley 850dc2577b
Memoized props should alwasy rerender 2025-07-25 15:47:13 -06:00
Nate Kelley e6d4628a5f
Remove "mode" from followup 
Removed mode from followup asset content. It was logically impossible to have a mode with a metric. Falling back to just asset type.
 2025-07-25 15:35:04 -06:00
dal 14fe8d0712
icon is now black when importing assets 2025-07-25 14:57:46 -06:00
dal 1f52bd9b69
Enhance asset chat handling by introducing `handleAssetChatWithPrompt` for processing user prompts alongside asset imports. Update `createChatHandler` to manage asset-only and asset+prompt scenarios, ensuring correct message order and preventing unnecessary analyst task triggers. Add tests for new functionality and refactor related services for improved clarity and maintainability. 2025-07-25 12:47:01 -06:00
Nate Kelley 2df53404d1
Merge pull request #627 from buster-so/devin/BUS-1494-1753276227 
Front end - asset document titles
 2025-07-24 18:18:38 -06:00
Nate Kelley 1d646c003d
Update request to use v2 2025-07-24 18:15:43 -06:00
Nate Kelley 0c6271f5c9
title generations 2025-07-24 18:09:18 -06:00
Nate Kelley 55679b9d19
Make request 2025-07-24 17:54:55 -06:00
Nate Kelley 633a77e2ef
Merge pull request #603 from buster-so/devin/BUS-1494-1753276227 
Implement /api/v2/title endpoint for asset title retrieval (BUS-1494)
 2025-07-24 17:43:41 -06:00
Nate Kelley 5e6eb76f5b
move get asset types around 2025-07-24 17:41:36 -06:00
Nate Kelley b2cf1725fc
Merge branch 'staging' into devin/BUS-1494-1753276227 2025-07-24 17:21:04 -06:00
Nate Kelley bcf6aac85d
Update code to scale down slightly 2025-07-24 17:03:25 -06:00
Nate Kelley a397cda878
Update chat-helpers.test.ts 2025-07-24 16:59:19 -06:00
Nate Kelley 09e0e3ec84
On success callback updated 2025-07-24 16:56:34 -06:00
Nate Kelley d134883db0
default markdown should use strip formatting, also not use llm output for blocks 2025-07-24 15:24:45 -06:00
Devin AI ccd8e1eab8 Add comprehensive unit tests for handleExistingChat message ordering 
- Test prepending new messages to maintain descending order (newest first)
- Verify message_ids array reflects correct chronological order
- Cover edge cases: multiple messages, single message, empty messages
- Prevent future regressions in message ordering logic

Co-Authored-By: Dallin Bentley <dallinbentley98@gmail.com>
 2025-07-24 18:11:06 +00:00
Devin AI 2ecf0a05fb Fix chat message ordering bug in handleExistingChat 
- Prepend new message instead of appending to maintain descending order
- Fixes BUS-1486: Message order reversal when adding follow-up messages
- getMessagesForChat returns newest-first, so new messages should be prepended

Co-Authored-By: Dallin Bentley <dallinbentley98@gmail.com>
 2025-07-24 18:01:34 +00:00
dal 19f7256a27
switch system messages to leverage caching a bit better 2025-07-24 10:06:18 -06:00
dal 8104ad33bf
fix the stream component so it can build 2025-07-24 09:49:05 -06:00
dal 0c3994da00
hotfix: use v2 on chats 2025-07-24 09:22:30 -06:00
Nate Kelley 00ff79c593
Assumption cards can use markdown streaming 2025-07-23 23:22:31 -06:00
Nate Kelley b08938e0fb
Merge pull request #616 from buster-so/devin/BUS-1522-1753312324 
Replace Paragraph with AppMarkdownStreaming in confidence score modal
 2025-07-23 23:17:22 -06:00
Nate Kelley d381cc8d44
make the code inline a little smaller 2025-07-23 23:16:08 -06:00
Nate Kelley 6938f569df
Update MetricItemCardThreeDotMenu.tsx 2025-07-23 23:09:58 -06:00
Nate Kelley 5db3e7652e
Merge branch 'big-nate/bus-1483-quick-win-for-filter-dashboard-drill-downexplore-metric' of https://github.com/buster-so/buster into big-nate/bus-1483-quick-win-for-filter-dashboard-drill-downexplore-metric 2025-07-23 23:09:09 -06:00
Nate Kelley 9b99236fa9
fix function name 2025-07-23 23:09:07 -06:00
Nate Kelley ebd0dc4086
Update apps/web/src/components/ui/card/InputCard.tsx 
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
 2025-07-23 23:08:40 -06:00
Nate Kelley ff8fef6d1f
Update apps/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/MetricItemCardThreeDotMenu.tsx 
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
 2025-07-23 23:08:31 -06:00
Nate Kelley 1fa4ea73e7
Update apps/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/MetricItemCardThreeDotMenu.tsx 
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
 2025-07-23 23:08:25 -06:00
Nate Kelley 5e354e8558
Update apps/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/MetricItemCardThreeDotMenu.tsx 
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
 2025-07-23 23:08:17 -06:00
Nate Kelley 4ba8b69ca4
Update apps/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/MetricItemCardThreeDotMenu.tsx 
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
 2025-07-23 23:07:32 -06:00
Nate Kelley e2eefbda68
Update tests 2025-07-23 23:06:45 -06:00
Nate Kelley af090d467e
fix tests 2025-07-23 22:53:54 -06:00
Nate Kelley e6d4062847
Merge branch 'staging' into big-nate/bus-1483-quick-win-for-filter-dashboard-drill-downexplore-metric 2025-07-23 22:45:54 -06:00
Nate Kelley 25342b79b3
Fix flickering bug 2025-07-23 22:43:40 -06:00
Nate Kelley 5eb43d0373
Add expanded threedot menu for menus 2025-07-23 22:33:16 -06:00
Nate Kelley 9686f78055
v1 handler for asset 2025-07-23 21:31:06 -06:00
dal 3396f9fb8a
Refactor package references: rename '@buster-tools/web-tools' to '@buster/web-tools' in package.json and pnpm-lock.yaml 2025-07-23 21:09:53 -06:00
dal b8b26af1f1
update trigger package? 2025-07-23 20:55:20 -06:00
Nate Kelley df3533ffc7
pass in better props 2025-07-23 17:18:45 -06:00
Devin AI 79cf9a01a2 Replace Paragraph with AppMarkdownStreaming in AssumptionSummary 
- Add import for AppMarkdownStreaming component
- Replace Paragraph element with AppMarkdownStreaming in AssumptionSummary component
- Use isStreamFinished=true and text-text-secondary className
- Fixes BUS-1522: post_processing_message isn't using the markdown component

Co-Authored-By: blake@buster.so <cblakerouse@gmail.com>
 2025-07-23 23:12:25 +00:00
dal 9c2e4232ab
Merge pull request #614 from buster-so/dallin/hotfix-chat-duplicate-messages 
Hotfixes on context management and dedup
 2025-07-23 17:01:46 -06:00
Nate Kelley 503c9fafa4
response types update 2025-07-23 16:56:17 -06:00
dal 42d1da5389
context fixes on messages 2025-07-23 16:56:06 -06:00
Nate Kelley a11ce3bfd2
Update responses and requests 2025-07-23 16:35:14 -06:00
Nate Kelley 1ea1d6c97c
move around some types 2025-07-23 16:29:00 -06:00
Nate Kelley 011724286c
Fix broken font size 2025-07-23 16:20:34 -06:00
Nate Kelley adb6527086
Create input card 2025-07-23 16:18:16 -06:00
Nate Kelley 587eda43d0
Update axios version 2025-07-23 15:48:44 -06:00
Nate Kelley e8b29a42f7
better linting and logs 2025-07-23 15:45:40 -06:00
Nate Kelley 77deabd8ac
Update lint command 2025-07-23 15:41:59 -06:00
Nate Kelley bc6dd58559
update ts config paths 2025-07-23 15:40:13 -06:00
Nate Kelley d1fee530a4
add async vite loader 2025-07-23 15:19:01 -06:00
Nate Kelley fa925a1dd7
Merge branch 'staging' into big-nate/bus-1460-create-endpointui-to-generate-chart-images 2025-07-23 15:07:29 -06:00
Nate Kelley e42c78a98b
shimmer animation update 2025-07-23 15:04:30 -06:00
Nate Kelley 36a6b19a47
working vitest config 2025-07-23 14:53:57 -06:00
Nate Kelley d2ccb25a7f
update existing chart 2025-07-23 14:40:56 -06:00
dal 42949f6730
pin trigger versions 2025-07-23 14:23:37 -06:00
Nate Kelley 7e86e84d16
Fix many type errors 2025-07-23 09:56:01 -06:00
dal 535777cc85
Merge pull request #604 from buster-so/dallin/bus-1488-try-switching-to-cloudflare-ai-gateway 
feat: add Google Vertex AI and improve model handling
 2025-07-23 07:57:20 -06:00
Devin AI 8bea0e8401 Fix Biome linting error: wrap switch default case in block scope 
- Add curly braces around default case content to satisfy noSwitchDeclarations rule
- Prevents variable declarations from being accessible to other switch cases
- Apply Biome formatting fixes for import statement and spacing

Co-Authored-By: nate@buster.so <nate@buster.so>
 2025-07-23 13:38:45 +00:00
Devin AI 783b95b190 Fix CI failures: correct import paths and user organization access 
- Import database queries from main @buster/database package
- Use getUserOrganizationId() instead of user.organizationId
- Add proper error handling for users without organizations
- Follow existing patterns from other API handlers

Co-Authored-By: nate@buster.so <nate@buster.so>
 2025-07-23 13:26:58 +00:00
dal 2cd36e47e1
feat: add Google Vertex AI and improve model handling 
- Added support for Google Vertex AI model version 2.2.27 in pnpm-lock.yaml and package.json.
- Introduced new model wrappers for Sonnet4 and Haiku35 with fallback logic.
- Updated various agents to utilize the new Sonnet4 model instead of the previous anthropicCachedModel.
- Enhanced error handling and retry logic in the fallback model implementation.
- Increased processing row limit in Snowflake query to 5000 for better performance.
- Added tests for new AI fallback models and their streaming capabilities.
 2025-07-23 07:22:52 -06:00
Devin AI 5b40205275 Implement /api/v2/title endpoint for BUS-1494 
- Add server-shared types for GetTitleRequest and GetTitleResponse with Zod validation
- Create database query functions for each asset type (chat, metric, collection, dashboard)
- Implement GET endpoint with zValidator middleware and exhaustive switch statement
- Add proper permission checks (publiclyAccessible OR organizationId match)
- Export new functions from database query index files
- Add title route to v2 API index
- Follow existing Hono API patterns with standardErrorHandler

Co-Authored-By: nate@buster.so <nate@buster.so>
 2025-07-23 13:14:58 +00:00
Nate Kelley 1b0a16d606
initial commit for a shared chart 2025-07-22 22:59:24 -06:00
Nate Kelley 67336cf02e
Add selected state to channel list 2025-07-22 22:20:13 -06:00
Nate Kelley 00848a58e7
Update slack integration to use new fake button 2025-07-22 22:09:25 -06:00
Nate Kelley dd6939f69b
font family fallback 2025-07-22 21:44:26 -06:00
Nate Kelley 93600447ee
Update SyntaxHighlighter.tsx 2025-07-22 21:17:42 -06:00
Nate Kelley f7a658a791
custom hook for token loading 2025-07-22 17:03:53 -06:00
Nate Kelley 29dff3b54e
more props for container 2025-07-22 16:59:17 -06:00
Nate Kelley 3520bd9111
shiki with proper transpilation 2025-07-22 16:29:21 -06:00
Nate Kelley 10be9b41b7
accept line numbers 2025-07-22 16:15:35 -06:00
Nate Kelley 7d7fa078a2
move to shiki 2025-07-22 15:47:25 -06:00
Nate Kelley 8c43acc6ad
Merge branch 'staging' into devin/BUS-1445-1752897550 2025-07-22 13:49:23 -06:00
Nate Kelley 2dca700dcf
Merge branch 'staging' into devin/BUS-1445-1752897550 2025-07-22 13:48:03 -06:00
Nate Kelley f7ccb090f6
Import type only 2025-07-22 13:45:59 -06:00
Nate Kelley 455bc86b26
fix broken unit tests 2025-07-22 13:36:05 -06:00
Nate Kelley 130ac1da31
simplify packages 2025-07-22 13:21:49 -06:00
Nate Kelley a9d6dae0f7
update chartjs to be more dynamic for faster page loads 2025-07-22 13:11:55 -06:00
Nate Kelley d27e0030b5
dynamic imports for chart 2025-07-22 12:47:05 -06:00
Nate Kelley 0fa8e76ff7
Merge branch 'staging' into devin/BUS-1459-1752941309 2025-07-22 12:26:14 -06:00
Nate Kelley c49bdd2426
fix some broken unit tests 2025-07-22 12:14:55 -06:00
Nate Kelley d3bfcbca1b
reroute to asset page check 2025-07-22 11:34:43 -06:00
Nate Kelley 4e3b0004e6
fix unit tests 2025-07-22 11:16:43 -06:00
Devin AI d57a24e6db feat: add optional next parameter to BusterAuthRoutesWithArgs for type safety 
- Follow BusterAppRoutesWithArgs pattern for optional parameters
- Enable type-safe redirect URL parameter in AUTH_LOGIN route

Co-Authored-By: nate@buster.so <nate@buster.so>
 2025-07-22 16:54:17 +00:00
Devin AI 82d75da0a7 feat: update AppNoPageAccess to show Login for unauthenticated users and embed pages 
- Add authentication state detection using useSupabaseContext
- Detect embed page context using window.location.pathname
- Show 'Login' button with redirect parameter for unauthenticated users or embed pages
- Keep 'Go home' button for authenticated users without asset access
- Include current URL as redirect parameter in login link

Co-Authored-By: nate@buster.so <nate@buster.so>
 2025-07-22 16:54:17 +00:00
Nate Kelley cd173c4fd4
Create assetReroutes.test.ts 2025-07-22 10:49:05 -06:00
Nate Kelley 9b02f11da5
Merge branch 'devin/BUS-1455-1752897143' of https://github.com/buster-so/buster into devin/BUS-1455-1752897143 2025-07-22 10:40:28 -06:00
Nate Kelley 3680285cd9
fix duplicate redirect logic 2025-07-22 10:39:53 -06:00
Devin AI 286c51eb0f Merge branch 'devin/BUS-1455-1752897143' of https://git-manager.devin.ai/proxy/github.com/buster-so/buster into devin/BUS-1455-1752897143 2025-07-22 16:39:06 +00:00
Devin AI d9c847c632 fix: resolve Next.js build error with useSearchParams in LoginForm 
- Update login page to be server component that extracts searchParams
- Pass redirectTo as prop to LoginForm instead of using useSearchParams
- Add helper function to reduce code duplication in middleware
- Add URL validation in layout component as suggested in PR comments
- Follow Next.js App Router best practices for server/client components

Co-Authored-By: nate@buster.so <nate@buster.so>
 2025-07-22 16:38:44 +00:00
Nate Kelley 64cdf49d5b
Merge branch 'staging' into devin/BUS-1455-1752897143 2025-07-22 10:17:46 -06:00
Nate Kelley f81736c4c4
Update animation name 2025-07-22 09:51:56 -06:00
Nate Kelley 3638d73547
force the y on package 2025-07-22 09:45:46 -06:00
Nate Kelley ff45432c4e
Merge branch 'staging' into big-nate/bus-1376-make-streaming-individual-words-use-the-streaming-affect 2025-07-22 09:38:10 -06:00
Nate Kelley b618bf53fa
Remove unused animation prop 2025-07-22 09:27:03 -06:00
Nate Kelley ffc255c5d6
Update animation to use css vars 2025-07-22 09:26:04 -06:00
dal fc8ac85280
Merge branch 'staging' into devin/BUS-1465-1753085075 2025-07-22 09:12:05 -06:00
Nate Kelley 1f4ceea012
change is stream finshed prop 2025-07-22 09:11:46 -06:00
dal e1a60bdf11
build fixes 2025-07-22 09:11:36 -06:00
Nate Kelley 0d74bd7f79
Update apps/web/src/components/features/reasoning/ReasoningFileCode.tsx 
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
 2025-07-22 09:08:06 -06:00
Nate Kelley 0c034d0926
fix small linting error 2025-07-22 09:06:57 -06:00
Nate Kelley 3199b38413
Merge branch 'staging' into devin/BUS-1477-1753139868 2025-07-22 09:02:36 -06:00
dal 43f88dd3a4
Merge pull request #580 from buster-so/devin/BUS-1468-1753084167 
feat: implement idle tool for agent system (BUS-1468)
 2025-07-22 08:44:59 -06:00
dal 8bfb6ff79b
trigger dependency updates 2025-07-22 08:39:00 -06:00
dal 6e626c2d2b
added in the itertools 2025-07-22 08:20:45 -06:00
Devin AI 64af03809c Remove custom connect_timeout parameter from Redshift connection 
- Remove custom .options([("connect_timeout", "120")]) parameter
- Keep existing .acquire_timeout(Duration::from_secs(120)) which uses proper SDK methods
- This allows the SDK to handle connection timeouts using its default mechanisms

Co-Authored-By: Dallin Bentley <dallinbentley98@gmail.com>
 2025-07-22 13:34:33 +00:00
Devin AI 1820dd6842 Implement consistent email sorting for individual_permissions arrays 
- Backend: Add itertools imports and case-insensitive email sorting to collections, dashboards, and metrics handlers
- Frontend: Add email sorting to React Query mutation onMutate callbacks for share/unshare operations
- Ensures consistent alphabetical ordering by email across API responses and UI state
- Addresses BUS-1477 requirements for predictable individual_permissions ordering

Co-Authored-By: nate@buster.so <nate@buster.so>
 2025-07-22 12:41:40 +00:00
dal 9b9914cd70
build fixes 2025-07-21 17:38:37 -06:00
dal cb3dd968e3
slack markdown fixes 2025-07-21 17:35:58 -06:00
Devin AI 5082831630 Add consistent ordering to individual_permissions queries 
- Add .order_by(users::email) to individual_permissions_query in dashboard handler
- Add .order_by(users::email) to individual_permissions_query in metrics handler
- Add .order_by(users::email) to individual_permissions_query in collections handler
- Ensures consistent alphabetical ordering by email across all endpoints

Fixes BUS-1477

Co-Authored-By: nate@buster.so <nate@buster.so>
 2025-07-21 23:17:59 +00:00
dal a7e023ff6f
Merge pull request #588 from buster-so/dallin/bus-1474-investigate-redshift-connection-timeout-issues-with 
increase timeouts and a few lint fixes
 2025-07-21 16:39:40 -06:00
dal c66c8b910b
here we go agian 2025-07-21 16:38:58 -06:00
dal 0f0c733567
boom frozen 2025-07-21 16:34:33 -06:00
dal cf2ec2b02a
please 2025-07-21 16:27:15 -06:00
Nate Kelley 0eaeb3f12f
Merge pull request #589 from buster-so/cursor/centralize-environment-variables-with-turbo-1ef2 
Cursor/centralize environment variables with turbo 1ef2
 2025-07-21 16:11:43 -06:00
Nate Kelley 1458d02857
Merge branch 'staging' into cursor/centralize-environment-variables-with-turbo-1ef2 2025-07-21 16:11:26 -06:00
dal 1fa75800fc
unknwon fix and build error 2025-07-21 16:09:39 -06:00
Nate Kelley 8ee892bf2a
Use tsx and .ts files for validation 2025-07-21 16:07:14 -06:00
dal 58eb9e8234
no frozen lockfile 2025-07-21 16:04:00 -06:00
Nate Kelley 3f8b05182d
update server to use tsx 2025-07-21 16:03:02 -06:00
Nate Kelley 4418f4991b
use a shared env validation method 2025-07-21 16:00:10 -06:00
dal d1ab09999f
update so rust build works 2025-07-21 15:46:43 -06:00
Nate Kelley bebdcdc347
Update list invlidation logic 2025-07-21 15:44:08 -06:00
Nate Kelley 4460e4934b
Merge branch 'staging' into devin/BUS-1447-1752896644 2025-07-21 15:40:34 -06:00