chore: sync fork with upstream microsoft/main - #2
Merged
Conversation
…erification checklists - Add RE-INVOCATION CHECK to prevent redundant blueprint calls on resume - Add explicit VERIFICATION CHECKLIST matching blueprint items exactly - Separate BLUEPRINT STEP, QUESTION RULE, and EXECUTION phases - Apply to both HRHelperAgent and TechnicalSupportAgent
Upstream PR #5690 (agent-framework 1.4.0) only fixes the fc_ duplicate variant, not the orphaned function_call_output variant that triggers 'Progress ledger creation failed' in multi-agent Magentic workflows.
…om AppConfig - AGENT_TEAM_FILE was never referenced anywhere in the codebase - REASONING_MODEL_NAME duplicated ORCHESTRATOR_MODEL_NAME (already present)
- azure_config.py: superseded by direct model construction in orchestration_manager - orchestration/patches.py: superseded by patches/tool_history_leak.py - Neither module is imported anywhere in the codebase
- agent-framework==1.6.0 (GA umbrella) - agent-framework-foundry==1.6.0 (Foundry integration) - All existing imports validated — no breaking changes
…0 upgrade - Fix agent_template.py: OpenAIChatOptions, cast(PromptAgentDefinition), typed dicts, update.text - Fix orchestration_manager.py: Optional typing, asyncio.iscoroutine, assert narrowing - Fix frontend tsconfig.json: add ignoreDeprecations for TS 6.0 - Fix mcp_server lint: factory.py, mcp_server.py, README formatting - Add pyrightconfig.json (root + mcp_server) for import resolution - Add/update pylintrc configs to suppress no-name-in-module, import-error - Fix test_response_handlers.py: type: ignore for Mock .called access - Collapse duplicate pylint sections in root pyproject.toml
…mework 1.6.0 - Flatten agent_teams JSON to use tool-based config (remove legacy fields) - Simplify agent_factory.py and agent_template.py for new framework API - Remove pyrightconfig.json files (consolidated in pyproject.toml) - Update tests to match simplified agent creation flow - Add e2e-test pyproject.toml - Minor lint and type fixes across mcp_server and frontend models
…cess
The MCP image tool was returning direct blob URLs that are inaccessible
from the browser (private container, SAS generation often fails locally).
- Add backend_url config to MCP server settings
- Update image_service to return backend proxy URL when BACKEND_URL is set
- Add BACKEND_URL env var to MCP container in Bicep for deployed scenario
The backend already has a /api/v4/images/{blob_name} proxy endpoint that
fetches from blob storage using its own credential.
…s, upgrade Dockerfiles - Remove dead Key Vault resource and all references (secret, RBAC, DNS zone) - Fix circular dependency: BACKEND_URL uses constructed FQDN pattern - Fix AZURE_OPENAI_IMAGE_DEPLOYMENT: use deployment variable not hardcoded string - Add 'generated-images' blob container to storage account - Build SUPPORTED_MODELS dynamically from deployed model names - Add Cognitive Services OpenAI Contributor role for image generation - Add gpt5Mini and gptImage params to main.parameters.json - Add AZURE_OPENAI_IMAGE_DEPLOYMENT to backend container env - Upgrade all Dockerfiles from EOL Bullseye to Bookworm - Replace MCP devcontainer base with slim production image - Remove dead AZURE_AI_SEARCH_API_KEY from app_config.py - Disable MCP auth by default (runs behind backend Easy Auth) - Integrate seed_knowledge_bases.py into post-deploy scripts (PS1 + bash)
- azure.yaml now uses main.bicep (pre-built images from public registry) - azure_custom.yaml explicitly uses main_custom.bicep (build from source) - Port to main_custom.bicep: - Add Cognitive Services OpenAI Contributor role for image generation - Build SUPPORTED_MODELS dynamically from deployed model names - Add AZURE_OPENAI_IMAGE_DEPLOYMENT to backend container env - Add 'generated-images' blob container to storage account
- Suppress no-hardcoded-env-urls on private link DNS zones - Replace hardcoded login.microsoftonline.com with environment().authentication.loginEndpoint - Remove unused storageContainerName param - Remove unused aiSearchIndexName variable (main_custom) - Remove unnecessary dependsOn on aiFoundryAiServices - Add non-null assertion on guarded conditional module access - Suppress BCP318 on unconditional userAssignedIdentity access - Suppress no-unused-params on azd-injected container image params (main_custom) - Suppress BCP334 theoretical length warning on container registry name (main_custom)
- Change gptImageModelName from gpt-image-1 to gpt-image-1.5 - Update gptImageModelVersion from 2025-04-15 to 2025-12-16 - Increase gptImageModelCapacity from 1 to 5 RPM (matches main_custom.bicep)
- Add infra/scripts/post_deploy.ps1: interactive use-case menu that seeds Cosmos DB teams, uploads blobs, creates search indexes, vector stores, and Foundry IQ knowledge bases directly (no backend required) - Move seed_vector_stores.py and seed_knowledge_bases.py into infra/scripts/ - Remove top-level scripts/ directory (seed_teams.py superseded) - Update azure.yaml postdeploy hook to invoke post_deploy.ps1 - Update requirements.txt with azure-cosmos, aiohttp, httpx deps - Fix .gitignore: scope scripts/ rule to top-level only, remove obsolete entry - Update agent_template.py error message to reflect new script path
- Make APPLICATIONINSIGHTS_CONNECTION_STRING optional in app_config.py - Fix frontend PlanDataService.tsx TeamAgentBE to Agent mapping - Remove invalid ignoreDeprecations from tsconfig.json (TS 5.8+)
…s dep - Add azure-ai-projects to requirements.txt (fixes vector store ModuleNotFoundError) - Track step failures with $script:hasErrors flag - Exit with code 1 and report errors when any step fails - Change WARNING to ERROR with red output for failed steps - Only print 'ready to use' when all steps succeed
- Detect when toolbox stores outdated project_connection_id for KB tools - Auto-update toolbox and patch MCPTool at runtime with correct connection - Add search_connection_name lookup support in mcp_config
- Change AI Search Foundry connection from ApiKey to AAD with managed identity - Add Search Service Contributor role for user-assigned MI - Add Cognitive Services OpenAI User role for Search system MI on AI Services - Add post-deploy step to seed KB MCP RemoteTool connections
…mpts Domain agents now call request_user_clarification tool directly. The framework pauses via function_approval_request events and resumes when the user answers — no intermediary agent routing needed. - Rewrite clarification_policy to describe tool-based pause/resume - Remove QUESTION RELAY RULE and relay-based RE-INVOCATION RULE - Add explicit 'do NOT select UserInteractionAgent' warnings - Update stale comment in agent_factory.py
…tent gen use case - Replace Azure OpenAI references with Microsoft Foundry Service - Add Azure AI Search as a separate pricing line item - Add Content Generation scenario to use cases table - Update architecture and agent flow diagrams
fix: updated the post deployment script for selected scenario run and WAF and EXP alignment
…osix fix: Add posix in pre-deployment hook in azure.yaml
…-resolve fix: updated the branch to resolve the conflict
chore: Conflicts resolve
…al-deployment-macae fix: remove local deployment related files
…l-changes fix: resolve the destructive action bug
fix: updated the testcases and resolve the conflict
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 5d45e267-6090-4be3-9a18-eaafa983b38c
docs: removed broken link
fix: Code quality comments
refactor: remove unused imports in test files for improved code quality
fix: updated the documents and resolve the code quality issue
feat: Modularity Enhancement and New use case for Content Generation
cxzyr9hm2t-del
temporarily deployed
to
production
July 26, 2026 21:00 — with
GitHub Actions
Inactive
This was referenced Jul 26, 2026
cxzyr9hm2t-del
marked this pull request as ready for review
July 28, 2026 04:58
cxzyr9hm2t-del
temporarily deployed
to
production
July 28, 2026 04:58 — with
GitHub Actions
Inactive
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose
microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator@main.mainwas pinned at452419c(merge ofpsl-mainChanges, 2026-07-07) and had drifted 1359 commits behind upstream, with 0 commits ahead — so this is a clean fast-forward, not a merge.claude/full-sync-status-mv873vnow points at upstream9937162(merge of PR feat: Modularity Enhancement and New use case for Content Generation microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator#1068microsoft/dev, 2026-07-23) and is byte-identical to it.Notable content carried in by the sync:
src/tests/backend/v4/...intosrc/tests/backend/{services,tools}/..., with newtest_mcp_service.py,test_plan_service.py,test_team_service.py, andtest_clarification_tool.py.src/tests/mcp_server/test_image_service.pyandtests/e2e-test/pyproject.toml.devmerge.Does this introduce a breaking change?
Not a breaking change to any code written in this fork, but it is a large upstream jump: test paths moved, backend service modules were restructured, and infra/Bicep templates changed. Anything pinned to the old
src/tests/backend/v4/layout will need updating.How to Test
What to Check
Verify that the following are valid
git rev-list --left-right --count <upstream/main>...HEADreports0 0— the branch matches upstream exactly with no fork-local drift.src/tests/backend/services/andsrc/tests/backend/tools/paths, and no stalev4/test paths remain referenced by CI..github/workflows/still resolve to existing paths after the test-tree move.Other Information
claude/claude-md-docs-fbnno8, addsCLAUDE.md) branches from the old452419cbase and is unaffected by this PR, but will need a rebase onto the syncedmainbefore it merges cleanly.Generated by Claude Code