diff --git a/container/agent-runner/src/index.ts b/container/agent-runner/src/index.ts
index 1adb76d..a0b0dc8 100644
--- a/container/agent-runner/src/index.ts
+++ b/container/agent-runner/src/index.ts
@@ -73,15 +73,15 @@ async function main(): Promise<void> {
     }
   }
 
-  // MCP server path
+  // MCP server path — bun runs TS directly; no tsc build step in-image.
   const __dirname = path.dirname(fileURLToPath(import.meta.url));
-  const mcpServerPath = path.join(__dirname, 'mcp-tools', 'index.js');
+  const mcpServerPath = path.join(__dirname, 'mcp-tools', 'index.ts');
 
   // Build MCP servers config: nanoclaw built-in + any additional from host
   const mcpServers: Record<string, { command: string; args: string[]; env: Record<string, string> }> = {
     nanoclaw: {
-      command: 'node',
-      args: [mcpServerPath],
+      command: 'bun',
+      args: ['run', mcpServerPath],
       env: {
         SESSION_INBOUND_DB_PATH: process.env.SESSION_INBOUND_DB_PATH || '/workspace/inbound.db',
         SESSION_OUTBOUND_DB_PATH: process.env.SESSION_OUTBOUND_DB_PATH || '/workspace/outbound.db',