Update explain dockerfile prompt

Author: slimslenderslacks

docs/content/tools/quickstsart_cursor.md

@@ -13,7 +13,7 @@ weight: 3
 
    ![Claude Features](claude_features.png)
 
-2. Copy and paste the following string into the field labeled "Command".
+2. Choose `Command` mode and then copy and paste the following string into the field labeled "Command".
 
    ```
    docker run -i --rm -v /var/run/docker.sock:/var/run/docker.sock --mount type=volume,source=docker-prompts,target=/prompts mcp/docker:latest serve --mcp --register github:docker/labs-ai-tools-for-devs?path=prompts/bootstrap.md
@@ -23,6 +23,10 @@ weight: 3
 
    ![Claude Tools](claude_tools.png)
 
+{{< callout type="info" >}}
+After updating the list of tools, users must click the refresh button to activate new tool definitions
+{{< /callout >}}
+
 
 ## Use tools from compose agent
 

prompts/examples/explain_dockerfile.md

@@ -1,12 +1,5 @@
 ---
-name: explain_dockerfile
-description: |
-    Provide a detailed description, analysis, or annotation of a given Dockerfile,
-    explaining its structure and functionality.
-
-    Synonyms: explain my Dockerfile, annotate this Dockerfile...
-
-    This tool can explain a pre-provided Dockerfile but it can also fetch the Dockerfile from the user's workspace.
+name: docker prompts
 model: claude-3-5-sonnet-20241022
 tools:
   - name: cat_file
@@ -30,7 +23,18 @@ arguments:
     required: true
 ---
 
-# prompt user
+# prompt explain dockerfile
+
+## description
+
+Provide a detailed description, analysis, or annotation of a given Dockerfile,
+explaining its structure and functionality.
+
+Synonyms: explain my Dockerfile, annotate this Dockerfile...
+
+This tool can explain a pre-provided Dockerfile but it can also fetch the Dockerfile from the user's workspace.
+
+## content
 
 Start by fetching the Dockerfile located at the path {{path}}.
 

prompts/examples/qrencode.md

@@ -13,6 +13,12 @@ parameter-values:
 
 # prompt
 
+## description
+
+Generate a QR code
+
+## content
+
 Generate a QR code for the content '{{content}}' and write the output to the file `/thread/qrcode.png`.
 If the command fails, read the man page and try again.
 If successful, output the path to the generated image in markdown syntax.

src/jsonrpc/server.clj

@@ -96,10 +96,15 @@
                 :total 0
                 :hasMore false}})
 
-(defn entry->prompt-listing [k v _messages]
-  (merge
-   {:name (str k)}
-   (select-keys (:metadata v) [:description :arguments])))
+(defn entry->prompt-listing [k v message]
+  (let [{:keys [description arguments]} (:metadata v)]
+    (merge
+     {:name (if (:title message)
+              (str k ":" (:title message))
+              k)
+      :description (or (:description message) description "missing description")}
+     (when arguments
+       {:arguments arguments}))))
 
 (defmethod lsp.server/receive-request "prompts/list" [_ {:keys [db*]} params]
   ;; TODO might contain a cursor

src/markdown.clj

@@ -31,18 +31,33 @@
          (update 0 (fn [s] (.substring ^String s (dec c1))))
          (update (dec (count lines)) (fn [s] (.substring ^String s 0 (- c2 c1))))))))
 
+(defn parse-h1 [s]
+  (when s
+    (let [[t1 t2 & tokens :as h1] (string/split (string/trim s) #"\s+")]
+      (cond
+        ;; prompt is the first token
+        (and t1 (= "prompt" (string/lower-case t1)))
+        (merge
+         {:role (or (#{"user" "system"} t2) "user")}
+         (let [v (concat (if (#{"user" "system"} t2) [] (when t2 [t2])) tokens)]
+           (when (seq v)
+             {:title (string/join " " v)})))
+
+        ;; prompt is the second token
+        (and t2 (= "prompt" (string/lower-case t2)))
+        (merge
+         {:role t1}
+         (when (seq tokens) {:title (string/join " " tokens)}))))))
+
 (def prompt-pattern-with-role-capture #"(?i)\s*prompt\s+(\w+)\s?")
 (def prompt-pattern #"(?i)\s*prompt\s?(\w+)?\s?")
 
 (defn extract-role [s]
-  (second
-   (re-find prompt-pattern-with-role-capture s)))
+  (:role (parse-h1 s)))
 
 ;; headings that include the word Prompt
 (defn prompt-section? [content node]
-  (re-matches
-   prompt-pattern
-   (-> node (nth 2) (nth 3) (nth 1) (from-range content))))
+  (parse-h1 (-> node (nth 2) (nth 3) (nth 1) (from-range content))))
 
 (defn remove-first-line [s]
   (->> (string/split s #"\n")
@@ -51,18 +66,66 @@
 
 ;; extract Role from Prompt ....
 (defn node-content [content node]
-  {:role
-   (or (-> node (nth 2) (nth 3) (nth 1) (from-range content) (extract-role)) "user")
-   :content
-   (remove-first-line (from-range (nth node 1) content))})
-
-(comment
-  (extract-role "prompt user")
-  (extract-role "prompt")
-  (extract-role "prompt user and more")
-  (re-matches prompt-pattern "prompt")
-  (re-matches prompt-pattern "prompt user")
-  (re-matches prompt-pattern "prompt user"))
+  (merge
+   (-> node (nth 2) (nth 3) (nth 1) (from-range content) (parse-h1))
+    ;; TODO merge a description and filter node content
+   {:content
+    (remove-first-line (from-range (nth node 1) content))}))
+
+(defn section? [node]
+  (and (list? node) (= "section" (first node))))
+
+(defn description-section? [content node]
+  (when-let [atx-header-node (first (filter #(= "atx_heading" (first %)) node))]
+    (println "trimmed " (string/trim (from-range (-> atx-header-node (nth 3) (nth 1)) content)))
+    (= "description"  (string/trim (from-range (-> atx-header-node (nth 3) (nth 1)) content)))))
+
+(defn atx-heading-section? [node]
+  (= "atx_heading" (first node)))
+
+(defn remove-section-content [content s node]
+  (if (and (list? node) (= "atx_heading" (first node)))
+    (string/replace s (from-range (nth node 1) content) "")
+    s))
+
+(defn section-content-without-headings [content node]
+  (reduce
+   (partial remove-section-content content)
+   (from-range (nth node 1) content)
+   (seq node)))
+
+(defn h1-prompt-content [content node]
+  (merge
+   (-> node (nth 2) (nth 3) (nth 1) (from-range content) (parse-h1))
+    ;; TODO merge a description and filter node content
+   (if (some section? node)
+     (merge
+      {:content (->> node
+                     (filter section?)
+                     (filter (complement (partial description-section? content)))
+                     #_(filter (complement atx-heading-section?))
+                     (map (partial section-content-without-headings content))
+                     (apply str)
+                     (string/trim))}
+      (when-let [description (->> node
+                                  (filter section?)
+                                  (filter (partial description-section? content))
+                                  first
+                                  (section-content-without-headings content)
+                                  (string/trim))]
+        {:description description}))
+     {:content (string/trim (section-content-without-headings content node))})))
+
+(def heading-1-loc->top-level-section-node (comp zip/node zip/up zip/up))
+
+(defn extract-prompts-with-descriptions [content ast]
+  (->>
+   (iterate zip/next (zip/seq-zip ast))
+   (take-while (complement zip/end?))
+   (filter heading-1-section?)
+   (map heading-1-loc->top-level-section-node)
+   (filter (partial prompt-section? content))
+   (map (partial h1-prompt-content content))))
 
 (defn extract-prompts [content ast]
   (->>
@@ -101,37 +164,17 @@
 (defn extract-first-comment [content ast]
   (try
     (when-let [loc (->>
-                     (iterate zip/next (zip/seq-zip ast))
-                     (take-while (complement zip/end?))
-                     (some (fn [loc] (when (html-comment? loc) loc))))]
+                    (iterate zip/next (zip/seq-zip ast))
+                    (take-while (complement zip/end?))
+                    (some (fn [loc] (when (html-comment? loc) loc))))]
       (->
-        (from-range (-> loc zip/node second) content)
-        (remove-markers)
-        (clj-yaml/parse-string)))
+       (from-range (-> loc zip/node second) content)
+       (remove-markers)
+       (clj-yaml/parse-string)))
     (catch Throwable ex
       (println ex)
       nil)))
 
-(defn parse-new [content query]
-  (let [content (str content "\n# END\n\n")
-        x (docker/function-call-with-stdin
-           {:image "vonwig/tree-sitter:latest"
-            :content content
-            :command (concat
-                      ["-lang" "markdown"]
-                      ["-query" query])})
-        {s :pty-output} (async/<!! (async/thread
-                                     (Thread/sleep 10)
-                                     (docker/finish-call x)))]
-    (->> s)))
-
-(comment
-  ; TODO - migrate to tree-sitter queries but can we express this with tree-sitter
-  (parse-new (slurp "./tprompt1.md") "(document) @doc")
-  (json/parse-string (parse-new (slurp "./tprompt1.md") "(document (minus_metadata) @doc)"))
-  (json/parse-string (parse-new (slurp "./tprompt1.md") "(document (section (html_block) @html))"))
-  (json/parse-string (parse-new (slurp "./tprompt1.md") "(document (section (atx_heading (atx_h1_marker)))* @top-section)")))
-
 (defn parse-markdown
   "use the custom sexp representation"
   [content]
@@ -144,56 +187,38 @@
     (->> (edn/read-string s))))
 
 (defn parse-prompts
-  "parse out the h1 prompt sections"
+  "parse out the h1 prompt sections and the metadata"
   [content]
   (let [content (str content "\n# END\n\n")
         ast (parse-markdown content)]
     {:messages
      (->> ast
-          (extract-prompts content)
+          (extract-prompts-with-descriptions content)
           (into []))
-     :metadata  (or 
+     :metadata  (or
                  (extract-metadata content ast)
                  (extract-first-comment content ast)
                  {})}))
 
-(comment
-  (parse-prompts (slurp "./broken.md"))
-  )
+;; ---------- future ---------
 
-(comment
-  ; inline same line !,[,],(,) in that order after filtering out other irrelevant things
-  ; ^ those are imgages and the content between the [ ] should be put into a separate message
-  ; the first minus_metadata block of the doc 
-  ; the first html_block section that ends with --> 
-  ;   get content and then check of --- --- pre-amble
-  ;   then try to parse the yaml out of that
-  (parse-markdown (slurp "./tprompt2.md"))
-  (parse-prompts (slurp "./tprompt1.md"))
-  (parse-prompts (slurp "./tprompt2.md"))
-  )
+(defn parse-new [content query]
+  (let [content (str content "\n# END\n\n")
+        x (docker/function-call-with-stdin
+           {:image "vonwig/tree-sitter:latest"
+            :content content
+            :command (concat
+                      ["-lang" "markdown"]
+                      ["-query" query])})
+        {s :pty-output} (async/<!! (async/thread
+                                     (Thread/sleep 10)
+                                     (docker/finish-call x)))]
+    (->> s)))
 
 (comment
-  (string/split content #"\n")
-
-  (def content (slurp "prompts/qrencode/README.md"))
-  (pprint (parse-markdown content))
-
-  (parse-markdown (slurp "prompts/pylint/docs.md"))
-  (parse-markdown (slurp "prompts/pylint/4-run-violation-insert.md"))
-
-  (def t
-    '("section"
-      "4:1-8:1"
-      ("atx_heading"
-       "4:1-5:1"
-       ("atx_h1_marker" "4:1-4:2")
-       ("inline" "4:3-4:13"))
-      ("paragraph"
-       "6:1-7:1"
-       ("inline" "6:1-6:34" ("," "6:26-6:27") ("?" "6:33-6:34")))))
-
-  (def r "4:3-4:13")
-  (prompt-section? "" t)
-  (from-range "4:3-4:13" content)
-  (from-range "8:1-14:1" content))
+  ; TODO - migrate to tree-sitter queries but can we express this with tree-sitter
+  (parse-new (slurp "./tprompt1.md") "(document) @doc")
+  (json/parse-string (parse-new (slurp "./tprompt1.md") "(document (minus_metadata) @doc)"))
+  (json/parse-string (parse-new (slurp "./tprompt1.md") "(document (section (html_block) @html))"))
+  (json/parse-string (parse-new (slurp "./tprompt1.md") "(document (section (atx_heading (atx_h1_marker)))* @top-section)")))
+

test/jsonrpc/db_t.clj

@@ -1,8 +1,10 @@
 (ns jsonrpc.db-t
   (:require
+   [babashka.fs :as fs]
    [clojure.pprint :refer [pprint]]
    [clojure.test :as t]
-   [jsonrpc.db :as db]))
+   [jsonrpc.db :as db]
+   [lsp4clj.server :as server]))
 
 (def correct-refs
   [[:dynamic
@@ -23,6 +25,16 @@
     (t/is (= correct-refs
              (db/registry-refs "test/registry.yaml")))))
 
+(let []
+  (db/add-refs
+      (concat
+       (->> []
+            (map (fn [ref] [:static ref])))
+         ;; register dynamic prompts
+       (when (fs/exists? (fs/file "test/registry.yaml"))
+         (db/registry-refs "test/registry.yaml"))))
+  (server/receive-request "prompts/list" {:db* db*} {}))
+
 (comment
   (db/add-refs 
     (db/registry-refs "test/registry.yaml"))