Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1646 commits
Select commit Hold shift + click to select a range
4054b2f
Send strongly typed messages, send tool use
marktayl1 Sep 5, 2025
1a1c84e
Merge branch 'macae-v3-dev-v2-vip' of https://github.com/microsoft/Mu…
marktayl1 Sep 5, 2025
18589b5
Merge pull request #451 from microsoft/macae-v3-dev-marktayl
Fr4nc3 Sep 5, 2025
8c0c564
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
Fr4nc3 Sep 5, 2025
c62e19a
teams config ui
blessing-sanusi Sep 5, 2025
10ea0be
Merge remote-tracking branch 'origin/macae-v3-dev-v2-vip' into macae-…
blessing-sanusi Sep 5, 2025
42f1c8a
teams config ui
blessing-sanusi Sep 5, 2025
4f1b2fa
fix agent tests, fix agent cleanup, fix plan output, add mcp functions
marktayl1 Sep 5, 2025
caacaa2
Merge branch 'macae-v3-dev-v2-vip' of https://github.com/microsoft/Mu…
marktayl1 Sep 5, 2025
be6c60b
Merge pull request #453 from microsoft/macae-v3-dev-marktayl
Fr4nc3 Sep 6, 2025
8c61f34
Merge pull request #452 from microsoft/macae-BS-teamconfigUI
Fr4nc3 Sep 6, 2025
24ddc64
Update messages.py
Fr4nc3 Sep 6, 2025
dd3d046
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
Fr4nc3 Sep 6, 2025
c251672
Add WebSocket message type support and refactor messaging
Fr4nc3 Sep 6, 2025
7884e82
Use event loop time for result timestamp
Fr4nc3 Sep 6, 2025
76a43e8
Refactor WebSocket message handling and types
Fr4nc3 Sep 6, 2025
ab5474f
Merge pull request #450 from microsoft/macae-v3-fr-dev-92
marktayl1 Sep 6, 2025
d2cf1dc
Remove unused human feedback and websocket message models
Fr4nc3 Sep 6, 2025
0835289
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
Fr4nc3 Sep 6, 2025
fd78d41
Add agent message and streaming parsers
Fr4nc3 Sep 6, 2025
59867a4
Merge pull request #454 from microsoft/macae-v3-fr-dev-92
marktayl1 Sep 6, 2025
c915021
Refactor WebSocket message types and models
Fr4nc3 Sep 7, 2025
91a9aa8
Refactor plan approval request event to use enum
Fr4nc3 Sep 7, 2025
86f6a8f
Refactor websocket message type usage
Fr4nc3 Sep 7, 2025
c8e0405
Refactor data_type usage and add PlanService
Fr4nc3 Sep 7, 2025
358ffb1
Add TeamSelected component and update team selection logic
Fr4nc3 Sep 7, 2025
f76bb3f
Fix team ID reference in get_plans endpoint
Fr4nc3 Sep 7, 2025
7dbf4e3
Update plan model and status handling across backend and frontend
Fr4nc3 Sep 7, 2025
f1d3c44
Update plan property references in chat and service
Fr4nc3 Sep 7, 2025
7621380
Update task list UI and task categorization logic
Fr4nc3 Sep 7, 2025
fe6fa57
Refactor plan approval request parsing logic
Fr4nc3 Sep 7, 2025
e1f5f75
Refactor PlanChat to use streaming components
Fr4nc3 Sep 7, 2025
40da5e9
Refactor PlanChat input into PlanChatBody component
Fr4nc3 Sep 7, 2025
85d3525
Refactor plan approval state management
Fr4nc3 Sep 7, 2025
6d73315
Update PlanPage.tsx
Fr4nc3 Sep 7, 2025
0b805d9
Add streaming buffer message display to PlanChat
Fr4nc3 Sep 8, 2025
123a421
Add agent message streaming to plan chat
Fr4nc3 Sep 8, 2025
6727f81
Add note on role assignment for existing Azure AI Foundry access afte…
Harsh-Microsoft Sep 8, 2025
2efbece
Merge pull request #455 from microsoft/macae-v3-fr-dev-92
Fr4nc3 Sep 8, 2025
9213ce3
Merge pull request #456 from microsoft/psl-hb-exp-roleassign-doc
Roopan-Microsoft Sep 8, 2025
4bfb151
Remove unsupported Azure regions and add zone redundancy option for C…
Abdul-Microsoft Sep 8, 2025
cde69d4
Updated the package-lock.json to resolve the build container issue
Dhruvkumar-Microsoft Sep 8, 2025
5dc84e7
Merge pull request #457 from microsoft/psl-fixcosmosissuev3
Roopan-Microsoft Sep 8, 2025
f42d8a0
updated the main_custom for cosmos error
Dhruvkumar-Microsoft Sep 8, 2025
cc3eb7c
Merge pull request #461 from microsoft/psl-fixcosmosissuev3
Roopan-Microsoft Sep 8, 2025
a03d91a
Merge pull request #458 from microsoft/psl-packgelock-changes
Fr4nc3 Sep 8, 2025
3f176b1
Update WebSocketService.tsx
Fr4nc3 Sep 8, 2025
644dce2
Update PlanPage.tsx
Fr4nc3 Sep 8, 2025
edf896f
Update PlanPage.tsx
Fr4nc3 Sep 8, 2025
7e2ebf7
Update WebSocketService.tsx
Fr4nc3 Sep 8, 2025
c00198c
streaming process UI
blessing-sanusi Sep 8, 2025
78bdf31
streaming process UI
blessing-sanusi Sep 8, 2025
a05076c
Merge pull request #463 from microsoft/macae-v3-streaming-UI
Fr4nc3 Sep 8, 2025
34a92aa
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
Fr4nc3 Sep 8, 2025
9a70f0f
Improve conditional rendering and logging in chat components
Fr4nc3 Sep 8, 2025
76c146c
Refactor team config retrieval to remove user filter
Fr4nc3 Sep 8, 2025
17df80e
Merge pull request #464 from microsoft/macae-v3-fr-dev-92
Fr4nc3 Sep 8, 2025
f0b69a6
redesign PlanPanelRight with clean layout and proper plan step forma…
blessing-sanusi Sep 8, 2025
029753d
Merge pull request #465 from microsoft/macae-BS-rightpanel-ui
Fr4nc3 Sep 8, 2025
53e2d6e
Update WebSocketService.tsx
Fr4nc3 Sep 8, 2025
e40809c
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
Fr4nc3 Sep 8, 2025
a624a20
Quick Task Cards Enhancemen
blessing-sanusi Sep 8, 2025
2cde5d7
Merge pull request #467 from microsoft/macae-BS-startingTask-UI
Fr4nc3 Sep 8, 2025
1f10a86
Update WebSocketService.tsx
Fr4nc3 Sep 8, 2025
27ef6ee
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
Fr4nc3 Sep 8, 2025
551ce9b
Refactor plan details props and chat input logic
Fr4nc3 Sep 8, 2025
c4fb8bf
Update PlanPage.tsx
Fr4nc3 Sep 8, 2025
f2de165
Merge pull request #466 from microsoft/macae-v3-fr-dev-92
marktayl1 Sep 8, 2025
1a07518
Update WebSocketService.tsx
Fr4nc3 Sep 8, 2025
04babf4
Merge pull request #468 from microsoft/macae-v3-fr-dev-92
marktayl1 Sep 8, 2025
8139a6c
nhanced StreamingPlanResponse UI with dynamic content display and imp…
blessing-sanusi Sep 8, 2025
c386b21
Add RAI validation and user clarification parsing
Fr4nc3 Sep 8, 2025
b566350
Refactor team config retrieval and update frontend models
Fr4nc3 Sep 8, 2025
c5cfd6c
Merge pull request #469 from microsoft/macae-BS-chainofthoughts-UI
Fr4nc3 Sep 8, 2025
0f15b86
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
Fr4nc3 Sep 8, 2025
af8dad2
Remove proxy settings from Vite server config
Fr4nc3 Sep 8, 2025
13266fa
Update StreamingAgentMessage.tsx
Fr4nc3 Sep 8, 2025
ea315c9
Add agent_type to AgentMessage and related logic
Fr4nc3 Sep 9, 2025
b0b90de
Refactor clarification and result message handling
Fr4nc3 Sep 9, 2025
0c6d896
Merge pull request #470 from microsoft/macae-v3-fr-dev-92
blessing-sanusi Sep 9, 2025
f58c816
Refactor plan retrieval and task list UI
Fr4nc3 Sep 9, 2025
7f4d206
Improve message handling and logging in chat flow
Fr4nc3 Sep 9, 2025
d0b66dd
Parse and emit transformed final result messages
Fr4nc3 Sep 9, 2025
cdf7ef3
Merge pull request #471 from microsoft/macae-v3-fr-dev-92
Fr4nc3 Sep 9, 2025
2c92348
Update PlanChat UI and simplify error handling
Fr4nc3 Sep 9, 2025
61f5a00
Merge pull request #472 from microsoft/macae-v3-fr-dev-92
Fr4nc3 Sep 9, 2025
edfbc9a
RAI prompt change, docker fix, mcp fix
marktayl1 Sep 9, 2025
b61aad1
Merge branch 'macae-v3-dev-v2-vip' of https://github.com/microsoft/Mu…
marktayl1 Sep 9, 2025
84a5581
revert tools and info prompt
marktayl1 Sep 9, 2025
73da377
Change the biceps to test deploy
marktayl1 Sep 9, 2025
b3b6b51
Merge pull request #473 from microsoft/macae-v3-dev-marktayl
Fr4nc3 Sep 9, 2025
fcfbdad
deploy tag change for test
marktayl1 Sep 9, 2025
5b08ed3
Merge pull request #474 from microsoft/macae-v3-dev-marktayl
Fr4nc3 Sep 9, 2025
c6cf529
Add plan execution spinner to PlanChat flow
Fr4nc3 Sep 9, 2025
0c287bd
Merge pull request #475 from microsoft/macae-v3-fr-dev-92
Fr4nc3 Sep 9, 2025
4b97c0f
Refactor team selection display logic
Fr4nc3 Sep 9, 2025
3097461
Enhance agent and buffer message UI components
Fr4nc3 Sep 9, 2025
fa5b250
Refactor agent message content field and add enums
Fr4nc3 Sep 9, 2025
eaefed7
Refactor plan approval logic to PlanPage
Fr4nc3 Sep 9, 2025
bf34b9a
Merge pull request #476 from microsoft/macae-v3-fr-dev-92
Fr4nc3 Sep 9, 2025
47fba1d
RAI agent implementation
marktayl1 Sep 9, 2025
29b8630
Merge branch 'macae-v3-dev-v2-vip' of https://github.com/microsoft/Mu…
marktayl1 Sep 10, 2025
d34ea29
Merge pull request #477 from microsoft/macae-v3-dev-marktayl
Fr4nc3 Sep 10, 2025
bbb9ca7
added the correct env varible and updated the search index to take js…
Dhruvkumar-Microsoft Sep 10, 2025
01f55ae
Turn off code interpreter for RAI agent
marktayl1 Sep 10, 2025
e3d4195
updated the varianle name and message
Dhruvkumar-Microsoft Sep 10, 2025
89c33d7
Merge pull request #478 from microsoft/psl-bug-23298
Roopan-Microsoft Sep 10, 2025
2d63bb2
Refactor session and team management in backend
Fr4nc3 Sep 10, 2025
ce02065
Add async agent message handlers and improve logging
Fr4nc3 Sep 10, 2025
48a6926
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
Fr4nc3 Sep 10, 2025
9078d85
Merge pull request #479 from microsoft/macae-v3-dev-marktayl
Fr4nc3 Sep 10, 2025
128bb0b
Refactor plan page state and improve streaming parsing
Fr4nc3 Sep 10, 2025
26425d1
feat: implement consistent UI styling across streaming components
blessing-sanusi Sep 10, 2025
9ded43f
Merge pull request #481 from microsoft/macae-BS-UI-ChatChanges
Fr4nc3 Sep 10, 2025
d53e031
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
Fr4nc3 Sep 10, 2025
3c72b0d
Add plan approval and mplan management features
Fr4nc3 Sep 10, 2025
867166f
Add user_id parameter to message handlers
Fr4nc3 Sep 10, 2025
8d62b20
updated the dockerfile for optimization
Dhruvkumar-Microsoft Sep 11, 2025
026c9b9
Add proxy to retail, fix proxy model, add round max, modify retail pr…
marktayl1 Sep 11, 2025
5f1d5e3
fixed greet to keep it out of onboarding scenario
marktayl1 Sep 11, 2025
1b4a5ca
added the allowed methods in backend container
Dhruvkumar-Microsoft Sep 11, 2025
894b2e6
added python:3.11-slim-bullseye in frontend DockerFile
Dhruvkumar-Microsoft Sep 11, 2025
427450a
Add fields to AgentMessage models for plan messaging
Fr4nc3 Sep 11, 2025
2b9c1be
Improve human clarification handling in API
Fr4nc3 Sep 11, 2025
bb466d4
fix messaging for the termination message
marktayl1 Sep 11, 2025
78495c1
Add agent message endpoint and update AgentMessageResponse model
Fr4nc3 Sep 11, 2025
3bff1f2
Merge branch 'macae-v3-dev-marktayl' into macae-v3-fr-dev-92
Fr4nc3 Sep 11, 2025
ca3e58f
Merge pull request #485 from microsoft/psl-bug-23296
Fr4nc3 Sep 11, 2025
83ee3a4
Merge pull request #484 from microsoft/psl-bug-23384
Fr4nc3 Sep 11, 2025
96dadc8
Remove unused agent team JSON files and refactor imports
Fr4nc3 Sep 11, 2025
a341907
Merge pull request #486 from microsoft/macae-v3-dev-marktayl
Fr4nc3 Sep 11, 2025
9804be5
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
Fr4nc3 Sep 11, 2025
a61d821
Refactor AgentMessageResponse field defaults and order
Fr4nc3 Sep 11, 2025
1c51ae4
Fixes for containers
marktayl1 Sep 11, 2025
170e19c
Merge branch 'macae-v3-dev-marktayl' of https://github.com/microsoft/…
marktayl1 Sep 11, 2025
2271392
Refactor agent message handling and validation logic
Fr4nc3 Sep 11, 2025
d233db2
Improve agent message parsing for multiple formats
Fr4nc3 Sep 11, 2025
b6358e8
Add agent message support to database and services
Fr4nc3 Sep 11, 2025
d12b7b5
Fixes: App loading issues, branding inconsistencies, and UI readability
blessing-sanusi Sep 12, 2025
438c1c2
Fixes: App loading issues, branding inconsistencies, and UI readability
blessing-sanusi Sep 12, 2025
650e4ed
Merge pull request #487 from microsoft/macae-BS-UI-moreChanges
Fr4nc3 Sep 12, 2025
7ab7196
Add agent message persistence to PlanPage
Fr4nc3 Sep 12, 2025
6354ec2
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
Fr4nc3 Sep 12, 2025
4b9658c
Refactor plan_service.py for readability and formatting
Fr4nc3 Sep 12, 2025
260313f
added the changes related to agent creation from mcp
Dhruvkumar-Microsoft Sep 12, 2025
be4aaa7
Merge pull request #488 from microsoft/macae-v3-dev-marktayl
Fr4nc3 Sep 12, 2025
2cbc49e
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
Fr4nc3 Sep 12, 2025
25ba001
Merge branch 'macae-v3-dev-v2-vip' of https://github.com/microsoft/Mu…
Dhruvkumar-Microsoft Sep 12, 2025
f141f5d
Add OpenAPI docstrings to API endpoints
Fr4nc3 Sep 12, 2025
41f2d9c
Merge pull request #489 from microsoft/psl-bug-23468
Roopan-Microsoft Sep 12, 2025
377365f
Refactor agent message handling and plan retrieval
Fr4nc3 Sep 12, 2025
c4120fd
Fix indentation for HTTPException in upload_team_config
Fr4nc3 Sep 12, 2025
fd0dccc
Refactor plan data handling and WebSocket params
Fr4nc3 Sep 12, 2025
b930096
Remove unused getPlanWithSteps method and update PlanPage
Fr4nc3 Sep 12, 2025
7abb794
Added exception checking / logging for agent creation.
marktayl1 Sep 12, 2025
167a78b
Merge branch 'macae-v3-dev-v2-vip' of https://github.com/microsoft/Mu…
marktayl1 Sep 12, 2025
4be82af
Add final message handling and AgentMessageResponse type
Fr4nc3 Sep 12, 2025
3132e5b
Update messages.py
Fr4nc3 Sep 12, 2025
58672c1
Refactor get_team_by_id and improve plan retrieval error handling
Fr4nc3 Sep 12, 2025
c8b4631
Prompt fix for product retrieval through proxy
marktayl1 Sep 12, 2025
a04a1c4
Pass planData to agent message processing in PlanPage
Fr4nc3 Sep 12, 2025
5893f74
Refactor AgentMessageResponse model and usage
Fr4nc3 Sep 12, 2025
9112a94
Simplify agent message content before processing
Fr4nc3 Sep 12, 2025
fc95382
UI error handling
blessing-sanusi Sep 12, 2025
d013efd
Merge pull request #491 from microsoft/macae-BS-UI-errorHandling
Fr4nc3 Sep 12, 2025
5007810
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
Fr4nc3 Sep 12, 2025
bcf5c22
Merge pull request #480 from microsoft/macae-v3-fr-dev-92
blessing-sanusi Sep 12, 2025
b87fe95
chat input ui changes
blessing-sanusi Sep 12, 2025
a5ed4cf
Merge pull request #492 from microsoft/macae-BS-UI-errorHandling
Fr4nc3 Sep 13, 2025
1848ebc
Update messages.py
Fr4nc3 Sep 13, 2025
9ee5d1a
Merge pull request #493 from microsoft/macae-v3-fr-dev-92
Fr4nc3 Sep 13, 2025
40993f8
Refactor plan models and update team selection logic
Fr4nc3 Sep 13, 2025
7c2fd21
Support complex user_request structure in MPlan
Fr4nc3 Sep 13, 2025
4ab499b
recommended bug fixes and logging
marktayl1 Sep 14, 2025
193d318
New tools and prompts to improve golden path performance
marktayl1 Sep 14, 2025
b8ecea1
tweaks for tooling
marktayl1 Sep 14, 2025
514a6b2
fix mcp bugs
marktayl1 Sep 14, 2025
0e41183
Update PlanDataService.tsx
Fr4nc3 Sep 14, 2025
52ed165
Merge pull request #495 from microsoft/macae-v3-fr-dev-92
Fr4nc3 Sep 14, 2025
0499433
Clean up logging / info output
marktayl1 Sep 14, 2025
66bc081
Onboarding changes to avoid agent confusion.
marktayl1 Sep 14, 2025
be7a8c6
Merge pull request #490 from microsoft/macae-v3-dev-marktayl
marktayl1 Sep 15, 2025
3e15d3a
Update PlanPage.tsx
Fr4nc3 Sep 15, 2025
c702314
Merge pull request #497 from microsoft/macae-v3-fr-dev-92
Fr4nc3 Sep 15, 2025
274326f
Pass user_id via query param in WebSocket connection
Fr4nc3 Sep 15, 2025
d7ce6dc
more UI fixes including buffer messages ui fix
blessing-sanusi Sep 15, 2025
4cef342
Merge pull request #499 from microsoft/macae-BS-UI-fix
Fr4nc3 Sep 15, 2025
110061d
Update WebSocketService.tsx
Fr4nc3 Sep 15, 2025
7c8d58f
removed sample data tag
blessing-sanusi Sep 15, 2025
9546798
removed sample data tag
blessing-sanusi Sep 15, 2025
8cd2fac
Merge pull request #498 from microsoft/macae-v3-fr-dev-92
marktayl1 Sep 15, 2025
241b55b
Merge pull request #500 from microsoft/macae-BS-UI-fix
Fr4nc3 Sep 15, 2025
a6fc754
commented the manifest.json in index.html to remove the CORS issue
Dhruvkumar-Microsoft Sep 16, 2025
8062682
Merge pull request #501 from microsoft/psl-bug-manifestissue
Roopan-Microsoft Sep 16, 2025
876760a
Remove agent team configs and all MCP datasets
Fr4nc3 Sep 16, 2025
9ada004
Refactor PlanPage effect dependencies and server imports
Fr4nc3 Sep 16, 2025
f127b69
feat: add centralized agent icon system and fix agent name formatting
blessing-sanusi Sep 16, 2025
7e45792
feat: add centralized agent icon system and fix agent name formatting
blessing-sanusi Sep 16, 2025
96dba92
remove unused / sample teams
marktayl1 Sep 16, 2025
16f5ce3
Merge branch 'macae-v3-dev-v2-vip' of https://github.com/microsoft/Mu…
marktayl1 Sep 16, 2025
2392bf4
Remove unused code and improve team reload logic
Fr4nc3 Sep 16, 2025
a1067e9
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
Fr4nc3 Sep 16, 2025
243d639
Merge pull request #505 from microsoft/macae-v3-dev-marktayl
Fr4nc3 Sep 16, 2025
82629b8
Update HomePage.tsx
Fr4nc3 Sep 16, 2025
6a85b07
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
Fr4nc3 Sep 16, 2025
3210725
Merge pull request #504 from microsoft/macae-BS-UI-fix
Fr4nc3 Sep 16, 2025
9420811
Update HomePage.tsx
Fr4nc3 Sep 16, 2025
e2b16f3
Centralize agent icon and display name logic
Fr4nc3 Sep 16, 2025
1df7bd9
Merge pull request #503 from microsoft/macae-v3-fr-dev-92
Fr4nc3 Sep 16, 2025
c05702a
Refactor HomeInput and HomePage hooks and formatting
Fr4nc3 Sep 16, 2025
bc3ee74
Merge pull request #506 from microsoft/macae-v3-fr-dev-92
Fr4nc3 Sep 16, 2025
1f75a29
Refactor plan panel left reload logic and props
Fr4nc3 Sep 16, 2025
dfdb99e
Update router.py
Fr4nc3 Sep 16, 2025
53ac647
Merge pull request #507 from microsoft/macae-v3-fr-dev-92
marktayl1 Sep 16, 2025
1e6f9e0
Update PlanPage.tsx
Fr4nc3 Sep 16, 2025
4b3c920
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
Fr4nc3 Sep 16, 2025
c1d26b6
fixed human clarification text color
blessing-sanusi Sep 16, 2025
9e73d9c
Merge pull request #508 from microsoft/macae-BS-UI-fix
Fr4nc3 Sep 16, 2025
703a43c
Add streaming message support to plan and agent messages
Fr4nc3 Sep 16, 2025
7ad2bb3
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
Fr4nc3 Sep 16, 2025
520dfb6
Merge pull request #509 from microsoft/macae-v3-fr-dev-92
Fr4nc3 Sep 16, 2025
3a7351d
Simplify error handling for plan creation
Fr4nc3 Sep 17, 2025
6ebf6ff
Improve plan chat UI and team selection handling
Fr4nc3 Sep 17, 2025
ca51d21
Update PlanPage.tsx
Fr4nc3 Sep 17, 2025
9244519
Merge pull request #510 from microsoft/macae-v3-fr-dev-92
Fr4nc3 Sep 17, 2025
bd0b06c
Remove sample questions, change app image in readme
marktayl1 Sep 17, 2025
28dd6d8
Merge branch 'macae-v3-dev-v2-vip' of https://github.com/microsoft/Mu…
marktayl1 Sep 17, 2025
3b9c92c
Refactor PlanPanelRight to use CSS classes
Fr4nc3 Sep 17, 2025
cf22485
Merge pull request #511 from microsoft/macae-v3-fr-dev-92
Fr4nc3 Sep 17, 2025
791b515
remove TODOs
marktayl1 Sep 17, 2025
1331c8e
Merge pull request #512 from microsoft/macae-v3-dev-marktayl
marktayl1 Sep 17, 2025
83bac1b
Update agentIconUtils.tsx
Fr4nc3 Sep 18, 2025
99094c1
Merge pull request #513 from microsoft/macae-v3-fr-dev-92
Fr4nc3 Sep 18, 2025
b349cbc
Fix plan activities that mention agents, Logging fixes, clean-up
marktayl1 Sep 19, 2025
45af66c
Added the user_id explicitly to get the completed task
Dhruvkumar-Microsoft Sep 19, 2025
d099e6a
Merge pull request #515 from microsoft/psl-bug-leftpanelissue
Roopan-Microsoft Sep 19, 2025
b891f43
Update agent flow and architecture diagrams
Fr4nc3 Sep 19, 2025
46fa18d
Merge pull request #516 from microsoft/macae-v3-fr-dev-92
Fr4nc3 Sep 19, 2025
d65a018
prompt tweak for final - doc image updates
marktayl1 Sep 19, 2025
ffb9fc5
Merge branch 'macae-v3-dev-v2-vip' of https://github.com/microsoft/Mu…
marktayl1 Sep 19, 2025
b12e375
Merge pull request #514 from microsoft/macae-v3-dev-marktayl
marktayl1 Sep 19, 2025
08266d2
Merge branch 'main' into psldownmerge
Roopan-Microsoft Sep 22, 2025
dd8f394
Merge pull request #518 from microsoft/psldownmerge
Roopan-Microsoft Sep 22, 2025
70ff4ea
updated the pipeline and bicep changes
Dhruvkumar-Microsoft Sep 22, 2025
066fe30
updated the tags and branch
Dhruvkumar-Microsoft Sep 22, 2025
70e6b66
Merge pull request #519 from microsoft/psl-pipelinechanges
Roopan-Microsoft Sep 22, 2025
f262621
Merge pull request #418 from microsoft/macae-v3-dev-v2-vip
Roopan-Microsoft Sep 22, 2025
9ef6f01
enabled the public access for search service
Dhruvkumar-Microsoft Sep 23, 2025
ff1de98
added the comments
Dhruvkumar-Microsoft Sep 23, 2025
407b9cb
Merge pull request #522 from microsoft/psl-searchserviceissue
Roopan-Microsoft Sep 23, 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
346 changes: 346 additions & 0 deletions .github/workflows/deploy-v2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,346 @@
name: Validate Deployment v2

on:
workflow_run:
workflows: ["Build Docker and Optional Push"]
types:
- completed
branches:
- macae-v2
- dev
schedule:
- cron: "0 11,23 * * *" # Runs at 11:00 AM and 11:00 PM GMT
workflow_dispatch: #Allow manual triggering
env:
GPT_MIN_CAPACITY: 150
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}

jobs:
deploy:
runs-on: ubuntu-latest
outputs:
RESOURCE_GROUP_NAME: ${{ steps.check_create_rg.outputs.RESOURCE_GROUP_NAME }}
WEBAPP_URL: ${{ steps.get_output.outputs.WEBAPP_URL }}
DEPLOYMENT_SUCCESS: ${{ steps.deployment_status.outputs.SUCCESS }}
MACAE_URL_API: ${{ steps.get_backend_url.outputs.MACAE_URL_API }}
CONTAINER_APP: ${{steps.get_backend_url.outputs.CONTAINER_APP}}
steps:
- name: Checkout Code
uses: actions/checkout@v3

- name: Run Quota Check
id: quota-check
run: |
export AZURE_CLIENT_ID=${{ secrets.AZURE_CLIENT_ID }}
export AZURE_TENANT_ID=${{ secrets.AZURE_TENANT_ID }}
export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }}
export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
export GPT_MIN_CAPACITY="150"
export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"

chmod +x infra/scripts/checkquota.sh
if ! infra/scripts/checkquota.sh; then
# If quota check fails due to insufficient quota, set the flag
if grep -q "No region with sufficient quota found" infra/scripts/checkquota.sh; then
echo "QUOTA_FAILED=true" >> $GITHUB_ENV
fi
exit 1 # Fail the pipeline if any other failure occurs
fi

- name: Send Notification on Quota Failure
if: env.QUOTA_FAILED == 'true'
run: |
RUN_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
EMAIL_BODY=$(cat <<EOF
{
"body": "<p>Dear Team,</p><p>The quota check has failed, and the pipeline cannot proceed.</p><p><strong>Build URL:</strong> ${RUN_URL}</p><p>Please take necessary action.</p><p>Best regards,<br>Your Automation Team</p>"
}
EOF
)

curl -X POST "${{ secrets.AUTO_LOGIC_APP_URL }}" \
-H "Content-Type: application/json" \
-d "$EMAIL_BODY" || echo "Failed to send notification"

- name: Fail Pipeline if Quota Check Fails
if: env.QUOTA_FAILED == 'true'
run: exit 1

- name: Set Deployment Region
run: |
echo "Selected Region: $VALID_REGION"
echo "AZURE_LOCATION=$VALID_REGION" >> $GITHUB_ENV

- name: Setup Azure CLI
run: |
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
az --version # Verify installation

- name: Login to Azure
run: |
az login --service-principal -u ${{ secrets.AZURE_CLIENT_ID }} -p ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}

- name: Install Bicep CLI
run: az bicep install

- name: Generate Resource Group Name
id: generate_rg_name
run: |
ACCL_NAME="macae"
SHORT_UUID=$(uuidgen | cut -d'-' -f1)
UNIQUE_RG_NAME="arg-${ACCL_NAME}-${SHORT_UUID}"
echo "RESOURCE_GROUP_NAME=${UNIQUE_RG_NAME}" >> $GITHUB_ENV
echo "Generated Resource_GROUP_PREFIX: ${UNIQUE_RG_NAME}"

- name: Check and Create Resource Group
id: check_create_rg
run: |
set -e
rg_exists=$(az group exists --name ${{ env.RESOURCE_GROUP_NAME }})
if [ "$rg_exists" = "false" ]; then
az group create --name ${{ env.RESOURCE_GROUP_NAME }} --location ${{ env.AZURE_LOCATION }}
fi
echo "RESOURCE_GROUP_NAME=${{ env.RESOURCE_GROUP_NAME }}" >> $GITHUB_OUTPUT

- name: Generate Unique Solution Prefix
id: generate_solution_prefix
run: |
COMMON_PART="macae"
TIMESTAMP=$(date +%s)
UPDATED_TIMESTAMP=$(echo $TIMESTAMP | tail -c 6)
UNIQUE_SOLUTION_PREFIX="${COMMON_PART}${UPDATED_TIMESTAMP}"
echo "SOLUTION_PREFIX=${UNIQUE_SOLUTION_PREFIX}" >> $GITHUB_ENV

- name: Deploy Bicep Template
id: deploy
run: |
if [[ "${{ env.BRANCH_NAME }}" == "macae-v2" ]]; then
IMAGE_TAG="latest"
elif [[ "${{ env.BRANCH_NAME }}" == "dev" ]]; then
IMAGE_TAG="dev"
# elif [[ "${{ env.BRANCH_NAME }}" == "hotfix" ]]; then
# IMAGE_TAG="hotfix"
# else
# IMAGE_TAG="latest"
fi

az deployment group create \
--resource-group ${{ env.RESOURCE_GROUP_NAME }} \
--template-file infra/main.bicep \
--parameters \
solutionName=${{ env.SOLUTION_PREFIX }} \
location="${{ env.AZURE_LOCATION }}" \
gptModelDeploymentType="GlobalStandard" \
gptModelName="gpt-4o" \
gptModelVersion="2024-08-06" \
backendContainerImageTag="${IMAGE_TAG}" \
frontendContainerImageTag="${IMAGE_TAG}" \
azureAiServiceLocation='${{ env.AZURE_LOCATION }}' \
gptModelCapacity=150 \
createdBy="Pipeline" \
--output json

- name: Extract Web App and API App URLs
id: get_output
run: |
WEBAPP_NAMES=$(az webapp list --resource-group ${{ env.RESOURCE_GROUP_NAME }} --query "[].name" -o tsv)
for NAME in $WEBAPP_NAMES; do
if [[ $NAME == app-* ]]; then
WEBAPP_URL="https://${NAME}.azurewebsites.net"
echo "WEBAPP_URL=$WEBAPP_URL" >> $GITHUB_OUTPUT
fi
done

- name: Get Container App Backend URL
id: get_backend_url
run: |
CONTAINER_APP_NAME=$(az containerapp list \
--resource-group ${{ env.RESOURCE_GROUP_NAME }} \
--query "[0].name" -o tsv)

MACAE_URL_API=$(az containerapp show \
--name "$CONTAINER_APP_NAME" \
--resource-group ${{ env.RESOURCE_GROUP_NAME }} \
--query "properties.configuration.ingress.fqdn" -o tsv)

echo "MACAE_URL_API=https://${MACAE_URL_API}" >> $GITHUB_OUTPUT
echo "CONTAINER_APP=${CONTAINER_APP_NAME}" >> $GITHUB_OUTPUT

- name: Set Deployment Status
id: deployment_status
if: always()
run: |
if [ "${{ job.status }}" == "success" ]; then
echo "SUCCESS=true" >> $GITHUB_OUTPUT
else
echo "SUCCESS=false" >> $GITHUB_OUTPUT
fi

e2e-test:
needs: deploy
if: needs.deploy.outputs.DEPLOYMENT_SUCCESS == 'true'
uses: ./.github/workflows/test-automation.yml
with:
MACAE_WEB_URL: ${{ needs.deploy.outputs.WEBAPP_URL }}
MACAE_URL_API: ${{ needs.deploy.outputs.MACAE_URL_API }}
MACAE_RG: ${{ needs.deploy.outputs.RESOURCE_GROUP_NAME }}
MACAE_CONTAINER_APP: ${{ needs.deploy.outputs.CONTAINER_APP }}
secrets: inherit

cleanup-deployment:
if: always() && needs.deploy.outputs.RESOURCE_GROUP_NAME != ''
needs: [deploy, e2e-test]
runs-on: ubuntu-latest
env:
RESOURCE_GROUP_NAME: ${{ needs.deploy.outputs.RESOURCE_GROUP_NAME }}
steps:
- name: Setup Azure CLI
run: |
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
az --version
- name: Login to Azure
run: |
az login --service-principal -u ${{ secrets.AZURE_CLIENT_ID }} -p ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}
az account set --subscription "${{ secrets.AZURE_SUBSCRIPTION_ID }}"

- name: Extract AI Services and Key Vault Names
if: always()
run: |
echo "Fetching AI Services and Key Vault names before deletion..."

# Get Key Vault name
KEYVAULT_NAME=$(az resource list --resource-group "${{ env.RESOURCE_GROUP_NAME }}" --resource-type "Microsoft.KeyVault/vaults" --query "[].name" -o tsv)
echo "Detected Key Vault: $KEYVAULT_NAME"
echo "KEYVAULT_NAME=$KEYVAULT_NAME" >> $GITHUB_ENV
# Extract AI Services names
echo "Fetching AI Services..."
AI_SERVICES=$(az resource list --resource-group '${{ env.RESOURCE_GROUP_NAME }}' --resource-type "Microsoft.CognitiveServices/accounts" --query "[].name" -o tsv)
# Flatten newline-separated values to space-separated
AI_SERVICES=$(echo "$AI_SERVICES" | paste -sd ' ' -)
echo "Detected AI Services: $AI_SERVICES"
echo "AI_SERVICES=$AI_SERVICES" >> $GITHUB_ENV

- name: Get OpenAI Resource from Resource Group
id: get_openai_resource
run: |

set -e
echo "Fetching OpenAI resource from resource group ${{ env.RESOURCE_GROUP_NAME }}..."

# Run the az resource list command to get the OpenAI resource name
openai_resource_name=$(az resource list --resource-group ${{ env.RESOURCE_GROUP_NAME }} --resource-type "Microsoft.CognitiveServices/accounts" --query "[0].name" -o tsv)

if [ -z "$openai_resource_name" ]; then
echo "No OpenAI resource found in resource group ${{ env.RESOURCE_GROUP_NAME }}."
exit 0
else
echo "OPENAI_RESOURCE_NAME=${openai_resource_name}" >> $GITHUB_ENV
echo "OpenAI resource name: ${openai_resource_name}"
fi

- name: Delete Bicep Deployment
if: always()
run: |
set -e
echo "Checking if resource group exists..."
rg_exists=$(az group exists --name ${{ env.RESOURCE_GROUP_NAME }})
if [ "$rg_exists" = "true" ]; then
echo "Resource group exist. Cleaning..."
az group delete \
--name ${{ env.RESOURCE_GROUP_NAME }} \
--yes \
--no-wait
echo "Resource group deleted... ${{ env.RESOURCE_GROUP_NAME }}"
else
echo "Resource group does not exists."
fi

- name: Wait for resource deletion to complete
run: |

# Add resources to the array
resources_to_check=("${{ env.OPENAI_RESOURCE_NAME }}")

echo "List of resources to check: ${resources_to_check[@]}"

# Maximum number of retries
max_retries=3

# Retry intervals in seconds (30, 60, 120)
retry_intervals=(30 60 120)

# Retry mechanism to check resources
retries=0
while true; do
resource_found=false

# Get the list of resources in YAML format again on each retry
resource_list=$(az resource list --resource-group ${{ env.RESOURCE_GROUP_NAME }} --output yaml)

# Iterate through the resources to check
for resource in "${resources_to_check[@]}"; do
echo "Checking resource: $resource"
if echo "$resource_list" | grep -q "name: $resource"; then
echo "Resource '$resource' exists in the resource group."
resource_found=true
else
echo "Resource '$resource' does not exist in the resource group."
fi
done

# If any resource exists, retry
if [ "$resource_found" = true ]; then
retries=$((retries + 1))
if [ "$retries" -gt "$max_retries" ]; then
echo "Maximum retry attempts reached. Exiting."
break
else
# Wait for the appropriate interval for the current retry
echo "Waiting for ${retry_intervals[$retries-1]} seconds before retrying..."
sleep ${retry_intervals[$retries-1]}
fi
else
echo "No resources found. Exiting."
break
fi
done

- name: Purging the Resources
if: always()
run: |

set -e
echo "Azure OpenAI: ${{ env.OPENAI_RESOURCE_NAME }}"

# Purge OpenAI Resource
echo "Purging the OpenAI Resource..."
if ! az resource delete --ids /subscriptions/${{ secrets.AZURE_SUBSCRIPTION_ID }}/providers/Microsoft.CognitiveServices/locations/eastus/resourceGroups/${{ env.RESOURCE_GROUP_NAME }}/deletedAccounts/${{ env.OPENAI_RESOURCE_NAME }} --verbose; then
echo "Failed to purge openai resource: ${{ env.OPENAI_RESOURCE_NAME }}"
else
echo "Purged the openai resource: ${{ env.OPENAI_RESOURCE_NAME }}"
fi

echo "Resource purging completed successfully"

- name: Send Notification on Failure
if: failure()
run: |
RUN_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"

# Construct the email body
EMAIL_BODY=$(cat <<EOF
{
"body": "<p>Dear Team,</p><p>We would like to inform you that the Multi-Agent-Custom-Automation-Engine-Solution-Accelerator Automation process has encountered an issue and has failed to complete successfully.</p><p><strong>Build URL:</strong> ${RUN_URL}<br> ${OUTPUT}</p><p>Please investigate the matter at your earliest convenience.</p><p>Best regards,<br>Your Automation Team</p>"
}
EOF
)

# Send the notification
curl -X POST "${{ secrets.LOGIC_APP_URL }}" \
-H "Content-Type: application/json" \
-d "$EMAIL_BODY" || echo "Failed to send notification"
- name: Logout from Azure
if: always()
run: |
az logout
echo "Logged out from Azure."
Loading
Loading