diff --git a/packages/cli/src/commands/new/templatehook.ts b/packages/cli/src/commands/new/templatehook.ts
new file mode 100644
index 000000000..777f72032
--- /dev/null
+++ b/packages/cli/src/commands/new/templatehook.ts
@@ -0,0 +1,27 @@
+import { z } from 'zod';
+
+import { ProjectBuilder } from '../../project';
+
+type TemplateHook = (builder: ProjectBuilder) => Promise<void>;
+
+export const templateHooks: Record<string, TemplateHook> = {
+    'mcpagent': async (builder) => {
+        const readline = await import('node:readline/promises');
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+
+        const serverName = await rl.question('Enter MCP server name: ');
+        const mcpUrl = await rl.question('Enter MCP server URL: ');
+        rl.close();
+
+        // Validate the MCP URL
+        const result = z.string().url().safeParse(mcpUrl);
+        if (!result.success) {
+            console.error('❌ Invalid MCP URL.');
+            process.exit(1);
+        }
+
+        // Add env variables
+        builder.addEnv('SERVER_NAME', serverName);
+        builder.addEnv('MCP_URL', mcpUrl);
+    }
+};
diff --git a/packages/cli/src/commands/new/typescript.ts b/packages/cli/src/commands/new/typescript.ts
index f9955a048..2fd823645 100644
--- a/packages/cli/src/commands/new/typescript.ts
+++ b/packages/cli/src/commands/new/typescript.ts
@@ -12,6 +12,8 @@ import { IContext } from '../../context';
 import { Project } from '../../project';
 import { Settings } from '../../settings';
 
+import { templateHooks } from './templatehook';
+
 const ArgsSchema = z.object({
   name: z.string(),
   template: z.string(),
@@ -65,8 +67,8 @@ export function Typescript(_: IContext): CommandModule<{}, z.infer<typeof ArgsSc
           type: 'string',
           describe: 'include M365 Agents Toolkit configuration',
           choices: fs.readdirSync(atkPath)
-          .filter((type) => fs.existsSync(path.join(atkPath, type, 'typescript')))
-          .flat()
+            .filter((type) => fs.existsSync(path.join(atkPath, type, 'typescript')))
+            .flat()
         })
         .option('client-id', {
           type: 'string',
@@ -133,6 +135,11 @@ export function Typescript(_: IContext): CommandModule<{}, z.infer<typeof ArgsSc
         builder.addEnv('AZURE_OPENAI_ENDPOINT', process.env.AZURE_OPENAI_ENDPOINT);
       }
 
+      // Template-specific logic
+      if (templateHooks[template]) {
+        await templateHooks[template](builder);
+      }
+
       const project = builder.build();
       await project.up();
       console.log(
diff --git a/packages/cli/templates/typescript/mcpagent/appPackage/color.png b/packages/cli/templates/typescript/mcpagent/appPackage/color.png
new file mode 100644
index 000000000..4ab158588
--- /dev/null
+++ b/packages/cli/templates/typescript/mcpagent/appPackage/color.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:67c7c063ba4dc41c977080c1f1fa17c897e1c72ec4a6412ed5e681b5d4cb9680
+size 1066
diff --git a/packages/cli/templates/typescript/mcpagent/appPackage/manifest.json.hbs b/packages/cli/templates/typescript/mcpagent/appPackage/manifest.json.hbs
new file mode 100644
index 000000000..af5616e21
--- /dev/null
+++ b/packages/cli/templates/typescript/mcpagent/appPackage/manifest.json.hbs
@@ -0,0 +1,50 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/teams/v1.20/MicrosoftTeams.schema.json",
+  "version": "1.0.0",
+  "manifestVersion": "1.20",
+  "id": "$\{{TEAMS_APP_ID}}",
+  "name": {
+    "short": "{{ toKebabCase name }}-$\{{APP_NAME_SUFFIX}}",
+    "full": "{{ capitalize name }}"
+  },
+  "developer": {
+    "name": "Microsoft",
+    "websiteUrl": "https://microsoft.com",
+    "privacyUrl": "https://privacy.microsoft.com/privacystatement",
+    "termsOfUseUrl": "https://www.microsoft.com/legal/terms-of-use"
+  },
+  "description": {
+    "short": "Agent connected to MCP",
+    "full": "This agent integrates with a single MCP server to respond to messages."
+  },
+  "icons": {
+    "outline": "outline.png",
+    "color": "color.png"
+  },
+  "accentColor": "#FFFFFF",
+  "staticTabs": [
+    {
+      "entityId": "conversations",
+      "scopes": ["personal"]
+    },
+    {
+      "entityId": "about",
+      "scopes": ["personal"]
+    }
+  ],
+  "bots": [
+    {
+      "botId": "$\{{BOT_ID}}",
+      "scopes": ["personal", "team", "groupChat"],
+      "isNotificationOnly": false,
+    }
+  ],
+  "validDomains": [
+    "$\{{BOT_DOMAIN}}",
+    "*.botframework.com"
+  ],
+  "webApplicationInfo": {
+    "id": "$\{{BOT_ID}}",
+    "resource": "api://botid-$\{{BOT_ID}}"
+  }
+}
diff --git a/packages/cli/templates/typescript/mcpagent/appPackage/outline.png b/packages/cli/templates/typescript/mcpagent/appPackage/outline.png
new file mode 100644
index 000000000..458549f6d
--- /dev/null
+++ b/packages/cli/templates/typescript/mcpagent/appPackage/outline.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b1ddc76f79027d9c0300689721649ce1f1950271a5fc4ca50ae56545228fb566
+size 249
diff --git a/packages/cli/templates/typescript/mcpagent/package.json.hbs b/packages/cli/templates/typescript/mcpagent/package.json.hbs
new file mode 100644
index 000000000..4998d2884
--- /dev/null
+++ b/packages/cli/templates/typescript/mcpagent/package.json.hbs
@@ -0,0 +1,45 @@
+{
+  "name": "{{ toKebabCase name }}",
+  "version": "0.0.0",
+  "license": "MIT",
+  "private": true,
+  "main": "dist/index",
+  "types": "dist/index",
+  "files": [
+    "dist",
+    "README.md"
+  ],
+  "scripts": {
+    "clean": "npx rimraf ./dist",
+    "build": "npx tsc",
+    "start": "node .",
+    "dev": "npx nodemon -w \"./src/**\" -e ts --exec \"node -r ts-node/register -r dotenv/config ./src/index.ts\"",
+    "inspect": "npx cross-env SERVER_PORT=9000 npx @modelcontextprotocol/inspector -e NODE_NO_WARNINGS=1 -e PORT=3978 node -r dotenv/config .",
+    "dev:teamsfx": "npx cross-env NODE_OPTIONS='--inspect=9239' npx env-cmd -f .env npm run dev",
+    "dev:teamsfx:testtool": "npx cross-env NODE_OPTIONS='--inspect=9239' npx env-cmd -f .env npm run dev",
+    "dev:teamsfx:launch-testtool": "npx env-cmd --silent -f env/.env.testtool teamsapptester start"
+  },
+  "dependencies": {
+    "@microsoft/teams.api": "preview",
+    "@microsoft/teams.apps": "preview",
+    "@microsoft/teams.cards": "preview",
+    "@microsoft/teams.common": "preview",
+    "@microsoft/teams.dev": "preview",
+    "@microsoft/teams.graph": "preview",
+    "@microsoft/teams.mcp": "preview",
+    "@microsoft/teams.mcpclient": "preview",
+    "@microsoft/teams.openai": "preview",
+    "@modelcontextprotocol/sdk": "^1.7.0"
+  },
+  "devDependencies": {
+    "@modelcontextprotocol/inspector": "^0.6.0",
+    "@types/node": "^22.5.4",
+    "cross-env": "^7.0.3",
+    "dotenv": "^16.4.5",
+    "nodemon": "^3.1.4",
+    "rimraf": "^6.0.1",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.4.5",
+    "env-cmd": "latest"
+  }
+}
diff --git a/packages/cli/templates/typescript/mcpagent/src/index.ts.hbs b/packages/cli/templates/typescript/mcpagent/src/index.ts.hbs
new file mode 100644
index 000000000..3c856c094
--- /dev/null
+++ b/packages/cli/templates/typescript/mcpagent/src/index.ts.hbs
@@ -0,0 +1,42 @@
+import { App } from '@microsoft/teams.apps';
+import { DevtoolsPlugin } from '@microsoft/teams.dev';
+import { ChatPrompt } from '@microsoft/teams.ai';
+import { McpClientPlugin } from '@microsoft/teams.mcpclient';
+import { OpenAIChatModel } from '@microsoft/teams.openai';
+import { ConsoleLogger } from '@microsoft/teams.common/logging';
+
+const logger = new ConsoleLogger('{{ toKebabCase name }}', { level: 'debug' });
+
+const app = new App({
+    plugins: [new DevtoolsPlugin()],
+    logger
+});
+
+const prompt = new ChatPrompt({
+    instructions:
+        `You are an MCP Agent that is tied to the ${process.env.SERVER_NAME} MCP server.
+Your main purpose is to call on tools available from the MCP server.
+For ANY query related to ${process.env.SERVER_NAME}, use the tools to the best of your ability to answer.`,
+    model: new OpenAIChatModel({
+        model: 'gpt-4o',
+        apiKey: process.env.AZURE_OPENAI_API_KEY!,
+        endpoint: process.env.AZURE_OPENAI_ENDPOINT!,
+        apiVersion: '2025-04-01-preview'
+    }),
+    logger,
+}, [new McpClientPlugin({ logger })])
+    .usePlugin('mcpClient', {
+        url: process.env.MCP_URL!,
+    });
+
+app.on('message', async ({ send, activity }) => {
+    await send({ type: 'typing' });
+    const res = await prompt.send(activity.text);
+    console.log(res);
+
+    await send({ type: 'message', text: res.content });
+});
+
+(async () => {
+    await app.start();
+})();
\ No newline at end of file
diff --git a/packages/cli/templates/typescript/mcpagent/tsconfig.json b/packages/cli/templates/typescript/mcpagent/tsconfig.json
new file mode 100644
index 000000000..c4efba63c
--- /dev/null
+++ b/packages/cli/templates/typescript/mcpagent/tsconfig.json
@@ -0,0 +1,26 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "compilerOptions": {
+    "module": "NodeNext",
+    "target": "ESNext",
+    "moduleResolution": "NodeNext",
+    "strict": true,
+    "noImplicitAny": true,
+    "declaration": true,
+    "inlineSourceMap": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": false,
+    "resolveJsonModule": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "pretty": true,
+    "outDir": "dist",
+    "rootDir": "src",
+    "types": ["node"]
+  },
+  "ts-node": {
+    "transpileOnly": true
+  }
+}
diff --git a/packages/cli/templates/typescript/mcpagent/tsup.config.js b/packages/cli/templates/typescript/mcpagent/tsup.config.js
new file mode 100644
index 000000000..32277a72f
--- /dev/null
+++ b/packages/cli/templates/typescript/mcpagent/tsup.config.js
@@ -0,0 +1,13 @@
+/** @type {import('tsup').Options} */
+module.exports = {
+  dts: true,
+  minify: false,
+  bundle: false,
+  sourcemap: true,
+  treeshake: true,
+  splitting: true,
+  clean: true,
+  outDir: 'dist',
+  entry: ['src/index.ts'],
+  format: ['cjs'],
+};