Slim/stateful (#68)

* Support long-running stateful servers
* Fix environment schema
* Check for divergent branches
* Add or for blank interpolations
* Update cache keys to be the whole container def

Author: slimslenderslacks

cleanup-images.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# Script to find and remove all Docker images from the vonwig or mcp namespaces
+# Usage: ./docker-namespace-cleanup.sh
+
+echo "Finding Docker images from 'vonwig' and 'mcp' namespaces..."
+
+# Get all images that match either namespace
+# Using grep to filter for images that contain vonwig or mcp in their repository names
+vonwig_images=$(docker images | grep 'vonwig' | awk '{print $1":"$2}')
+mcp_images=$(docker images | grep 'mcp' | awk '{print $1":"$2}')
+
+# Combine the lists
+all_matched_images="$vonwig_images $mcp_images"
+
+# Check if any images were found
+if [ -z "$all_matched_images" ]; then
+    echo "No Docker images found from 'vonwig' or 'mcp' namespaces."
+    exit 0
+fi
+
+# Count found images
+image_count=$(echo "$all_matched_images" | wc -w)
+echo "Found $image_count images to remove."
+
+# Ask for confirmation before removing
+read -p "Do you want to proceed with removal? (y/n): " confirm
+if [[ "$confirm" != "y" && "$confirm" != "Y" ]]; then
+    echo "Operation cancelled."
+    exit 0
+fi
+
+# Iterate through each image and remove it
+echo "Removing Docker images..."
+for image in $all_matched_images; do
+    echo "Removing image: $image"
+    docker rmi -f "$image"
+done
+
+echo "All matching Docker images have been removed."

deps-lock.json

@@ -72,6 +72,16 @@
       "mvn-repo": "https://repo.clojars.org/",
       "hash": "sha256-Ijax5VAq9/FFnKomP+huFSOKh/HWGiwXLAZty/1iwo8="
     },
+    {
+      "mvn-path": "borkdude/dynaload/0.3.5/dynaload-0.3.5.jar",
+      "mvn-repo": "https://repo.clojars.org/",
+      "hash": "sha256-CIfAzbmvzs18SW6iWKMuQ6py52bz8GMuG9D1JFyowkw="
+    },
+    {
+      "mvn-path": "borkdude/dynaload/0.3.5/dynaload-0.3.5.pom",
+      "mvn-repo": "https://repo.clojars.org/",
+      "hash": "sha256-XBwijxopsG0KfQNJD15k+vcTo8YWcpi6Fxz/wzz57Rg="
+    },
     {
       "mvn-path": "camel-snake-kebab/camel-snake-kebab/0.4.3/camel-snake-kebab-0.4.3.jar",
       "mvn-repo": "https://repo.clojars.org/",
@@ -92,6 +102,26 @@
       "mvn-repo": "https://repo.clojars.org/",
       "hash": "sha256-LaaIDz3x3lGTb/GfarGHaT5MAc3MVCiFWE5Z85qs6z4="
     },
+    {
+      "mvn-path": "cider/cider-nrepl/0.47.1/cider-nrepl-0.47.1.jar",
+      "mvn-repo": "https://repo.clojars.org/",
+      "hash": "sha256-Jd/9suFKMi/vs+Qg/Eyole6eg52Do7Qcm8AuEU6/k5Q="
+    },
+    {
+      "mvn-path": "cider/cider-nrepl/0.47.1/cider-nrepl-0.47.1.pom",
+      "mvn-repo": "https://repo.clojars.org/",
+      "hash": "sha256-wqnXFQ7ux9mx57/czHmWFj7bGA/Fo8tEUGRRCYvL5/s="
+    },
+    {
+      "mvn-path": "cider/orchard/0.23.3/orchard-0.23.3.jar",
+      "mvn-repo": "https://repo.clojars.org/",
+      "hash": "sha256-HCBow7MARg+qaAC/KuuOgUqWBmzj6D5RuG7x+hIDtO4="
+    },
+    {
+      "mvn-path": "cider/orchard/0.23.3/orchard-0.23.3.pom",
+      "mvn-repo": "https://repo.clojars.org/",
+      "hash": "sha256-44cVYzDbmG7P6jkWRo+B8wK32Ffr9lu8DMy31g6hAp4="
+    },
     {
       "mvn-path": "clj-commons/clj-yaml/1.0.28/clj-yaml-1.0.28.jar",
       "mvn-repo": "https://repo.clojars.org/",
@@ -517,6 +547,16 @@
       "mvn-repo": "https://repo1.maven.org/maven2/",
       "hash": "sha256-Rm9ue5kB6VKuGtJPDpSUpWgJYfBOQiObWuZOjcr2KXo="
     },
+    {
+      "mvn-path": "mx/cider/logjam/0.3.0/logjam-0.3.0.jar",
+      "mvn-repo": "https://repo.clojars.org/",
+      "hash": "sha256-h1moSv+GjTrjwDEil7l6psf7j5NUK39llkv5kT9K4J8="
+    },
+    {
+      "mvn-path": "mx/cider/logjam/0.3.0/logjam-0.3.0.pom",
+      "mvn-repo": "https://repo.clojars.org/",
+      "hash": "sha256-k9fFPsmXKX/14Z92LgY8cFtCu8jmbBE/DCbyRWK1D6Q="
+    },
     {
       "mvn-path": "net/java/dev/jna/jna-platform/5.15.0/jna-platform-5.15.0.jar",
       "mvn-repo": "https://repo1.maven.org/maven2/",
@@ -547,6 +587,16 @@
       "mvn-repo": "https://repo1.maven.org/maven2/",
       "hash": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo="
     },
+    {
+      "mvn-path": "nrepl/nrepl/1.0.0/nrepl-1.0.0.jar",
+      "mvn-repo": "https://repo.clojars.org/",
+      "hash": "sha256-owuXNP8uY582Xw11U7SHcwbypUPPAh4pnRW/HqvWpbs="
+    },
+    {
+      "mvn-path": "nrepl/nrepl/1.0.0/nrepl-1.0.0.pom",
+      "mvn-repo": "https://repo.clojars.org/",
+      "hash": "sha256-dHN5LZGfjodYUES5nySqLqFVNCBgRI2opHhGvkXz2nI="
+    },
     {
       "mvn-path": "org/apache/apache/18/apache-18.pom",
       "mvn-repo": "https://repo1.maven.org/maven2/",

deps.edn

@@ -14,7 +14,10 @@
         org.babashka/http-client {:mvn/version "0.4.12"}
         com.taoensso/timbre {:mvn/version "5.2.1"}
         io.github.slimslenderslacks/lsp4clj {:git/sha "04390f9b1dcf0946dff335b48951617bc6bf6a9d"}
-        funcool/promesa {:mvn/version "9.0.470"}}
+        funcool/promesa {:mvn/version "9.0.470"}
+        borkdude/dynaload {:mvn/version "0.3.5"}}
  :aliases {:main {:main-opts ["-m" "docker.main"]}
            :build {:ns-default build
-                   :deps {io.github.clojure/tools.build {:git/tag "v0.9.5" :git/sha "24f2894"}}}}}
+                   :deps {io.github.clojure/tools.build {:git/tag "v0.9.5" :git/sha "24f2894"}}}
+           :main-repl {:main-opts ["-m" "docker.main"]
+                       :extra-deps {cider/cider-nrepl {:mvn/version "0.47.1"}}}}}

dev/catalog.clj

@@ -25,10 +25,12 @@
       (println t))))
 
 (defn f->prompt [f]
-  (prompts/get-prompts {:prompts f}))
+  (try (prompts/get-prompts {:prompts f}) (catch Throwable t (println t) {})))
 
 (defn tile-metadata [m]
-  {:tools (-> m :functions)
+  {:tools (->> (:functions m)
+               (map #(select-keys [:name] (:function %)))
+               (into []))
    :prompts (count (:messages m))
    :resources (or (:resources m) {})})
 
@@ -54,7 +56,7 @@
 (comment
   ;; setup stdout logger
   (repl/setup-stdout-logger)
-
+  (generate-updated-catalog)
   ;; parse catalog
   (def catalog (yaml/parse-string (slurp "prompts/catalog.yaml")))
 

dev/socket_client.clj

@@ -0,0 +1,37 @@
+(ns socket-client
+  (:require
+   [cheshire.core :as json]
+   [clojure.core.async :as async]
+   [clojure.java.io :as io]) 
+  (:import
+   [java.io BufferedInputStream]
+   [java.net Socket]))
+
+(def socket (Socket. "localhost" 8811))
+
+(def reader (io/reader (BufferedInputStream. (.getInputStream socket))))
+
+(async/thread
+  (loop []
+    (let [line (.readLine reader)]
+      (when line
+        (println line)
+        (recur)))))
+
+(def writer (io/writer (.getOutputStream socket)))
+
+(defn send [m]
+  (.write writer (json/generate-string m))
+  (.write writer "\n")
+  (.flush writer))
+
+(send {:jsonrpc "2.0" :method "initialize" :id 0 :params {:protocolVersion "2024-11-05"
+                                                          :capabilities {:roots {}} 
+                                                          :client-info {:name "Socket Client" :version "0.1"}}})
+
+(send {:jsonrpc "2.0" :method "notifications/initialized" :params {}})
+
+(send {:jsonrpc "2.0" :id 1 :result {:roots [{:uri "file:///Users/slim" :name "home-directory"}]}})
+
+(.close socket)
+

prompts/mcp/openapi-schema.md

@@ -4,6 +4,6 @@ mcp:
       image: vonwig/openapi-schema:latest
       workdir: /app
       volumes:
-        - "{{openApiSchemaPath}}:{{openApiSchemaPath}}"
+        - "{{openApiSchemaPath|or:[]|volume|into}}"
 ---
 

remove-secrets.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Script to remove all Docker secrets
+# Usage: ./docker-secret-cleanup.sh
+
+echo "Retrieving list of Docker secrets..."
+
+# Get the list of secrets (assuming the output format has the secret name as the first column)
+secrets=$(docker x secret list | awk 'NR>1 {print $1}')
+
+# Check if any secrets were found
+if [ -z "$secrets" ]; then
+    echo "No Docker secrets found."
+    exit 0
+fi
+
+# Iterate through each secret and remove it
+echo "Removing Docker secrets..."
+for secret in $secrets; do
+    echo "Removing secret: $secret"
+    docker x secret rm "$secret"
+done
+
+echo "All Docker secrets have been removed."

runbook.md

@@ -20,7 +20,7 @@ docker pull mcp/docker:prerelease
 
 ```sh
 # docker:command=build-release
-VERSION="0.0.7"
+VERSION="0.0.8"
 docker buildx build \
     --builder hydrobuild \
     --platform linux/amd64,linux/arm64 \
@@ -35,7 +35,7 @@ docker run --rm -t --init -v docker-prompts:/prompts alpine:latest tail -f /prom
 ```
 
 ```sh
-clj -M:main serve --mcp --port 8811 --register "github:docker/labs-ai-tools-for-devs?path=prompts/bootstrap.md"
+clj -M:main-repl serve --mcp --port 8811
 ```
 
 ```sh

src/docker.clj

@@ -354,7 +354,14 @@
                                            (or (:entrypoint container-definition) Entrypoint) 
                                            (or (:command container-definition) Cmd)))]
     (-> container-definition
-        (assoc :entrypoint ["/bin/sh" "-c" (injected-entrypoint (:secrets container-definition) Env real-entrypoint)])
+        (assoc :entrypoint ["/bin/sh" "-c" (injected-entrypoint 
+                                             (:secrets container-definition) 
+                                             (concat
+                                               Env
+                                               (->> (:environment container-definition)
+                                                    (map (fn [[k v]] (format "%s=%s" k v)))
+                                                    (into []))) 
+                                             real-entrypoint)])
         (dissoc :command))))
 
 (defn run-streaming-function-with-no-stdin

src/extension/docker-compose.yaml

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