1 files changed, 10 insertions, 3 deletions

diff --git a/lib/KeyRing/Types.hs b/lib/KeyRing/Types.hs
index 0797dab..3c1f0a5 100644
--- a/lib/KeyRing/Types.hs
+++ b/lib/KeyRing/Types.hs
@@ -1,8 +1,10 @@
-{-# LANGUAGE DeriveFunctor   #-}
-{-# LANGUAGE PatternSynonyms #-}
+{-# LANGUAGE DeriveFunctor     #-}
+{-# LANGUAGE DeriveTraversable #-}
+{-# LANGUAGE PatternSynonyms   #-}
 module KeyRing.Types where
 
 import           Data.Char (isLower,toLower)
+import           Data.Functor
 import           Data.List (groupBy,find)
 import           Data.Map as Map (Map)
 import qualified Data.Map as Map
@@ -272,7 +274,7 @@ data KikiCondition a = KikiSuccess a
     | NoWorkingKey
     | AgentConnectionFailure
     | OperationCanceled
- deriving ( Functor, Show )
+ deriving ( Functor, Foldable, Traversable, Show )
 
 instance FunctorToMaybe KikiCondition where
     functorToMaybe (KikiSuccess a) = Just a
@@ -287,6 +289,11 @@ instance Applicative KikiCondition where
                             Left err -> err
             Left err -> err
 
+instance Monad KikiCondition where
+    return = pure
+    KikiSuccess a >>= f = f a
+    kikiCondition >>= f = kikiCondition <&> error (show (const () <$> kikiCondition) ++ " >>= f")
+
 uncamel :: String -> String
 uncamel str = unwords $ firstWord ++ (toLower .: otherWords) ++ args
   where