added includeTimestamps parameter to reflog tool (false during test); transcript tests

Author: bbarker

unison-cli/src/Unison/MCP/Tools.hs

@@ -736,9 +736,10 @@ reflogTool =
             openWorldHint = Just False
           },
       toolArgType = Proxy,
-      toolHandler = \(ReflogToolArguments {projectContext, scope, limit}) -> handleToolError $ do
+      toolHandler = \(ReflogToolArguments {projectContext, scope, limit, includeTimestamps}) -> handleToolError $ do
         let limitVal = fromMaybe 100 limit
             scopeVal = fromMaybe "branch" scope
+            includeTs = fromMaybe True includeTimestamps
         Env {codebase} <- ask
 
         -- Resolve project and branch from context
@@ -759,7 +760,7 @@ reflogTool =
                   Nothing -> pure []
                   Just branch -> Codebase.getProjectBranchReflog (limitVal + 1) branch.branchId
               -- Convert entries to JSON-friendly format
-              pure $ map (reflogEntryToJSON schLength) rawEntries
+              pure $ map (reflogEntryToJSON includeTs schLength) rawEntries
 
         let hasMore = length entries > limitVal
             finalEntries = take limitVal entries
@@ -771,16 +772,16 @@ reflogTool =
         pure $ textToolResult $ Text.decodeUtf8 . BL.toStrict $ Aeson.encode response
     }
 
-reflogEntryToJSON :: Int -> ProjectReflog.Entry Project ProjectBranch CausalHash -> Aeson.Value
-reflogEntryToJSON schLength entry =
-  Aeson.object
+reflogEntryToJSON :: Bool -> Int -> ProjectReflog.Entry Project ProjectBranch CausalHash -> Aeson.Value
+reflogEntryToJSON includeTimestamps schLength entry =
+  Aeson.object $
     [ "project" Aeson..= (into @Text $ entry.project.name),
       "branch" Aeson..= (into @Text $ entry.branch.name),
-      "time" Aeson..= iso8601Show entry.time,
       "fromHash" Aeson..= fmap (("#" <>) . SCH.toText . SCH.fromHash schLength) entry.fromRootCausalHash,
       "toHash" Aeson..= (("#" <>) . SCH.toText . SCH.fromHash schLength $ entry.toRootCausalHash),
       "reason" Aeson..= entry.reason
     ]
+      <> ["time" Aeson..= iso8601Show entry.time | includeTimestamps]
 
 historyTool :: Tool MCP
 historyTool =

unison-cli/src/Unison/MCP/Types.hs

@@ -960,7 +960,8 @@ instance FromJSON DeleteNamespaceToolArguments where
 data ReflogToolArguments = ReflogToolArguments
   { projectContext :: ProjectContext,
     scope :: Maybe Text, -- "branch" | "project" | "global", default "branch"
-    limit :: Maybe Int
+    limit :: Maybe Int,
+    includeTimestamps :: Maybe Bool -- default True
   }
   deriving (Eq, Show)
 
@@ -981,6 +982,11 @@ instance HasInputSchema ReflogToolArguments where
                 .= object
                   [ "type" .= ("integer" :: Text),
                     "description" .= ("Maximum number of entries to return. Default is 100." :: Text)
+                  ],
+              "includeTimestamps"
+                .= object
+                  [ "type" .= ("boolean" :: Text),
+                    "description" .= ("Whether to include timestamps in the output. Default is true." :: Text)
                   ]
             ],
         "required" .= ["projectContext" :: Text]
@@ -991,7 +997,8 @@ instance FromJSON ReflogToolArguments where
     projectContext <- o .: "projectContext"
     scope <- o .:? "scope"
     limit <- o .:? "limit"
-    pure $ ReflogToolArguments {projectContext, scope, limit}
+    includeTimestamps <- o .:? "includeTimestamps"
+    pure $ ReflogToolArguments {projectContext, scope, limit, includeTimestamps}
 
 -- | Arguments for the history tool
 data HistoryToolArguments = HistoryToolArguments

unison-src/transcripts/idempotent/mcp.md

@@ -824,3 +824,104 @@ RESPONSE:
   }
 
 ```
+
+## reflog
+
+First, set up a branch with some changes to create reflog entries:
+
+``` ucm
+scratch/reflog-test> builtins.merge lib.builtins
+
+  Done.
+```
+
+``` unison :hide
+reflogTestTerm = 1
+```
+
+``` ucm
+scratch/reflog-test> update
+
+  Okay, I'm searching the branch for code that needs to be
+  updated...
+
+  Done.
+```
+
+Now get the reflog:
+
+``` api
+POST /mcp
+BODY:
+  {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "method": "tools/call",
+    "params": {
+      "name": "reflog",
+      "arguments": {
+        "projectContext": {
+          "projectName": "scratch",
+          "branchName": "reflog-test"
+        },
+        "scope": "branch",
+        "limit": 5,
+        "includeTimestamps": false
+      }
+    }
+  }
+
+RESPONSE:
+  {
+      "id": 1,
+      "jsonrpc": "2.0",
+      "result": {
+          "content": [
+              {
+                  "text": "{\"entries\":[{\"branch\":\"reflog-test\",\"fromHash\":\"#btddbo4t1j\",\"project\":\"scratch\",\"reason\":\"update\",\"toHash\":\"#6bknb5j9uv\"},{\"branch\":\"reflog-test\",\"fromHash\":\"#sg60bvjo91\",\"project\":\"scratch\",\"reason\":\"builtins.merge scratch/reflog-test:lib.builtins\",\"toHash\":\"#btddbo4t1j\"},{\"branch\":\"reflog-test\",\"fromHash\":null,\"project\":\"scratch\",\"reason\":\"Branch Created\",\"toHash\":\"#sg60bvjo91\"}],\"hasMore\":false}",
+                  "type": "text"
+              }
+          ],
+          "isError": false
+      }
+  }
+
+```
+
+## history
+
+``` api
+POST /mcp
+BODY:
+  {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "method": "tools/call",
+    "params": {
+      "name": "history",
+      "arguments": {
+        "projectContext": {
+          "projectName": "scratch",
+          "branchName": "reflog-test"
+        },
+        "limit": 5
+      }
+    }
+  }
+
+RESPONSE:
+  {
+      "id": 1,
+      "jsonrpc": "2.0",
+      "result": {
+          "content": [
+              {
+                  "text": "{\"errorMessages\":[],\"outputMessages\":[\"Note: The most recent namespace hash is immediately below this message.\\n\\n⊙ 1. #6bknb5j9uv\\n\\n  + Adds / updates:\\n  \\n    reflogTestTerm\\n\\n□ 2. #btddbo4t1j (start of history)\"],\"sourceCodeUpdates\":[],\"stderr\":\"\",\"stdout\":\"\"}",
+                  "type": "text"
+              }
+          ],
+          "isError": false
+      }
+  }
+
+```