fix: cherry-pick fix back to dev

.config/samples-config-v3.json

@@ -912,55 +912,8 @@
             ],
             "time": "5 mins to run",
             "configuration": "Manual configurations required",
-            "thumbnailPath": "assets/coffee-agent-thumbnail.png",
-            "gifPath": "assets/coffee-agent-thumbnail.png",
-            "suggested": false
-        },
-        {
-            "id": "collaborator-agent",
-            "shortId": "collaborator-agent",
-            "onboardDate": "2025-10-31",
-            "title": "Collaborator Agent",
-            "shortDescription": "Collaboration agent with advanced conversation analysis and task management capabilities.",
-            "fullDescription": "This sample is built with the Microsoft Teams SDK, and showcases how to create an intelligent collaboration assistant that can analyze conversations, manage action items, and search through chat history using natural language processing and time-based queries.",
-            "types": [
-                "Custom Engine Agent"
-            ],
-            "tags": [
-                "TS",
-                "Custom Engine Agent",
-                "Conversation Analysis",
-                "Task Management",
-                "Microsoft Teams SDK"
-            ],
-            "time": "10 mins to run",
-            "configuration": "Manual configurations required",
-            "thumbnailPath": "assets/collaborator-agent-thumbnail.png",
-            "gifPath": "assets/collaborator-agent-thumbnail.png",
-            "suggested": false
-        },
-        {
-            "id": "data-analyst-agent-v2",
-            "shortId": "data-analyst-v2",
-            "onboardDate": "2025-10-31",
-            "title": "Data Analyst Agent v2",
-            "shortDescription": "Natural language interface for data exploration and visualization.",
-            "fullDescription": "This sample demonstrates how to build an AI-powered data analyst agent using Microsoft Teams SDK that can be integrated into Microsoft Teams. It helps users explore and visualize data through natural language conversations and Adaptive Cards charts.",
-            "types": [
-                "Custom Engine Agent"
-            ],
-            "tags": [
-                "TS",
-                "Custom Engine Agent",
-                "Data Visualization",
-                "Adaptive Cards",
-                "LLM SQL",
-                "Microsoft Teams SDK"
-            ],
-            "time": "10 mins to run",
-            "configuration": "Manual configurations required",
-            "thumbnailPath": "assets/demo.gif",
-            "gifPath": "assets/demo.gif",
+            "thumbnailPath": "assets/coffee-agent-sample-response.png",
+            "gifPath": "assets/coffee-agent-sample-response.png",
             "suggested": false
         }
     ]

coffee-agent/.gitignore

@@ -3,4 +3,5 @@ node_modules/
 .env
 appPackage/build
 .localConfigs
-.localConfigs.playground
+.localConfigs.playground
+dist

coffee-agent/.webappignore

@@ -0,0 +1,28 @@
+.webappignore
+.fx
+.deployment
+.localConfigs.playground
+.localConfigs
+.notification.localstore.json
+.notification.playgroundstore.json
+.vscode
+*.js.map
+*.ts.map
+*.ts
+.git*
+.tsbuildinfo
+CHANGELOG.md
+readme.md
+local.settings.json
+test
+tsconfig.json
+.DS_Store
+m365agents.yml
+m365agents.*.yml
+/env/
+/node_modules/.bin
+/node_modules/ts-node
+/node_modules/typescript
+/appPackage/
+/infra/
+/devTools/

coffee-agent/README.md

@@ -4,7 +4,7 @@ Originally from our Build 2025 Lab, this sample is built with the [Microsoft Tea
 
 This Coffee Agent helps teams coordinate their daily coffee orders by randomly selecting coffee shops and orderers, managing team coffee orders, and maintaining information about available coffee shops and their offerings. It's perfect for teams that want to streamline their coffee coordination process while having fun with their daily caffeine routine.
 
-![Coffee Agent Demo](assets/coffee-agent-thumbnail.png)
+![Coffee Agent Demo](assets/coffee-agent-sample-response.png)
 
 ## This sample illustrates
 - Use Microsoft 365 Agents Toolkit to create an AI-powered Teams bot

coffee-agent/infra/azure.bicep

@@ -61,13 +61,17 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
           value: '1'
         }
         {
-          name: 'clientId'
+          name: 'CLIENT_ID'
           value: identity.properties.clientId
         }
         {
-          name: 'tenantId'
+          name: 'TENANT_ID'
           value: identity.properties.tenantId
         }
+        { 
+          name: 'BOT_TYPE' 
+          value: 'UserAssignedMsi'
+        }
         {
           name: 'AZURE_OPENAI_API_KEY'
           value: azureOpenAIKey