Temp branch

.dockerignore

@@ -0,0 +1,4 @@
+node_modules
+.turbo
+.pnpm-store
+.git

.gitignore

@@ -42,4 +42,10 @@ srcbook/lib/**/*
 # Aide
 *.code-workspace
 
-vite.config.ts.timestamp-*.mjs
+vite.config.ts.timestamp-*.mjs
+
+# MCP Testing
+packages/api/test/mcp_tests
+
+# MCP Config
+packages/api/srcbook_mcp_config.json

Dockerfile

@@ -1,23 +1,40 @@
-FROM node:22.7.0-alpine3.20
+FROM node:20-bullseye-slim
 WORKDIR /app
 
+# Install git
+RUN apt-get update && apt-get install -y git
+
+# Configure git
+RUN git config --global user.email "[email protected]" && \
+    git config --global user.name "Srcbook"
+
 RUN corepack enable && corepack prepare [email protected] --activate
 
 # Copy all package files first
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 COPY packages packages/
 COPY srcbook srcbook/
 COPY turbo.json ./
+COPY srcbook_mcp_config.json ./
+
+# Add a build arg for container detection
+ENV CONTAINER=true
 
 # Install dependencies
 RUN pnpm install
 
-# Build the application
+# Build with our platform detection in place
 RUN pnpm build
 
 # Create necessary directories for volumes
 RUN mkdir -p /root/.srcbook /root/.npm
 
+# Create directories for filesystem server
+RUN mkdir -p /app/data/Desktop /app/data/Downloads
+
+# Set container environment variable
+ENV CONTAINER=true
+
 # Source code will be mounted at runtime
 CMD [ "pnpm", "start" ]
 

MCP_README.md

@@ -0,0 +1,129 @@
+# Model Context Protocol (MCP) Integration
+
+Srcbook now features a [Model Context Protocol](https://modelcontextprotocol.io) (MCP) client, enabling secure and standardized interactions between your applications and external tools via MCP. Currently, MCP is primarily integrated with the AI-assisted app building functionality.
+
+## Overview
+
+MCP allows Srcbook to:
+- Enhance AI code generation with sequential, o1-style thinking
+- Access local files securely (when configured)
+- Connect to various utility servers
+
+> **Note**: MCP integration is currently focused on the app builder functionality, with notebook integration planned for future releases.
+
+## Getting Started
+
+### Prerequisites
+
+- Srcbook running locally
+- Node.js 18+
+- Access to your local filesystem
+
+### Configuration
+
+1. Navigate to `packages/api/` in your Srcbook installation directory
+2. Locate `srcbook_mcp_config.example.json`
+3. Create a new file named `srcbook_mcp_config.json` based on the example
+4. Configure the filesystem paths:
+
+```json
+{
+  "mcpServers": {
+    "memory": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-memory"]
+    },
+    "filesystem": {
+      "command": "npx",
+      "args": [
+        "-y",
+        "@modelcontextprotocol/server-filesystem",
+        "/PATH/TO/YOUR/DESKTOP",
+        "/PATH/TO/YOUR/DOWNLOADS"
+      ]
+    },
+    "puppeteer": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-puppeteer"]
+    },
+    "sequential-thinking": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-sequential-thinking"]
+    },
+    "everything": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-everything"]
+    },
+    "mcp-installer": {
+      "command": "npx",
+      "args": ["@anaisbetts/mcp-installer"]
+    }
+  }
+}
+```
+
+> **Important**: Replace `/PATH/TO/YOUR/DESKTOP` and `/PATH/TO/YOUR/DOWNLOADS` with the actual paths to your Desktop and Downloads folders.
+
+## Available Servers
+
+Srcbook comes with several pre-configured MCP servers that don't require API keys:
+
+- **memory**: Basic memory operations ([source](https://github.com/modelcontextprotocol/servers/tree/main/src/memory))
+- **filesystem**: Secure file system access ([source](https://github.com/modelcontextprotocol/servers/tree/main/src/filesystem))
+- **puppeteer**: Browser automation capabilities ([source](https://github.com/modelcontextprotocol/servers/tree/main/src/puppeteer))
+- **sequential-thinking**: Enhanced, o1-style reasoning ([source](https://github.com/modelcontextprotocol/servers/tree/main/src/sequentialthinking))
+- **everything**: Test server for builders of MCP clients ([source](https://github.com/modelcontextprotocol/servers/tree/main/src/everything))
+- **mcp-installer**: Installation utility
+
+## Using MCP in the App Builder
+
+### Sequential Thinking
+
+The primary MCP integration currently available is the sequential thinking feature in the app builder:
+
+1. Open the app builder
+2. Toggle sequential thinking on/off using the interface
+3. When enabled, the AI code editing process will utilize the sequential-thinking server
+4. You can verify server usage by checking your terminal output
+
+## Troubleshooting
+
+### Common Issues
+
+1. **Server Configuration**
+   - Verify your `srcbook_mcp_config.json` exists and is properly formatted
+   - Check that filesystem paths are correct and accessible
+   - Ensure Node.js version is 18+
+
+2. **Sequential Thinking Issues**
+   - Check terminal output for server connection status
+   - Verify the server is properly installed via npx
+   - Restart Srcbook if server connection fails
+
+### Known Limitations
+
+1. **Notebook Integration**
+   - MCP is not currently integrated with notebook functionality
+   - Future releases will expand MCP support to notebooks
+
+2. **File Access**
+   - Limited to configured Desktop and Downloads directories
+   - Must be explicitly configured in json file
+
+## Getting Help
+
+- Join our [Discord Community](https://discord.gg/shDEGBSe2d)
+- File issues on [GitHub](https://github.com/srcbookdev/srcbook)
+
+## Future Development
+
+Planned expansions of MCP functionality include:
+
+1. Notebook integration for code cells
+2. Additional server integrations
+3. Enhanced file system capabilities
+4. Expanded AI assistance features
+
+## Contributing
+
+We welcome contributions to improve MCP integration in Srcbook. Please check our [Contributing Guidelines](CONTRIBUTING.md) before submitting changes.

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   srcbook:
     build:
@@ -12,6 +11,16 @@ services:
         target: /root/.srcbook
         bind:
           create_host_path: true
+      - type: bind
+        source: ${HOME}/Desktop
+        target: /app/data/Desktop
+        bind:
+          create_host_path: true
+      - type: bind
+        source: ${HOME}/Downloads
+        target: /app/data/Downloads
+        bind:
+          create_host_path: true
     environment:
       - NODE_ENV=production
       - HOST=${HOST_BIND:-127.0.0.1}

package.json

@@ -25,10 +25,13 @@
     "typescript": "5.6.2"
   },
   "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.1.0",
+    "drizzle-kit": "^0.24.2",
+    "electron": "^33.3.1",
     "turbo": "^2.1.1"
   },
   "packageManager": "[email protected]",
   "engines": {
-    "node": ">=18"
+    "node": "20.x"
   }
 }

packages/api/ai/generate.mts

@@ -296,3 +296,50 @@ export async function streamEditApp(
 
   return result.textStream;
 }
+
+export async function streamEditAppSequential(
+  projectId: string,
+  files: FileContent[],
+  query: string,
+  appId: string,
+  planId: string,
+) {
+  // Example: maybe we log that we’re using sequential logic
+  console.log('[MCP] Using sequential logic for editing app', appId, 'plan:', planId);
+
+  // Potentially a different model or prompt
+  const model = await getModel();
+
+  // Optionally define a specialized “sequential” system prompt:
+  const systemPrompt = `You are a helpful AI that uses a sequential chain-of-thought approach. ${makeAppEditorSystemPrompt()}`;
+
+  // Reuse or adapt the user prompt
+  const userPrompt = makeAppEditorUserPrompt(projectId, files, query);
+
+  let response = '';
+
+  // If you want to call the same streaming approach but with custom prompts:
+  const result = await streamText({
+    model,
+    system: systemPrompt,
+    prompt: userPrompt,
+    onChunk: (chunk) => {
+      if (chunk.chunk.type === 'text-delta') {
+        response += chunk.chunk.textDelta;
+      }
+    },
+    onFinish: () => {
+      if (process.env.SRCBOOK_DISABLE_ANALYTICS !== 'true') {
+        logAppGeneration({
+          appId,
+          planId,
+          llm_request: { model, system: systemPrompt, prompt: userPrompt },
+          llm_response: response,
+        });
+      }
+    },
+  });
+
+  // Return the streaming body
+  return result.textStream;
+}

packages/api/ai/tool-execution.mts

@@ -0,0 +1,39 @@
+import { MCPHub } from '../mcp/mcphub.mjs';
+import type { CallToolResultSchema } from '@modelcontextprotocol/sdk/types.js';
+import { CallToolRequestSchema } from '../mcp/types.mjs';
+import { z } from 'zod';
+
+export class ToolExecutionService {
+  constructor(private mcpHub: MCPHub) {}
+
+  async executeToolStream(request: z.infer<typeof CallToolRequestSchema>): Promise<ReadableStream> {
+    return new ReadableStream({
+      start: async (controller) => {
+        try {
+          const result: z.infer<typeof CallToolResultSchema> = await this.mcpHub.callTool(
+            request.serverName,
+            request.toolName,
+            request.params
+          );
+
+          controller.enqueue(
+            JSON.stringify({
+              type: 'result',
+              data: result,
+            }) + '\n'
+          );
+
+          controller.close();
+        } catch (error: any) {
+          controller.enqueue(
+            JSON.stringify({
+              type: 'error',
+              data: { message: error.message },
+            }) + '\n'
+          );
+          controller.error(error);
+        }
+      },
+    });
+  }
+}

packages/api/config.mts

@@ -23,6 +23,7 @@ async function init() {
       aiConfig: { provider: 'openai', model: 'gpt-4o' } as const,
       aiProvider: 'openai',
       aiModel: 'gpt-4o',
+      mcpServers: {},
     };
     console.log();
     console.log('Initializing application with the following configuration:\n');

packages/api/constants.mts

@@ -15,3 +15,4 @@ export const APPS_DIR = path.join(SRCBOOK_DIR, 'apps');
 export const DIST_DIR = _dirname;
 export const PROMPTS_DIR = path.join(DIST_DIR, 'prompts');
 export const IS_PRODUCTION = process.env.NODE_ENV === 'production';
+export const PROJECT_DIR = '@/srcbook_mcp_config.json';

packages/api/db/index.mts

@@ -16,4 +16,4 @@ const DB_PATH = `${HOME_DIR}/.srcbook/srcbook.db`;
 fs.mkdirSync(SRCBOOKS_DIR, { recursive: true });
 
 export const db = drizzle(new Database(DB_PATH), { schema });
-migrate(db, { migrationsFolder: drizzleFolder });
+migrate(db, { migrationsFolder: drizzleFolder });

packages/api/db/schema.mts

@@ -1,6 +1,15 @@
 import { sql } from 'drizzle-orm';
 import { sqliteTable, text, integer, unique } from 'drizzle-orm/sqlite-core';
 import { randomid } from '@srcbook/shared';
+import { z } from 'zod';
+
+// Add MCP server config types
+export const McpServerConfig = z.object({
+  host: z.string().url(),
+  tools: z.array(z.string()).optional(),
+});
+
+export type McpServerConfig = z.infer<typeof McpServerConfig>;
 
 export const configs = sqliteTable('config', {
   // Directory where .src.md files will be stored and searched by default.
@@ -19,6 +28,12 @@ export const configs = sqliteTable('config', {
   aiBaseUrl: text('ai_base_url'),
   // Null: unset. Email: subscribed. "dismissed": dismissed the dialog.
   subscriptionEmail: text('subscription_email'),
+  // Add MCP configuration
+  mcpServers: text('mcp_servers', { mode: 'json' }).$type<Record<string, {
+    command: string;
+    args: string[];
+    env: string
+  }>>().default({}),
 });
 
 export type Config = typeof configs.$inferSelect;

packages/api/drizzle/0015_add_mcp_servers.sql

@@ -0,0 +1 @@
+ALTER TABLE `config` ADD `mcp_servers` text DEFAULT '{}' NOT NULL;