Slim/0.0.17 (#267)

* Fix camel-case issue for _
* new version of filesystem for Windows

Author: slimslenderslacks

deps-lock.json

@@ -26,9 +26,9 @@
     {
       "lib": "io.github.slimslenderslacks/lsp4clj",
       "url": "https://github.com/slimslenderslacks/lsp4clj.git",
-      "rev": "04390f9b1dcf0946dff335b48951617bc6bf6a9d",
+      "rev": "80f8facfadc4933ae12687087d7713d134f45a96",
       "git-dir": "https/github.com/slimslenderslacks/lsp4clj",
-      "hash": "sha256-LtBVHKhOsn6L8arX0AWuNnsz5YWT1dypmZFxosJ6rzQ="
+      "hash": "sha256-J3t25kzwBgslrktJBrPE6e03moG+2f+7z/ei5WkgRfA="
     }
   ],
   "mvn-deps": [

deps.edn

@@ -14,7 +14,7 @@
         org.clojure/core.async {:mvn/version "1.6.681"}
         org.babashka/http-client {:mvn/version "0.4.12"}
         com.taoensso/timbre {:mvn/version "5.2.1"}
-        io.github.slimslenderslacks/lsp4clj {:git/sha "04390f9b1dcf0946dff335b48951617bc6bf6a9d"}
+        io.github.slimslenderslacks/lsp4clj {:git/sha "80f8facfadc4933ae12687087d7713d134f45a96"}
         funcool/promesa {:mvn/version "9.0.470"}
         borkdude/dynaload {:mvn/version "0.3.5"}}
  :aliases {:main {:main-opts ["-m" "docker.main"]}

dev/catalog.clj

@@ -78,8 +78,8 @@
   (spit "servers.edn" (pr-str (into [] (map name (keys (:registry catalog))))))
   (string/join "," (->> (:registry catalog) keys (map name)))
 
-  (->> (-> catalog :registry vals) 
-       (map :config )
+  (->> (-> catalog :registry vals)
+       (map :config)
        (filter seq)
        count)
 
@@ -105,9 +105,9 @@
                                (fs/file (:path k))
                                (git/ref-map->prompt-file k))}))))
 
-  (f->prompt (fs/file "prompts/mcp/notion.md") )
-  (f->prompt (fs/file "prompts/mcp/multiversx-mx.md") )
-  (f->prompt (fs/file "prompts/mcp/elasticsearch.md") )
+  (f->prompt (fs/file "prompts/mcp/notion.md"))
+  (f->prompt (fs/file "prompts/mcp/multiversx-mx.md"))
+  (f->prompt (fs/file "prompts/mcp/elasticsearch.md"))
 
   ;; parse all of the current git prompts
   (def local-prompt-files-parsed
@@ -125,20 +125,36 @@
          (map (fn [m] [(-> m :ref :ref-string) (secrets (:prompt m))]))
          (into {})))
 
+  (first local-prompt-files-parsed)
+  (def volume-summary
+    (->> local-prompt-files-parsed
+         (filter #(or (->> % :prompt :metadata :mcp (some (fn [x] (-> x :container :volumes))))
+                      (->> % :prompt :functions (some (fn [x] (-> x :function :container :volumes))))))
+         (map (fn [m] [(-> m :ref :ref-string)
+                       (->> m :prompt ((fn [prompt]
+                                          (cond
+                                            (-> prompt :metadata :mcp) (->> prompt
+                                                                            :metadata
+                                                                            :mcp
+                                                                            (map (fn [x] (-> x :container :volumes))))
+                                            (-> prompt :functions) (->> prompt
+                                                                        :functions
+                                                                        (map (fn [x] (-> x :function :container :volumes))))))))]))
+         (into {})))
+
   ;; secret summary
   (def secrets
     (->> container-summary
          vals
          (mapcat #(->> % (map (comp :secrets :container))))
          (filter seq)))
 
-  (->> secrets 
+  (->> secrets
        (mapcat keys)
        (map name)
-       (string/join ",")
-       )
+       (string/join ","))
 
-  ;; summary
+;; summary
   (->> container-summary
        (mapcat (fn [[k v]] (->> v (map (fn [m]
                                          {:image (-> m :container :image)

docs/content/tools/docs/authoring-prompts.md

@@ -195,3 +195,11 @@ parameter-values:
   user: slimslenderslacks
 ---
 ```
+
+### volumes
+
+* easist is to use docker volumes
+* using `"{{config|volume|into}}"`
+    * needs `"{{config|volume-target|into}}"` for wsl2 - to send the mappings
+* using combination of `volume` and `environment` when the app supports it
+

prompts/mcp/filesystem.md

@@ -6,7 +6,7 @@ mcp:
       volumes:
         - "{{filesystem.paths|volume|into}}"
       command:
-        - "{{filesystem.paths|into}}"
+        - "{{filesystem.paths|volume-target|into}}"
     source:
       url: https://github.com/modelcontextprotocol/servers/tree/2025.4.6
 parameter-values:

runbook.md

@@ -20,7 +20,7 @@ docker pull mcp/docker:prerelease
 
 ```sh
 # docker:command=build-release
-VERSION="0.0.16"
+VERSION="0.0.17"
 docker buildx build \
     --builder hydrobuild \
     --platform linux/amd64,linux/arm64 \

src/extension/Makefile

@@ -1,5 +1,5 @@
 IMAGE?=docker/labs-ai-tools-for-devs
-TAG?=0.2.60
+TAG?=0.2.84
 
 BUILDER=buildx-multi-arch
 

src/extension/docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
   mcp_docker:
-    image: mcp/docker:0.0.16
+    image: mcp/docker:0.0.17
     ports:
       - 8811:8811
     volumes:

src/interpolate.clj

@@ -2,6 +2,7 @@
   (:require
    [cheshire.core :as json]
    [clojure.edn :as edn]
+   [clojure.string :as string]
    [selmer.filters :as filters]
    [selmer.parser :as selmer]))
 
@@ -12,21 +13,32 @@
                                [:safe [:coll (into [] v)]]
                                v)))
 
+(defn parse-path [s]
+  (when s
+    (if-let [[_ drive path] (re-find #"(\p{Alpha}):(.*)" s)]
+      {:source s
+       :target (format "/drive/%s%s" (string/lower-case drive) (string/replace path #"\\" "/"))}
+      {:source s
+       :target s})))
+
+(defn format-volume [{:keys [source target]}]
+  (format "%s:%s" source target))
+
 (filters/add-filter! :volume (fn [v]
                                (if (coll? v)
-                                 (->> v (map #(format "%s:%s" % %)) (into []))
-                                 (format "%s:%s" v v))))
+                                 (->> v (map parse-path) (map format-volume) (into []))
+                                 (-> v parse-path format-volume))))
+
+(filters/add-filter! :volume-target (fn [v]
+                                      (if (coll? v)
+                                        (->> v (map parse-path) (map :target) (into []))
+                                        (-> v parse-path :target))))
 
 (filters/add-filter! :or (fn [v s]
                            (if (or (nil? v) (= "" v))
                              []
                              v)))
 
-(comment
-  "this allows us to expand strings into lists of strings to be spread into container definitions"
-  (selmer/render "{{hello.you|volume|into}}" {:hello {:you ["yes" "no"]}})
-  (selmer/render "{{hello.you|volume|into}}" {}))
-
 (defn interpolate [m template]
   (when-let [s (selmer/render template m {})]
     (if-let [parsed (try (edn/read-string s) (catch Throwable _ nil))]
@@ -57,8 +69,8 @@
              (dissoc defaults :functions)
              (when (-> definition :container :command)
                {:command (interpolate-coll
-                           (-> definition :container :command)
-                           arg-context)})
+                          (-> definition :container :command)
+                          arg-context)})
              (when (-> definition :container :entrypoint)
                {:entrypoint (->> (-> definition :container :entrypoint)
                                  (map (fn [s] (first (interpolate arg-context s))))

src/jsonrpc/server.clj

@@ -72,11 +72,11 @@
 
   ;; merges client-info capabilities and client protocol-version
   (swap! db* assoc-in [:servers server-id] params)
-  {:protocol-version "2024-11-05"
+  {:protocolVersion "2024-11-05"
    :capabilities {:prompts {:listChanged true}
                   :tools {:listChanged true}
                   :resources {:listChanged true}}
-   :server-info {:name "docker-mcp-server"
+   :serverInfo {:name "docker-mcp-server"
                  :version "0.0.1"}})
 
 (defmethod lsp.server/receive-notification "notifications/initialized" [_ {:keys [db* server server-id]} _]
@@ -207,7 +207,7 @@
 
 (defmethod lsp.server/receive-request "resources/subscribe" [_ _ params]
   (logger/info "resources/subscribe" params)
-  {:resource-templates []})
+  {:resourceTemplates []})
 
 ;; -----------------
 ;; MCP Tools
@@ -343,6 +343,12 @@
       (apply log-wrapper-fn log-args)
       (recur))))
 
+(defn ^:private monitor-audit-logs [audit-ch]
+  (async/go-loop []
+    (when-let [log-args (async/<! audit-ch)]
+      (apply log-wrapper-fn log-args)
+      (recur))))
+
 (defn initialize-prompts [opts]
   ;; initialize mcp cache
   (client/initialize-cache)
@@ -366,7 +372,8 @@
    (let [timbre-logger (logger/->TimbreLogger)
          log-path (logger/setup timbre-logger)
          db* db/db*
-         log-ch (async/chan (async/sliding-buffer 20))]
+         log-ch (async/chan (async/sliding-buffer 20))
+         audit-ch (async/chan)]
      ;; add option map and log-path to the db
      (swap! db* merge {:log-path log-path} (dissoc opts :in))
      ;; initialize shutdown hook
@@ -381,12 +388,14 @@
       jsonrpc.prompt-change-events/markdown-tool-updated)
      ;; monitor our log channel (used by all chan servers)
      (monitor-server-logs log-ch)
+     (monitor-audit-logs audit-ch)
      ;; this won't do anything if nrepl is not present
      (nrepl/setup-nrepl)
      ;; common server opts
      (merge
       {;:keyword-function identity
        :log-ch log-ch
+       :audit-ch audit-ch
        :trace-ch log-ch
        :trace-level trace-level
        :keyword-function keyword

test/interpolate_t.clj

@@ -2,17 +2,29 @@
   (:require
    [cheshire.core :as json]
    [clojure.test :as t]
-   [interpolate]))
+   [interpolate]
+   [selmer.parser :as selmer]))
 
 (t/deftest container-defintion-tests
   (t/is 
     (=
-     {:command []
-      :environment {"YES" "yes"}}
+     {:environment {"YES" "yes"}}
      (interpolate/container-definition
        {:container
         {:environment
          {"YES" "{{data.yes}}"
           "NO" "{{data.no}}"}}} 
        {} 
        (json/generate-string {:data {:yes "yes"}})))))
+
+(comment
+  "this allows us to expand strings into lists of strings to be spread into container definitions"
+  (selmer/render "{{hello.you|volume|into}}" {:hello {:you ["yes" "no"]}})
+  (selmer/render "{{hello.you|volume|into}}" {:hello {:you ["/Users/slim" "/Users/slim/Desktop"]}})
+  (selmer/render "{{hello.you|volume-target|into}}" {:hello {:you ["C:\\hello" "C:\\goodbye"]}})
+  (selmer/render "{{hello.you|volume|into}}" {:hello {:you ["C:\\hello" "C:\\goodbye"]}})
+  (selmer/render "{{hello.you|volume|into}}" {}))
+
+;; usually volume|into
+;; 
+