Skip to content

Commit dd3d046

Browse files
committed
Merge branch 'macae-v3-dev-v2-vip' into macae-v3-fr-dev-92
2 parents 24ddc64 + 8c61f34 commit dd3d046

File tree

14 files changed

+893
-1486
lines changed

14 files changed

+893
-1486
lines changed

src/backend/v3/magentic_agents/common/lifecycle.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from typing import Any
55

66
from azure.ai.projects.aio import AIProjectClient
7-
from azure.identity import InteractiveBrowserCredential
87
from azure.identity.aio import DefaultAzureCredential
98
from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent
109
from semantic_kernel.connectors.mcp import MCPStreamableHttpPlugin
@@ -35,7 +34,7 @@ async def close(self) -> None:
3534
if self._stack is None:
3635
return
3736
try:
38-
self.cred.close()
37+
#self.cred.close()
3938
await self._stack.aclose()
4039
finally:
4140
self._stack = None

src/backend/v3/orchestration/human_approval_manager.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,9 @@ def plan_to_obj(self, magentic_context, ledger) -> MPlan:
190190
line = line.replace('*', '').strip()
191191
break
192192

193+
if not found_agent:
194+
# If no agent found, assign to ProxyAgent if available
195+
found_agent = "MagenticAgent"
193196
# If line indicates a following list of actions (e.g. "Assign **EnhancedResearchAgent**
194197
# to gather authoritative data on:") save and prefix to the steps
195198
if line.endswith(':'):

src/frontend/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# dependencies
44
/node_modules
5+
/package-lock.json
56
/.pnp
67
.pnp.js
78

0 commit comments

Comments
 (0)