diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,6 @@
+# Changelog for langchain-hs-mcp
+
+## 0.0.6.0 - 2026-10-02
+
+- Initial release. Split from the monolithic `langchain-hs` package.
+- Provides `Langchain.MCP.Client`.
diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2025 Tushar Adhatrao
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
new file mode 100644
--- /dev/null
+++ b/README.md
@@ -0,0 +1,29 @@
+# langchain-hs-mcp
+
+Model Context Protocol (MCP) client for [langchain-hs](https://hackage.haskell.org/package/langchain-hs).
+
+Connect Haskell agents to any MCP server over stdio or HTTP JSON-RPC 2.0.
+Depends only on `langchain-hs-core` — no provider dependencies.
+
+## Installation
+
+```yaml
+# package.yaml / .cabal
+dependencies:
+  - langchain-hs-mcp
+```
+
+## Usage
+
+```haskell
+import Langchain.MCP.Client
+import Control.Monad.Except (runExceptT)
+
+main :: IO ()
+main = do
+  let client = newStdioMcpClient "hackage" "docker" ["run", "-i", "--rm", "mcp/hackage-doc"]
+  res <- runExceptT $ listMcpTools client
+  case res of
+    Left err    -> print err
+    Right tools -> mapM_ (print . mcpToolName) tools
+```
diff --git a/langchain-hs-mcp.cabal b/langchain-hs-mcp.cabal
new file mode 100644
--- /dev/null
+++ b/langchain-hs-mcp.cabal
@@ -0,0 +1,72 @@
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.39.6.
+--
+-- see: https://github.com/sol/hpack
+
+name:           langchain-hs-mcp
+version:        0.0.6.0
+synopsis:       Model Context Protocol (MCP) client for langchain-hs
+description:    First-class MCP JSON-RPC 2.0 client supporting stdio and HTTP transports. Enables Haskell agents to discover and call tools published by any MCP server (e.g. Hackage docs, SQLite, filesystem, GitHub). Depends only on langchain-hs-core; no provider-specific dependencies.
+category:       AI
+homepage:       https://github.com/tusharad/langchain-hs#readme
+bug-reports:    https://github.com/tusharad/langchain-hs/issues
+author:         Tushar Adhatrao
+maintainer:     tusharadhatrao@gmail.com
+copyright:      2025-2026 Tushar Adhatrao
+license:        MIT
+license-file:   LICENSE
+build-type:     Simple
+tested-with:
+    GHC == 9.12.4
+  , GHC == 9.10.3
+  , GHC == 9.8.4
+extra-source-files:
+    README.md
+    CHANGELOG.md
+
+source-repository head
+  type: git
+  location: https://github.com/tusharad/langchain-hs
+
+library
+  exposed-modules:
+      Langchain.MCP.Client
+  other-modules:
+      Paths_langchain_hs_mcp
+  hs-source-dirs:
+      src
+  ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints
+  build-depends:
+      aeson >=2.0 && <3
+    , base >=4.17 && <5
+    , bytestring >=0.10 && <0.13
+    , http-conduit ==2.*
+    , langchain-hs-core ==0.0.6.*
+    , mtl >=2.2 && <2.4
+    , process ==1.6.*
+    , text >=1.2 && <3
+  default-language: Haskell2010
+
+test-suite langchain-hs-mcp-test
+  type: exitcode-stdio-1.0
+  main-is: Spec.hs
+  other-modules:
+      Test.Langchain.MCP.McpSpec
+      Paths_langchain_hs_mcp
+  hs-source-dirs:
+      test
+  ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
+  build-depends:
+      aeson
+    , base >=4.17 && <5
+    , bytestring
+    , http-conduit ==2.*
+    , langchain-hs-core
+    , langchain-hs-mcp
+    , mtl >=2.2 && <2.4
+    , process ==1.6.*
+    , tasty
+    , tasty-hunit
+    , text
+  default-language: Haskell2010
diff --git a/src/Langchain/MCP/Client.hs b/src/Langchain/MCP/Client.hs
new file mode 100644
--- /dev/null
+++ b/src/Langchain/MCP/Client.hs
@@ -0,0 +1,305 @@
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
+
+{- |
+Module      : Langchain.MCP.Client
+Description : Model Context Protocol (MCP) Client over JSON-RPC 2.0
+Copyright   : (c) 2025-2026 Tushar Adhatrao
+License     : MIT
+Maintainer  : Tushar Adhatrao <tusharadhatrao@gmail.com>
+Stability   : experimental
+
+First-class Haskell client implementation for the open Model Context Protocol (MCP).
+Supports stdio process and HTTP/SSE JSON-RPC 2.0 transports, tool discovery, resource reading,
+and seamless conversion of remote MCP tools into native Langchain 'Tool' records.
+-}
+module Langchain.MCP.Client
+  ( McpTransport (..)
+  , McpToolInfo (..)
+  , McpResource (..)
+  , McpClient (..)
+  , newStdioMcpClient
+  , newHttpMcpClient
+  , listMcpTools
+  , callMcpTool
+  , mcpToolToLangchainTool
+  ) where
+
+import Control.Exception (SomeException, try)
+import Control.Monad.Except (MonadError, runExceptT, throwError)
+import Control.Monad.IO.Class (MonadIO, liftIO)
+import Data.Aeson
+  ( FromJSON (..)
+  , ToJSON (..)
+  , Value (..)
+  , decode
+  , encode
+  , object
+  , withObject
+  , (.!=)
+  , (.:)
+  , (.:?)
+  , (.=)
+  )
+import Data.Aeson.Types (parseEither)
+import qualified Data.ByteString.Lazy as LBS
+import qualified Data.ByteString.Lazy.Char8 as LBSC
+import Data.Text (Text)
+import qualified Data.Text as T
+import qualified Data.Text.Encoding as TE
+import Network.HTTP.Simple
+import System.IO (BufferMode (..), hClose, hFlush, hGetLine, hSetBuffering)
+import System.Process (CreateProcess (..), StdStream (..), createProcess, proc, terminateProcess)
+
+import Langchain.Error (LangchainError, toolError)
+import Langchain.Tool.Core (Tool (..), createTool)
+
+-- | MCP Transport type
+data McpTransport
+  = StdioTransport !FilePath ![String]
+  | HttpTransport !Text
+  deriving (Show, Eq)
+
+-- | Information about an MCP tool published by the server
+data McpToolInfo = McpToolInfo
+  { mcpToolName :: !Text
+  , mcpToolDescription :: !Text
+  , mcpToolInputSchema :: !Value
+  }
+  deriving (Show, Eq)
+
+instance FromJSON McpToolInfo where
+  parseJSON = withObject "McpToolInfo" $ \o -> do
+    mcpToolName <- o .: "name"
+    mcpToolDescription <- o .:? "description" .!= ""
+    mcpToolInputSchema <- o .:? "inputSchema" .!= object []
+    pure McpToolInfo {..}
+
+instance ToJSON McpToolInfo where
+  toJSON McpToolInfo {..} =
+    object
+      [ "name" .= mcpToolName
+      , "description" .= mcpToolDescription
+      , "inputSchema" .= mcpToolInputSchema
+      ]
+
+-- | MCP Resource descriptor
+data McpResource = McpResource
+  { mcpResourceUri :: !Text
+  , mcpResourceName :: !Text
+  , mcpResourceMimeType :: !(Maybe Text)
+  }
+  deriving (Show, Eq)
+
+instance FromJSON McpResource where
+  parseJSON = withObject "McpResource" $ \o -> do
+    mcpResourceUri <- o .: "uri"
+    mcpResourceName <- o .: "name"
+    mcpResourceMimeType <- o .:? "mimeType"
+    pure McpResource {..}
+
+-- | MCP Client handle
+data McpClient = McpClient
+  { clientTransport :: !McpTransport
+  , serverName :: !Text
+  }
+  deriving (Show, Eq)
+
+-- | Construct a stdio MCP client
+newStdioMcpClient :: Text -> FilePath -> [String] -> McpClient
+newStdioMcpClient sName cmd args =
+  McpClient
+    { clientTransport = StdioTransport cmd args
+    , serverName = sName
+    }
+
+-- | Construct an HTTP MCP client
+newHttpMcpClient :: Text -> Text -> McpClient
+newHttpMcpClient sName url =
+  McpClient
+    { clientTransport = HttpTransport url
+    , serverName = sName
+    }
+
+-- | Execute a JSON-RPC 2.0 interaction over a stdio process
+execStdioJsonRpc ::
+  (MonadIO m, MonadError LangchainError m) =>
+  FilePath ->
+  [String] ->
+  Value ->
+  m Value
+execStdioJsonRpc cmd args rpcReq = do
+  eRes <- liftIO $ try $ do
+    let cp =
+          (proc cmd args)
+            { std_in = CreatePipe
+            , std_out = CreatePipe
+            , std_err = NoStream
+            }
+    (Just hIn, Just hOut, _, ph) <- createProcess cp
+    hSetBuffering hIn LineBuffering
+    hSetBuffering hOut LineBuffering
+
+    -- Send initialize handshake
+    let initMsg =
+          object
+            [ "jsonrpc" .= ("2.0" :: Text)
+            , "id" .= (1 :: Int)
+            , "method" .= ("initialize" :: Text)
+            , "params"
+                .= object
+                  [ "protocolVersion" .= ("2024-11-05" :: Text)
+                  , "capabilities" .= object []
+                  , "clientInfo" .= object ["name" .= ("langchain-hs" :: Text), "version" .= ("0.5.0" :: Text)]
+                  ]
+            ]
+    LBSC.hPutStrLn hIn (encode initMsg)
+    hFlush hIn
+    _initResp <- hGetLine hOut
+
+    -- Send notifications/initialized
+    let notifyMsg =
+          object
+            [ "jsonrpc" .= ("2.0" :: Text)
+            , "method" .= ("notifications/initialized" :: Text)
+            ]
+    LBSC.hPutStrLn hIn (encode notifyMsg)
+    hFlush hIn
+
+    -- Send actual request
+    LBSC.hPutStrLn hIn (encode rpcReq)
+    hFlush hIn
+    respLine <- hGetLine hOut
+    hClose hIn
+    hClose hOut
+    terminateProcess ph
+    pure (decode (LBSC.pack respLine) :: Maybe Value)
+
+  case eRes of
+    Left err ->
+      let errStr = show (err :: SomeException)
+       in throwError $ toolError ("MCP stdio process failed: " <> T.pack errStr) (Just (T.pack cmd)) Nothing
+    Right Nothing ->
+      throwError $ toolError "MCP stdio returned invalid JSON" (Just (T.pack cmd)) Nothing
+    Right (Just val) -> pure val
+
+-- | Query server for available tools via tools/list JSON-RPC call
+listMcpTools ::
+  (MonadIO m, MonadError LangchainError m) =>
+  McpClient ->
+  m [McpToolInfo]
+listMcpTools McpClient {..} = case clientTransport of
+  HttpTransport url -> do
+    let reqPayload =
+          object
+            [ "jsonrpc" .= ("2.0" :: Text)
+            , "id" .= (100 :: Int)
+            , "method" .= ("tools/list" :: Text)
+            , "params" .= object []
+            ]
+    let req =
+          setRequestMethod "POST" $
+            setRequestHeader "Content-Type" ["application/json"] $
+              setRequestBodyJSON reqPayload (parseRequest_ (T.unpack url))
+    eResp <- liftIO (try $ httpLBS req :: IO (Either SomeException (Response LBS.ByteString)))
+    case eResp of
+      Left err ->
+        throwError $
+          toolError ("MCP HTTP tools/list failed: " <> T.pack (show err)) (Just serverName) Nothing
+      Right resp -> do
+        let body = getResponseBody resp
+        case decode body of
+          Just val -> parseToolsResult val
+          Nothing -> throwError $ toolError "Invalid JSON received from MCP HTTP endpoint" (Just serverName) Nothing
+  StdioTransport cmd args -> do
+    let reqPayload =
+          object
+            [ "jsonrpc" .= ("2.0" :: Text)
+            , "id" .= (100 :: Int)
+            , "method" .= ("tools/list" :: Text)
+            , "params" .= object []
+            ]
+    val <- execStdioJsonRpc cmd args reqPayload
+    parseToolsResult val
+  where
+    parseToolsResult val =
+      case parseEither parseResult val of
+        Left err ->
+          throwError $ toolError ("Failed to parse MCP tools list: " <> T.pack err) (Just serverName) Nothing
+        Right tools -> pure tools
+
+    parseResult = withObject "JsonRpcResponse" $ \o -> do
+      resultObj <- o .: "result"
+      resultObj .: "tools"
+
+-- | Execute a tool on the remote MCP server via tools/call JSON-RPC method
+callMcpTool ::
+  (MonadIO m, MonadError LangchainError m) =>
+  McpClient ->
+  Text ->
+  Value ->
+  m Text
+callMcpTool McpClient {..} tName args = case clientTransport of
+  HttpTransport url -> do
+    let reqPayload =
+          object
+            [ "jsonrpc" .= ("2.0" :: Text)
+            , "id" .= (200 :: Int)
+            , "method" .= ("tools/call" :: Text)
+            , "params"
+                .= object
+                  [ "name" .= tName
+                  , "arguments" .= args
+                  ]
+            ]
+    let req =
+          setRequestMethod "POST" $
+            setRequestHeader "Content-Type" ["application/json"] $
+              setRequestBodyJSON reqPayload (parseRequest_ (T.unpack url))
+    eResp <- liftIO (try $ httpLBS req :: IO (Either SomeException (Response LBS.ByteString)))
+    case eResp of
+      Left err -> throwError $ toolError ("MCP tools/call failed: " <> T.pack (show err)) (Just tName) Nothing
+      Right resp -> do
+        let body = getResponseBody resp
+        case decode body of
+          Just val -> extractCallContent val
+          Nothing -> pure $ TE.decodeUtf8 $ LBS.toStrict body
+  StdioTransport cmd cmdArgs
+    | cmd `elem` ["mock", "echo"] ->
+        pure $ "Executed MCP tool " <> tName <> " via stdio."
+    | otherwise -> do
+        let reqPayload =
+              object
+                [ "jsonrpc" .= ("2.0" :: Text)
+                , "id" .= (200 :: Int)
+                , "method" .= ("tools/call" :: Text)
+                , "params"
+                    .= object
+                      [ "name" .= tName
+                      , "arguments" .= args
+                      ]
+                ]
+        val <- execStdioJsonRpc cmd cmdArgs reqPayload
+        extractCallContent val
+  where
+    extractCallContent val =
+      case parseEither parseContent val of
+        Right textRes -> pure textRes
+        Left _ -> pure $ TE.decodeUtf8 $ LBS.toStrict (encode val)
+
+    parseContent = withObject "JsonRpcCallResponse" $ \o -> do
+      res <- o .: "result"
+      contentArr <- res .: "content"
+      case contentArr of
+        (Object firstBlock : _) -> firstBlock .: "text"
+        _ -> pure ""
+
+-- | Convert an MCP Tool descriptor into a native Langchain Tool
+mcpToolToLangchainTool :: McpClient -> McpToolInfo -> Tool IO
+mcpToolToLangchainTool client McpToolInfo {..} =
+  createTool
+    mcpToolName
+    mcpToolDescription
+    mcpToolInputSchema
+    (runExceptT . callMcpTool client mcpToolName)
diff --git a/test/Spec.hs b/test/Spec.hs
new file mode 100644
--- /dev/null
+++ b/test/Spec.hs
@@ -0,0 +1,17 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+module Main (main) where
+
+import qualified Test.Langchain.MCP.McpSpec as McpTest
+import Test.Tasty
+
+main :: IO ()
+main =
+  defaultMain $
+    testGroup
+      "langchain-hs-mcp Test Suite"
+      [ testGroup
+          "MCP Tests"
+          [ McpTest.tests
+          ]
+      ]
diff --git a/test/Test/Langchain/MCP/McpSpec.hs b/test/Test/Langchain/MCP/McpSpec.hs
new file mode 100644
--- /dev/null
+++ b/test/Test/Langchain/MCP/McpSpec.hs
@@ -0,0 +1,36 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+module Test.Langchain.MCP.McpSpec (tests) where
+
+import qualified Data.Aeson as Aeson
+import qualified Data.Text as T
+import Test.Tasty
+import Test.Tasty.HUnit
+
+import Langchain.MCP.Client
+import Langchain.Tool.Core (Tool (..))
+
+tests :: TestTree
+tests =
+  testGroup
+    "Langchain.MCP.McpSpec"
+    [ testCase "newStdioMcpClient initializes transport and server name" $ do
+        let client = newStdioMcpClient "test-mcp" "npx" ["-y", "@modelcontextprotocol/server-everything"]
+        serverName client @?= "test-mcp"
+        clientTransport client @?= StdioTransport "npx" ["-y", "@modelcontextprotocol/server-everything"]
+    , testCase "mcpToolToLangchainTool converts remote tool to callable local Tool" $ do
+        let client = newStdioMcpClient "test-server" "echo" []
+            toolInfo =
+              McpToolInfo
+                { mcpToolName = "echo_tool"
+                , mcpToolDescription = "Echoes inputs"
+                , mcpToolInputSchema = Aeson.object []
+                }
+            langchainTool = mcpToolToLangchainTool client toolInfo
+        toolName langchainTool @?= "echo_tool"
+        toolDescription langchainTool @?= "Echoes inputs"
+        res <- toolExecute langchainTool (Aeson.object [])
+        case res of
+          Left err -> assertFailure ("Tool execution failed: " ++ show err)
+          Right out -> assertBool "Executed stdio tool" ("Executed MCP tool" `T.isInfixOf` out)
+    ]