;
export const GitHubSecretsSchema = z.object({
diff --git a/src/lib/toast.tsx b/src/lib/toast.tsx
index d71a30f..757fa3c 100644
--- a/src/lib/toast.tsx
+++ b/src/lib/toast.tsx
@@ -3,6 +3,7 @@ import { PostHog } from "posthog-js";
import React from "react";
import { CustomErrorToast } from "../components/CustomErrorToast";
import { InputRequestToast } from "../components/InputRequestToast";
+import { McpConsentToast } from "../components/McpConsentToast";
/**
* Toast utility functions for consistent notifications across the app
@@ -111,6 +112,29 @@ export const showInputRequest = (
return toastId;
};
+export function showMcpConsentToast(args: {
+ serverName: string;
+ toolName: string;
+ toolDescription?: string | null;
+ inputPreview?: string | null;
+ onDecision: (d: "accept-once" | "accept-always" | "decline") => void;
+}) {
+ const toastId = toast.custom(
+ (t) => (
+
+ ),
+ { duration: Infinity },
+ );
+ return toastId;
+}
+
export const showExtraFilesToast = ({
files,
error,
diff --git a/src/pages/settings.tsx b/src/pages/settings.tsx
index 5303fe4..929166b 100644
--- a/src/pages/settings.tsx
+++ b/src/pages/settings.tsx
@@ -24,6 +24,7 @@ import { AutoUpdateSwitch } from "@/components/AutoUpdateSwitch";
import { ReleaseChannelSelector } from "@/components/ReleaseChannelSelector";
import { NeonIntegration } from "@/components/NeonIntegration";
import { RuntimeModeSelector } from "@/components/RuntimeModeSelector";
+import { ToolsMcpSettings } from "@/components/settings/ToolsMcpSettings";
export default function SettingsPage() {
const [isResetDialogOpen, setIsResetDialogOpen] = useState(false);
@@ -119,6 +120,17 @@ export default function SettingsPage() {
+ {/* Tools (MCP) */}
+
+
+ Tools (MCP)
+
+
+
+
{/* Experiments Section */}
{
- const systemPrompt =
- chatMode === "ask" ? ASK_MODE_SYSTEM_PROMPT : BUILD_SYSTEM_PROMPT;
-
+ const systemPrompt = getSystemPromptForChatMode(chatMode);
return systemPrompt.replace("[[AI_RULES]]", aiRules ?? DEFAULT_AI_RULES);
};
+export const getSystemPromptForChatMode = (
+ chatMode: "build" | "ask" | "agent",
+) => {
+ if (chatMode === "agent") {
+ return AGENT_MODE_SYSTEM_PROMPT;
+ }
+ if (chatMode === "ask") {
+ return ASK_MODE_SYSTEM_PROMPT;
+ }
+ return BUILD_SYSTEM_PROMPT;
+};
+
export const readAiRules = async (dyadAppPath: string) => {
const aiRulesPath = path.join(dyadAppPath, "AI_RULES.md");
try {
diff --git a/src/renderer.tsx b/src/renderer.tsx
index c36f8c1..8fdc38c 100644
--- a/src/renderer.tsx
+++ b/src/renderer.tsx
@@ -11,7 +11,8 @@ import {
QueryClientProvider,
MutationCache,
} from "@tanstack/react-query";
-import { showError } from "./lib/toast";
+import { showError, showMcpConsentToast } from "./lib/toast";
+import { IpcClient } from "./ipc/ipc_client";
// @ts-ignore
console.log("Running in mode:", import.meta.env.MODE);
@@ -109,6 +110,20 @@ function App() {
};
}, []);
+ useEffect(() => {
+ const ipc = IpcClient.getInstance();
+ const unsubscribe = ipc.onMcpToolConsentRequest((payload) => {
+ showMcpConsentToast({
+ serverName: payload.serverName,
+ toolName: payload.toolName,
+ toolDescription: payload.toolDescription,
+ inputPreview: payload.inputPreview,
+ onDecision: (d) => ipc.respondToMcpConsentRequest(payload.requestId, d),
+ });
+ });
+ return () => unsubscribe();
+ }, []);
+
return ;
}
diff --git a/testing/README.md b/testing/README.md
new file mode 100644
index 0000000..6d19def
--- /dev/null
+++ b/testing/README.md
@@ -0,0 +1,50 @@
+### Fake stdio MCP server
+
+This directory contains a minimal stdio MCP server for local testing.
+
+- **Tools**:
+ - **calculator_add**: adds two numbers. Inputs: `a` (number), `b` (number).
+ - **print_envs**: returns all environment variables visible to the server as pretty JSON.
+
+### Requirements
+
+- **Node 20+** (same as the repo engines)
+- Uses the repo dependency `@modelcontextprotocol/sdk` and `zod`
+
+### Launch
+
+- **Via Node**:
+
+ ```bash
+ node testing/fake-stdio-mcp-server.mjs
+ ```
+
+- **Via script** (adds a stable entrypoint path):
+
+ ```bash
+ testing/run-fake-stdio-mcp-server.sh
+ ```
+
+### Passing environment variables
+
+Environment variables provided when launching (either from your shell or by the app) will be visible to the `print_envs` tool.
+
+```bash
+export FOO=bar
+export SECRET_TOKEN=example
+testing/run-fake-stdio-mcp-server.sh
+```
+
+### Integrating with Dyad (stdio MCP)
+
+When adding a stdio MCP server in the app, use:
+
+- **Command**: `testing/run-fake-stdio-mcp-server.sh` (absolute path recommended)
+- **Transport**: `stdio`
+- **Args**: leave empty (not required)
+- **Env**: optional key/values (e.g., `FOO=bar`)
+
+Once connected, you should see the two tools listed:
+
+- `calculator_add`
+- `print_envs`
diff --git a/testing/fake-llm-server/chatCompletionHandler.ts b/testing/fake-llm-server/chatCompletionHandler.ts
index f4bb39d..a943e21 100644
--- a/testing/fake-llm-server/chatCompletionHandler.ts
+++ b/testing/fake-llm-server/chatCompletionHandler.ts
@@ -180,9 +180,46 @@ export default Index;
messageContent = `[[STRING_IS_FINISHED]]";\nFinished writing file.`;
messageContent += "\n\n" + generateDump(req);
}
+ const isToolCall = !!(
+ lastMessage &&
+ lastMessage.content &&
+ lastMessage.content.includes("[call_tool=calculator_add]")
+ );
+ let message = {
+ role: "assistant",
+ content: messageContent,
+ } as any;
// Non-streaming response
if (!stream) {
+ if (isToolCall) {
+ const toolCallId = `call_${Date.now()}`;
+ return res.json({
+ id: `chatcmpl-${Date.now()}`,
+ object: "chat.completion",
+ created: Math.floor(Date.now() / 1000),
+ model: "fake-model",
+ choices: [
+ {
+ index: 0,
+ message: {
+ role: "assistant",
+ tool_calls: [
+ {
+ id: toolCallId,
+ type: "function",
+ function: {
+ name: "calculator_add",
+ arguments: JSON.stringify({ a: 1, b: 2 }),
+ },
+ },
+ ],
+ },
+ finish_reason: "tool_calls",
+ },
+ ],
+ });
+ }
return res.json({
id: `chatcmpl-${Date.now()}`,
object: "chat.completion",
@@ -191,10 +228,7 @@ export default Index;
choices: [
{
index: 0,
- message: {
- role: "assistant",
- content: messageContent,
- },
+ message,
finish_reason: "stop",
},
],
@@ -206,9 +240,73 @@ export default Index;
res.setHeader("Cache-Control", "no-cache");
res.setHeader("Connection", "keep-alive");
+ // Tool call streaming (OpenAI-style)
+ if (isToolCall) {
+ const now = Date.now();
+ const mkChunk = (delta: any, finish: null | string = null) => {
+ const chunk = {
+ id: `chatcmpl-${now}`,
+ object: "chat.completion.chunk",
+ created: Math.floor(now / 1000),
+ model: "fake-model",
+ choices: [
+ {
+ index: 0,
+ delta,
+ finish_reason: finish,
+ },
+ ],
+ };
+ return `data: ${JSON.stringify(chunk)}\n\n`;
+ };
+
+ // 1) Send role
+ res.write(mkChunk({ role: "assistant" }));
+
+ // 2) Send tool_calls init with id + name + empty args
+ const toolCallId = `call_${now}`;
+ res.write(
+ mkChunk({
+ tool_calls: [
+ {
+ index: 0,
+ id: toolCallId,
+ type: "function",
+ function: {
+ name: "testing-mcp-server__calculator_add",
+ arguments: "",
+ },
+ },
+ ],
+ }),
+ );
+
+ // 3) Stream arguments gradually
+ const args = JSON.stringify({ a: 1, b: 2 });
+ let i = 0;
+ const argBatchSize = 6;
+ const argInterval = setInterval(() => {
+ if (i < args.length) {
+ const part = args.slice(i, i + argBatchSize);
+ i += argBatchSize;
+ res.write(
+ mkChunk({
+ tool_calls: [{ index: 0, function: { arguments: part } }],
+ }),
+ );
+ } else {
+ // 4) Finalize with finish_reason tool_calls and [DONE]
+ res.write(mkChunk({}, "tool_calls"));
+ res.write("data: [DONE]\n\n");
+ clearInterval(argInterval);
+ res.end();
+ }
+ }, 10);
+ return;
+ }
+
// Split the message into characters to simulate streaming
- const message = messageContent;
- const messageChars = message.split("");
+ const messageChars = messageContent.split("");
// Stream each character with a delay
let index = 0;
diff --git a/testing/fake-stdio-mcp-server.mjs b/testing/fake-stdio-mcp-server.mjs
new file mode 100644
index 0000000..f1262f2
--- /dev/null
+++ b/testing/fake-stdio-mcp-server.mjs
@@ -0,0 +1,44 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { z } from "zod";
+
+const server = new McpServer({
+ name: "fake-stdio-mcp",
+ version: "0.1.0",
+});
+
+server.registerTool(
+ "calculator_add",
+ {
+ title: "Calculator Add",
+ description: "Add two numbers and return the sum",
+ inputSchema: { a: z.number(), b: z.number() },
+ },
+ async ({ a, b }) => {
+ const sum = a + b;
+ return {
+ content: [{ type: "text", text: String(sum) }],
+ };
+ },
+);
+
+server.registerTool(
+ "print_envs",
+ {
+ title: "Print Envs",
+ description: "Print the environment variables received by the server",
+ inputSchema: {},
+ },
+ async () => {
+ const envObject = Object.fromEntries(
+ Object.entries(process.env).map(([key, value]) => [key, value ?? ""]),
+ );
+ const pretty = JSON.stringify(envObject, null, 2);
+ return {
+ content: [{ type: "text", text: pretty }],
+ };
+ },
+);
+
+const transport = new StdioServerTransport();
+await server.connect(transport);
diff --git a/testing/run-fake-stdio-mcp-server.sh b/testing/run-fake-stdio-mcp-server.sh
new file mode 100755
index 0000000..609030d
--- /dev/null
+++ b/testing/run-fake-stdio-mcp-server.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Launch the fake stdio MCP server with Node.
+# Usage: testing/run-fake-stdio-mcp-server.sh
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+NODE_BIN="node"
+
+exec "$NODE_BIN" "$SCRIPT_DIR/fake-stdio-mcp-server.mjs"
+
+