@myrialabs/clopen 0.1.2 → 0.1.4

package/README.md

@@ -1,6 +1,4 @@
-# 🎯 Clopen
-
-> All-in-one web workspace for Claude Code & OpenCode
+# Clopen
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 [![Built with Bun](https://img.shields.io/badge/Built%20with-Bun-black)](https://bun.sh)
@@ -9,27 +7,28 @@
 
 ---
 
-## ✨ Features
-
-- 👤 **Multi-Account Claude Code** - Manage multiple accounts (personal, work, team) and switch instantly per session, isolated under `~/.clopen/claude/user/` without touching system-level Claude config
-- 🔀 **Multi-Engine Support** - Switch between Claude Code and OpenCode
-- 💬 **AI Chat Interface** - Streaming responses with tool use visualization
-- 🔄 **Background Processing** - Chat, terminal, and other processes continue running even when you close the browser — come back later and pick up where you left off
-- 🌿 **Git-like Checkpoints** - Multi-branch undo/redo system with file and folder snapshots
-- 🌐 **Real Browser Preview** - Puppeteer-based Chromium rendering with WebCodecs streaming (80-90% bandwidth reduction), full click/type/scroll/drag interaction
-- 💻 **Integrated Terminal** - Multi-tab terminal with full PTY control
-- 📁 **File Management** - Directory browsing, live editing, and real-time file watching
-- 🗂️ **Git Management** - Full source control: staging, commits, branches, push/pull, stash, log, conflict resolution
-- 👥 **Real-time Collaboration** - Multiple users can work on the same project simultaneously
-- 🚇 **Built-in Cloudflare Tunnel** - Expose local projects publicly for testing and sharing
+## Features
+
+- **Multi-Account Claude Code** - Manage multiple accounts (personal, work, team) and switch instantly per session, isolated under `~/.clopen/claude/user/` without touching system-level Claude config
+- **Multi-Engine Support** - Switch between Claude Code and OpenCode
+- **AI Chat Interface** - Streaming responses with tool use visualization
+- **Background Processing** - Chat, terminal, and other processes continue running even when you close the browser — come back later and pick up where you left off
+- **Git-like Checkpoints** - Multi-branch undo/redo system with file and folder snapshots
+- **Real Browser Preview** - Puppeteer-based Chromium rendering with WebCodecs streaming (80-90% bandwidth reduction), full click/type/scroll/drag interaction
+- **Integrated Terminal** - Multi-tab terminal with full PTY control
+- **File Management** - Directory browsing, live editing, and real-time file watching
+- **Git Management** - Full source control: staging, commits, branches, push/pull, stash, log, conflict resolution
+- **Real-time Collaboration** - Multiple users can work on the same project simultaneously
+- **Built-in Cloudflare Tunnel** - Expose local projects publicly for testing and sharing
+
 ---
 
-## 🚀 Quick Start
+## Quick Start
 
 ### Prerequisites
 
-- [Bun](https://bun.sh/) v1.2.12 or higher
-- [Claude Code](https://github.com/anthropics/claude-code) and/or [OpenCode](https://opencode.ai) — required for AI chat functionality
+- [Bun](https://bun.sh/) v1.2.12+
+- [Claude Code](https://github.com/anthropics/claude-code) and/or [OpenCode](https://github.com/anomalyco/opencode) — required for AI chat functionality
 
 ### Installation
 
@@ -37,25 +36,25 @@
 bun add -g @myrialabs/clopen
 ```
 
-This installs dependencies, builds the frontend, and makes the `clopen` command available globally.
-
-### Usage
+### Update
 
 ```bash
-clopen
+bun add -g @myrialabs/clopen
 ```
 
-On first run, Clopen creates `.env` from `.env.example`, verifies the build, and starts the server on `http://localhost:9141`.
+Same command as installation — Bun will update to the latest version.
+
+### Usage
 
-**Configuration** — edit `.env` to customize:
 ```bash
-PORT=9141              # Server port
-NODE_ENV=production    # Environment mode
+clopen
 ```
 
+Starts the server on `http://localhost:9141`.
+
 ---
 
-## 🛠️ Development
+## Development
 
 ```bash
 git clone https://github.com/myrialabs/clopen.git
@@ -67,7 +66,7 @@ bun run check   # Type checking
 
 ---
 
-## 📚 Architecture
+## Architecture
 
 | Layer | Technology |
 |-------|-----------|
@@ -79,58 +78,22 @@ bun run check   # Type checking
 | Terminal | bun-pty |
 | AI Engines | Claude Code + OpenCode |
 
-### Engine Architecture
-
-Clopen uses an engine-agnostic adapter pattern — the frontend and stream manager are not tied to any specific AI tool:
-
-```
-┌─────────────────────────────────────────┐
-│              Stream Manager             │
-└──────────────┬──────────────────────────┘
-               │
-       ┌───────┴───────┐
-       ▼               ▼
- ClaudeCodeEngine  OpenCodeEngine
-```
-
-Both engines normalize output to Claude SDK message format, ensuring a consistent experience regardless of which engine is selected.
+Clopen uses an engine-agnostic adapter pattern — both engines normalize output to Claude SDK message format, ensuring a consistent experience regardless of which engine is selected.
 
 ---
 
-## 🛣️ Planned Features
-
-- [ ] **Configurable MCP Servers** - Add, remove, enable, and disable Model Context Protocol servers through the UI
-- [ ] **Built-in Database Management** - Adminer/TablePlus-like interface
-- [ ] **Additional Preview Platforms** - Android, iOS, and Desktop app preview
-- [ ] **Enhanced Collaboration** - User authentication and permissions
-- [ ] **Plugin System** - Extensible architecture for community plugins
-
----
-
-## 📖 Documentation
+## Documentation
 
 - [Technical Decisions](DECISIONS.md) - Architectural and technical decision log
+- [Contributing](CONTRIBUTING.md) - How to contribute to this project
 - [Development Guidelines](CLAUDE.md) - Guidelines for working with Claude Code on this project
 
 ---
 
-## 🤝 Contributing
-
-1. Fork the repository
-2. Create a feature branch (`git checkout -b feature/amazing-feature`)
-3. Make your changes
-4. Run `bun run check` to ensure code quality
-5. Commit your changes (`git commit -m 'Add amazing feature'`)
-6. Push to the branch (`git push origin feature/amazing-feature`)
-7. Open a Pull Request
-
----
-
-## 🐛 Troubleshooting
+## Troubleshooting
 
 ### Port 9141 Already in Use
 
-Use a different port:
 ```bash
 clopen --port 9150
 ```
@@ -145,65 +108,35 @@ netstat -ano | findstr :9141
 taskkill /PID <PID> /F
 ```
 
-### Claude Code Not Found
-
-```bash
-# macOS / Linux / WSL
-curl -fsSL https://claude.ai/install.sh | bash
-
-# Windows PowerShell
-irm https://claude.ai/install.ps1 | iex
-
-# Verify
-claude --version
-```
-
-For complete installation instructions, visit the [official setup guide](https://code.claude.com/docs/en/quickstart).
-
-### OpenCode Not Found
-
-```bash
-# macOS / Linux / WSL
-curl -fsSL https://opencode.ai/install | bash
-
-# Bun
-bun add -g opencode-ai
-
-# Verify
-opencode --version
-```
-
-For complete installation instructions, visit the [official documentation](https://opencode.ai/docs).
-
-### Browser Preview Issues
-
-Browser sessions are automatically managed via Puppeteer's APIs and cleaned up when the preview is closed, the application exits, or the session times out.
-
 ---
 
-## 📄 License
+## License
 
 MIT License - see [LICENSE](LICENSE) for details.
 
 ---
 
-## 🙏 Acknowledgments
+## Acknowledgments
 
 - [Claude Code](https://github.com/anthropics/claude-code) by Anthropic
-- [OpenCode](https://opencode.ai) by SST
+- [OpenCode](https://opencode.ai) by Anomaly
 - [Bun](https://bun.sh/) runtime
 - [Svelte](https://svelte.dev/) framework
 
 ---
 
-## 🔗 Links
+## Support
+
+If Clopen is useful to you, consider supporting its development:
 
-- **Repository:** [github.com/myrialabs/clopen](https://github.com/myrialabs/clopen)
-- **Organization:** [MyriaLabs](https://github.com/myrialabs)
-- **Issues:** [Report a bug or request a feature](https://github.com/myrialabs/clopen/issues)
+| Method | Address / Link |
+|--------|----------------|
+| Bitcoin (BTC) | `bc1qd9fyx4r84cce2a9hkjksetah802knadw5msls3` |
+| Solana (SOL) | `Ev3P4KLF1PNC5C9rZYP8M3DdssyBQAQAiNJkvNmPQPVs` |
+| Ethereum (ERC-20) | `0x61D826e5b666AA5345302EEEd485Acca39b1AFCF` |
+| USDT (TRC-20) | `TLH49i3EoVKhFyLb6u2JUXZWScK7uzksdC` |
+| Saweria | [saweria.co/myrialabs](https://saweria.co/myrialabs) |
 
 ---
 
-<div align="center">
-  <sub>Built with ❤️ by MyriaLabs</sub>
-</div>
+**Repository:** [github.com/myrialabs/clopen](https://github.com/myrialabs/clopen) · **Issues:** [Report a bug or request a feature](https://github.com/myrialabs/clopen/issues)

package/backend/lib/engine/adapters/opencode/message-converter.ts

@@ -127,6 +127,8 @@ const TOOL_NAME_MAP: Record<string, string> = {
 	'todo_write': 'TodoWrite',
 	'todowrite': 'TodoWrite',
 	'todoread': 'TodoWrite',
+	// Agent / sub-agent
+	'task': 'Agent',
 	// User interaction
 	'question': 'AskUserQuestion',
 	// Code intelligence & utilities
@@ -385,6 +387,7 @@ interface AssistantMessageParams {
 	sessionId: string;
 	stopReason: string | null;
 	uuid: string;
+	parentToolUseId?: string | null;
 }
 
 /** Build a single SDKAssistantMessage from content blocks */
@@ -402,7 +405,7 @@ function buildAssistantSDKMessage(params: AssistantMessageParams): SDKMessage {
 			...(params.usage && { usage: params.usage }),
 			context_management: null
 		},
-		parent_tool_use_id: null,
+		parent_tool_use_id: params.parentToolUseId ?? null,
 		session_id: params.sessionId,
 		uuid: params.uuid
 	} as unknown as SDKMessage;
@@ -495,6 +498,20 @@ export function convertAssistantMessages(
 
 			allBlocks.push(block);
 		}
+		else if (part.type === 'subtask') {
+			// Subtask = Agent/sub-agent invocation
+			const subtaskPart = part as any;
+			allBlocks.push({
+				type: 'tool_use',
+				id: subtaskPart.id || crypto.randomUUID(),
+				name: 'Agent',
+				input: {
+					prompt: subtaskPart.prompt || '',
+					description: subtaskPart.description || '',
+					subagent_type: subtaskPart.agent || 'general-purpose',
+				} as NormalizedToolInput,
+			});
+		}
 		// Skip: reasoning, step-start, step-finish, snapshot, patch, agent, retry, compaction
 	}
 
@@ -682,6 +699,7 @@ export function convertToolUseOnly(
 	toolPart: ToolPart,
 	ocMessage: OCMessage,
 	sessionId: string,
+	parentToolUseId: string | null = null,
 ): SDKMessage {
 	const claudeName = mapToolName(toolPart.tool || 'unknown');
 	const resolvedInput = getToolInput(toolPart);
@@ -703,6 +721,7 @@ export function convertToolUseOnly(
 		sessionId,
 		stopReason: 'tool_use',
 		uuid: crypto.randomUUID(),
+		parentToolUseId,
 	});
 }
 
@@ -783,6 +802,37 @@ export function convertReasoningStreamStop(sessionId: string): EngineSDKMessage
 	} as unknown as EngineSDKMessage;
 }
 
+/**
+ * Convert a subtask part → assistant message with Agent tool_use.
+ * Used for progressive rendering when OpenCode emits subtask parts.
+ */
+export function convertSubtaskToolUseOnly(
+	subtaskPart: { id: string; prompt: string; description: string; agent: string },
+	ocMessage: OCMessage,
+	sessionId: string,
+): SDKMessage {
+	const assistantMsg = ocMessage.role === 'assistant' ? ocMessage as AssistantMessage : null;
+	const modelId = assistantMsg ? `${assistantMsg.providerID}/${assistantMsg.modelID}` : '';
+
+	return buildAssistantSDKMessage({
+		content: [{
+			type: 'tool_use',
+			id: subtaskPart.id || crypto.randomUUID(),
+			name: 'Agent',
+			input: {
+				prompt: subtaskPart.prompt || '',
+				description: subtaskPart.description || '',
+				subagent_type: subtaskPart.agent || 'general-purpose',
+			} as NormalizedToolInput,
+		}],
+		ocMessage,
+		modelId,
+		sessionId,
+		stopReason: 'tool_use',
+		uuid: crypto.randomUUID(),
+	});
+}
+
 /**
  * Convert a completed/errored tool part → user message with tool_result.
  * Sent after the tool finishes executing, matching Claude Code's pattern
@@ -791,6 +841,7 @@ export function convertReasoningStreamStop(sessionId: string): EngineSDKMessage
 export function convertToolResultOnly(
 	toolPart: ToolPart,
 	sessionId: string,
+	parentToolUseId: string | null = null,
 ): SDKMessage {
 	const toolUseId = toolPart.callID || toolPart.id || crypto.randomUUID();
 
@@ -807,7 +858,7 @@ export function convertToolResultOnly(
 		type: 'user',
 		uuid: crypto.randomUUID(),
 		session_id: sessionId,
-		parent_tool_use_id: null,
+		parent_tool_use_id: parentToolUseId,
 		message: {
 			role: 'user',
 			content: [{

package/backend/lib/engine/adapters/opencode/stream.ts

@@ -37,6 +37,7 @@ import {
 	convertPartialReasoningDelta,
 	convertReasoningStreamStart,
 	convertReasoningStreamStop,
+	convertSubtaskToolUseOnly,
 	getToolInput,
 } from './message-converter';
 import { ensureClient, getClient } from './server';
@@ -236,6 +237,13 @@ export class OpenCodeEngine implements AIEngine {
 			let reasoningStreamActive = false; // Whether reasoning is currently streaming
 			let reasoningText = ''; // Accumulated reasoning text
 
+			// Child session tracking (for Agent tool sub-messages)
+			const childSessionToAgentTool = new Map<string, string>(); // child sessionID → agent tool callID
+			const childAssistantMessages = new Map<string, OCMessage>(); // child msgID → message
+			const childEmittedToolParts = new Set<string>();
+			const childCompletedToolParts = new Set<string>();
+			let lastAgentToolCallId: string | null = null;
+
 			/**
 			 * Flush active reasoning stream: stop reasoning stream, emit final reasoning message.
 			 */
@@ -266,9 +274,10 @@ export class OpenCodeEngine implements AIEngine {
 				yield convertStreamStop(sessionId);
 
 				const parts = messageParts.get(msgId) || [];
-				// Filter out tool parts and reasoning parts already emitted
+				// Filter out tool parts, subtask parts, and reasoning parts already emitted
 				const remainingParts = parts.filter(p => {
 					if (p.type === 'tool') return !emittedToolParts.has(p.id);
+					if (p.type === 'subtask') return !emittedToolParts.has(p.id);
 					if (p.type === 'reasoning') return false; // Already emitted as reasoning message
 					return true;
 				});
@@ -312,6 +321,15 @@ export class OpenCodeEngine implements AIEngine {
 								}
 								currentAssistantId = info.id;
 							}
+
+							// Track child session assistant messages (for Agent tool sub-messages)
+							if (info.role === 'assistant' && info.sessionID !== sessionId && lastAgentToolCallId) {
+								if (!childSessionToAgentTool.has(info.sessionID)) {
+									childSessionToAgentTool.set(info.sessionID, lastAgentToolCallId);
+									debug.log('engine', `[OC] child session detected: ${info.sessionID} → agent tool ${lastAgentToolCallId}`);
+								}
+								childAssistantMessages.set(info.id, info);
+							}
 							break;
 						}
 
@@ -321,8 +339,36 @@ export class OpenCodeEngine implements AIEngine {
 
 							debug.log('engine', `[OC] part.updated: type=${part.type}, partId=${part.id}, msgId=${part.messageID}, session=${part.sessionID === sessionId ? 'match' : 'skip'}`);
 
-							// Only process parts belonging to our session
-							if (part.sessionID !== sessionId) break;
+							// Handle child session parts (sub-agent tool activities)
+							if (part.sessionID !== sessionId) {
+								const agentCallId = childSessionToAgentTool.get(part.sessionID);
+								if (agentCallId && childAssistantMessages.has(part.messageID)) {
+									const childMsg = childAssistantMessages.get(part.messageID)!;
+
+									if (part.type === 'tool') {
+										const childToolPart = part as ToolPart;
+										if (!childEmittedToolParts.has(part.id)) {
+											const resolvedInput = getToolInput(childToolPart);
+											const hasInput = Object.keys(resolvedInput).length > 0
+												|| childToolPart.state.status !== 'pending';
+											if (hasInput) {
+												childEmittedToolParts.add(part.id);
+												yield convertToolUseOnly(childToolPart, childMsg, sessionId, agentCallId);
+												if (childToolPart.state.status === 'completed' || childToolPart.state.status === 'error') {
+													childCompletedToolParts.add(part.id);
+													yield convertToolResultOnly(childToolPart, sessionId, agentCallId);
+												}
+											}
+										} else if (!childCompletedToolParts.has(part.id)) {
+											if (childToolPart.state.status === 'completed' || childToolPart.state.status === 'error') {
+												childCompletedToolParts.add(part.id);
+												yield convertToolResultOnly(childToolPart, sessionId, agentCallId);
+											}
+										}
+									}
+								}
+								break;
+							}
 
 							// Only process parts for tracked assistant messages (skip user message parts)
 							if (!assistantMessages.has(part.messageID)) {
@@ -364,6 +410,11 @@ export class OpenCodeEngine implements AIEngine {
 									if (hasInput) {
 										emittedToolParts.add(part.id);
 
+										// Track agent tool callID for child session linking
+										if (toolPart.tool === 'task') {
+											lastAgentToolCallId = toolPart.callID || toolPart.id;
+										}
+
 										yield convertStreamStop(sessionId);
 										yield convertToolUseOnly(toolPart, msg, sessionId);
 
@@ -412,6 +463,25 @@ export class OpenCodeEngine implements AIEngine {
 								}
 							}
 
+							// Handle subtask parts — convert to Agent tool_use for progressive rendering
+							if (part.type === 'subtask') {
+								const subtaskPart = part as any;
+								const msg = assistantMessages.get(msgId);
+								if (msg && !emittedToolParts.has(part.id)) {
+									emittedToolParts.add(part.id);
+									// Track for child session linking
+									lastAgentToolCallId = part.id;
+									if (reasoningStreamActive) {
+										yield* flushReasoning(msg);
+									}
+									yield convertStreamStop(sessionId);
+									yield convertSubtaskToolUseOnly(subtaskPart, msg, sessionId);
+									yield convertStreamStart(sessionId);
+									streamingText = '';
+								}
+								break;
+							}
+
 							// Skip non-text/non-reasoning parts (step-start, step-finish, etc.)
 							if (part.type !== 'text') {
 								debug.log('engine', `[OC] part.updated: skipped non-text type=${part.type}`);
@@ -455,6 +525,12 @@ export class OpenCodeEngine implements AIEngine {
 						}
 
 						case 'session.idle': {
+							// Only handle idle for our session (sub-agent sessions have different IDs)
+							const idleProps = (event as EventSessionIdle).properties;
+							if (idleProps.sessionID !== sessionId) {
+								debug.log('engine', `[OC] session.idle: ignored (session=${idleProps.sessionID}, ours=${sessionId})`);
+								break;
+							}
 							// Session finished — flush reasoning and emit the last assistant message
 							if (currentAssistantId && !emittedMessageIds.has(currentAssistantId)) {
 								const msg = assistantMessages.get(currentAssistantId);
@@ -468,6 +544,7 @@ export class OpenCodeEngine implements AIEngine {
 									// Filter out tool parts and reasoning parts already emitted
 									const remainingParts = parts.filter(p => {
 										if (p.type === 'tool') return !emittedToolParts.has(p.id);
+										if (p.type === 'subtask') return !emittedToolParts.has(p.id);
 										if (p.type === 'reasoning') return false;
 										return true;
 									});
@@ -495,7 +572,10 @@ export class OpenCodeEngine implements AIEngine {
 						}
 
 						case 'session.status': {
-							const { status } = (event as EventSessionStatus).properties;
+							const statusProps = (event as EventSessionStatus).properties;
+							// Only handle status for our session (sub-agent sessions have different IDs)
+							if (statusProps.sessionID !== sessionId) break;
+							const { status } = statusProps;
 							if (status.type === 'idle') {
 								// Same as session.idle
 								if (currentAssistantId && !emittedMessageIds.has(currentAssistantId)) {
@@ -508,6 +588,7 @@ export class OpenCodeEngine implements AIEngine {
 										const parts = messageParts.get(currentAssistantId) || [];
 										const remainingParts = parts.filter(p => {
 											if (p.type === 'tool') return !emittedToolParts.has(p.id);
+											if (p.type === 'subtask') return !emittedToolParts.has(p.id);
 											if (p.type === 'reasoning') return false;
 											return true;
 										});
@@ -584,7 +665,10 @@ export class OpenCodeEngine implements AIEngine {
 						}
 
 						case 'session.error': {
-							const { error } = (event as EventSessionError).properties;
+							const errorProps = (event as EventSessionError).properties;
+							// Only handle errors for our session (sessionID is optional on errors)
+							if (errorProps.sessionID && errorProps.sessionID !== sessionId) break;
+							const { error } = errorProps;
 							// Extract a human-readable error message.
 							// OpenCode SDK errors follow: { name: string, data: { message, statusCode?, providerID?, responseBody? } }
 							// Don't prepend error class names (e.g. "APIError") — those are SDK

package/backend/lib/mcp/config.ts

@@ -8,7 +8,7 @@
 import type { McpSdkServerConfigWithInstance, McpServerConfig } from "@anthropic-ai/claude-agent-sdk";
 import type { McpLocalConfig } from '@opencode-ai/sdk';
 import type { ServerConfig, ParsedMcpToolName, ServerName } from './types';
-import { serverRegistry } from './servers';
+import { serverRegistry, serverFactories } from './servers';
 import { debug } from '$shared/utils/logger';
 import { resolve } from 'path';
 import { SERVER_ENV } from '../shared/env';
@@ -84,14 +84,18 @@ export const mcpServers: Record<string, ServerConfig & { instance: McpSdkServerC
 // ============================================================================
 
 /**
- * Get all enabled MCP servers for Claude SDK
+ * Get all enabled MCP servers for Claude SDK.
+ *
+ * Creates FRESH server instances each call so that concurrent streams
+ * each get their own Protocol — avoids "Already connected to a transport" errors.
  */
 export function getEnabledMcpServers(): Record<string, McpServerConfig> {
 	const enabledServers: Record<string, McpServerConfig> = {};
 
 	Object.entries(mcpServers).forEach(([serverName, serverConfig]) => {
 		if (serverConfig.enabled) {
-			enabledServers[serverName] = serverConfig.instance;
+			const factory = serverFactories[serverName as ServerName];
+			enabledServers[serverName] = factory ? factory() : serverConfig.instance;
 			debug.log('mcp', `✓ Enabled MCP server: ${serverName}`);
 		} else {
 			debug.log('mcp', `✗ Disabled MCP server: ${serverName}`);

package/backend/lib/mcp/servers/helper.ts

@@ -52,6 +52,8 @@ interface ServerWithMeta<
 	TToolNames extends readonly string[]
 > {
 	server: ReturnType<typeof createSdkMcpServer>;
+	/** Factory that creates a fresh SDK server instance (new Protocol, safe for concurrent use) */
+	createInstance: () => ReturnType<typeof createSdkMcpServer>;
 	meta: {
 		readonly name: TName;
 		readonly tools: TToolNames;
@@ -84,32 +86,36 @@ export function defineServer<
 	// Build raw tool definitions (engine-agnostic)
 	const toolDefs: Record<string, RawToolDef> = {};
 
-	// Convert tools object to SDK format (array of tools)
-	const sdkTools = toolNames.map((toolName) => {
+	// Build raw tool definitions (engine-agnostic) and store for reuse
+	toolNames.forEach((toolName) => {
 		const toolDef = config.tools[toolName] as any;
-		// If schema is not provided, use empty object
 		const schema = toolDef.schema || {};
 
-		// Store raw definition for reuse
 		toolDefs[toolName as string] = {
 			description: toolDef.description,
 			schema,
 			handler: toolDef.handler,
 		};
-
-		return tool(toolName as string, toolDef.description, schema, toolDef.handler);
 	});
 
-	// Create SDK server
-	const server = createSdkMcpServer({
-		name: config.name,
-		version: config.version,
-		tools: sdkTools
-	});
+	// Factory: creates a fresh SDK server instance with new Protocol (safe for concurrent use)
+	const createInstance = () => {
+		const sdkTools = toolNames.map((toolName) => {
+			const def = toolDefs[toolName as string];
+			return tool(toolName as string, def.description, def.schema, def.handler as any);
+		});
+
+		return createSdkMcpServer({
+			name: config.name,
+			version: config.version,
+			tools: sdkTools
+		});
+	};
 
-	// Return server with metadata
+	// Return server with metadata and factory
 	return {
-		server,
+		server: createInstance(),
+		createInstance,
 		meta: {
 			name: config.name,
 			tools: toolNames as any,
@@ -126,10 +132,12 @@ export function buildServerRegistries<
 >(servers: T) {
 	const metadata = {} as any;
 	const registry = {} as any;
+	const factories = {} as any;
 
 	for (const server of servers) {
 		metadata[server.meta.name] = server.meta;
 		registry[server.meta.name] = server.server;
+		factories[server.meta.name] = server.createInstance;
 	}
 
 	return {
@@ -138,6 +146,9 @@ export function buildServerRegistries<
 		},
 		registry: registry as {
 			[K in T[number]['meta']['name']]: Extract<T[number], { meta: { name: K } }>['server']
+		},
+		factories: factories as {
+			[K in T[number]['meta']['name']]: () => Extract<T[number], { meta: { name: K } }>['server']
 		}
 	};
 }

package/backend/lib/mcp/servers/index.ts

@@ -32,7 +32,7 @@ const allServers = [
 /**
  * Auto-build registries from server array
  */
-const { metadata, registry } = buildServerRegistries(allServers);
+const { metadata, registry, factories } = buildServerRegistries(allServers);
 
 /**
  * Server Metadata Registry - Defines available servers and their tools
@@ -42,4 +42,9 @@ export const serverMetadata = metadata;
 /**
  * Server Instance Registry - Maps server names to SDK instances
  */
-export const serverRegistry = registry;
+export const serverRegistry = registry;
+
+/**
+ * Server Factory Registry - Creates fresh SDK instances (safe for concurrent streams)
+ */
+export const serverFactories = factories;