support raw mcp servers (#56)

Support refs that proxy mcp servers.  Add secrets to container definitions.

Author: slimslenderslacks

dev/catalog.clj

@@ -3,6 +3,7 @@
    [babashka.fs :as fs]
    [clj-yaml.core :as yaml]
    git
+   [markdown :as markdown-parser]
    [medley.core :as medley]
    prompts))
 
@@ -27,14 +28,25 @@
        (map tile-metadata)))
 
 (spit "catalog.updated.yaml"
-      (yaml/generate-string 
-        (let [catalog (yaml/parse-string (slurp "prompts/catalog.yaml"))]
-          (medley/deep-merge
-            catalog
-            {:registry
-             (->> (apply interleave ((juxt keys (comp extra-metadata vals)) (seq (:registry catalog))))
-                  (partition 2)
-                  (map #(into [] %))
-                  (into {})
-                  )}))))
+      (yaml/generate-string
+       (let [catalog (yaml/parse-string (slurp "prompts/catalog.yaml"))]
+         (medley/deep-merge
+          catalog
+          {:registry
+           (->> (apply interleave ((juxt keys (comp extra-metadata vals)) (seq (:registry catalog))))
+                (partition 2)
+                (map #(into [] %))
+                (into {}))}))))
 
+(def catalog (yaml/parse-string (slurp "prompts/catalog.yaml")))
+(def local-prompt-files
+  (->> catalog
+       :registry
+       vals
+       (map :ref)
+       (map git/prompt-file)))
+
+(map f->prompt local-prompt-files)
+
+(markdown-parser/parse-markdown (slurp "prompts/examples/sequentialthinking.md"))
+(prompts/get-prompts {:prompt-content (slurp "prompts/examples/sequentialthinking.md")})

prompts/examples/sequentialthinking.md

@@ -1,94 +1,95 @@
 ---
 tools:
   - name: sequentialthinking
-    description: |
-A detailed tool for dynamic and reflective problem-solving through thoughts.
-This tool helps analyze problems through a flexible thinking process that can adapt and evolve.
-Each thought can build on, question, or revise previous insights as understanding deepens.
+    description: |-
+      A detailed tool for dynamic and reflective problem-solving through thoughts.
+      This tool helps analyze problems through a flexible thinking process that can adapt and evolve.
+      Each thought can build on, question, or revise previous insights as understanding deepens.
+      
+      When to use this tool:
+      - Breaking down complex problems into steps
+      - Planning and design with room for revision
+      - Analysis that might need course correction
+      - Problems where the full scope might not be clear initially
+      - Problems that require a multi-step solution
+      - Tasks that need to maintain context over multiple steps
+      - Situations where irrelevant information needs to be filtered out
+      
+      Key features:
+      - You can adjust total_thoughts up or down as you progress
+      - You can question or revise previous thoughts
+      - You can add more thoughts even after reaching what seemed like the end
+      - You can express uncertainty and explore alternative approaches
+      - Not every thought needs to build linearly - you can branch or backtrack
+      - Generates a solution hypothesis
+      - Verifies the hypothesis based on the Chain of Thought steps
+      - Repeats the process until satisfied
+      - Provides a correct answer
+      
+      Parameters explained:
+      - thought: Your current thinking step, which can include:
+      * Regular analytical steps
+      * Revisions of previous thoughts
+      * Questions about previous decisions
+      * Realizations about needing more analysis
+      * Changes in approach
+      * Hypothesis generation
+      * Hypothesis verification
+      - next_thought_needed: True if you need more thinking, even if at what seemed like the end
+      - thought_number: Current number in sequence (can go beyond initial total if needed)
+      - total_thoughts: Current estimate of thoughts needed (can be adjusted up/down)
+      - is_revision: A boolean indicating if this thought revises previous thinking
+      - revises_thought: If is_revision is true, which thought number is being reconsidered
+      - branch_from_thought: If branching, which thought number is the branching point
+      - branch_id: Identifier for the current branch (if any)
+      - needs_more_thoughts: If reaching end but realizing more thoughts needed
+      
+      You should:
+      1. Start with an initial estimate of needed thoughts, but be ready to adjust
+      2. Feel free to question or revise previous thoughts
+      3. Don't hesitate to add more thoughts if needed, even at the "end"
+      4. Express uncertainty when present
+      5. Mark thoughts that revise previous thinking or branch into new paths
+      6. Ignore information that is irrelevant to the current step
+      7. Generate a solution hypothesis when appropriate
+      8. Verify the hypothesis based on the Chain of Thought steps
+      9. Repeat the process until satisfied with the solution
+      10. Provide a single, ideally correct answer as the final output
+      11. Only set next_thought_needed to false when truly done and a satisfactory answer is reached`
 
-When to use this tool:
-- Breaking down complex problems into steps
-- Planning and design with room for revision
-- Analysis that might need course correction
-- Problems where the full scope might not be clear initially
-- Problems that require a multi-step solution
-- Tasks that need to maintain context over multiple steps
-- Situations where irrelevant information needs to be filtered out
-
-Key features:
-- You can adjust total_thoughts up or down as you progress
-- You can question or revise previous thoughts
-- You can add more thoughts even after reaching what seemed like the end
-- You can express uncertainty and explore alternative approaches
-- Not every thought needs to build linearly - you can branch or backtrack
-- Generates a solution hypothesis
-- Verifies the hypothesis based on the Chain of Thought steps
-- Repeats the process until satisfied
-- Provides a correct answer
-
-Parameters explained:
-- thought: Your current thinking step, which can include:
-* Regular analytical steps
-* Revisions of previous thoughts
-* Questions about previous decisions
-* Realizations about needing more analysis
-* Changes in approach
-* Hypothesis generation
-* Hypothesis verification
-- next_thought_needed: True if you need more thinking, even if at what seemed like the end
-- thought_number: Current number in sequence (can go beyond initial total if needed)
-- total_thoughts: Current estimate of thoughts needed (can be adjusted up/down)
-- is_revision: A boolean indicating if this thought revises previous thinking
-- revises_thought: If is_revision is true, which thought number is being reconsidered
-- branch_from_thought: If branching, which thought number is the branching point
-- branch_id: Identifier for the current branch (if any)
-- needs_more_thoughts: If reaching end but realizing more thoughts needed
-
-You should:
-1. Start with an initial estimate of needed thoughts, but be ready to adjust
-2. Feel free to question or revise previous thoughts
-3. Don't hesitate to add more thoughts if needed, even at the "end"
-4. Express uncertainty when present
-5. Mark thoughts that revise previous thinking or branch into new paths
-6. Ignore information that is irrelevant to the current step
-7. Generate a solution hypothesis when appropriate
-8. Verify the hypothesis based on the Chain of Thought steps
-9. Repeat the process until satisfied with the solution
-10. Provide a single, ideally correct answer as the final output
-11. Only set next_thought_needed to false when truly done and a satisfactory answer is reached`
     parameters:
       type: object
       properties:
         thought: 
-          type: "string",
+          type: string
           description: "Your current thinking step"
         nextThoughtNeeded:
-          type: "boolean",
+          type: boolean
           description: "Whether another thought step is needed"
         thoughtNumber:
-          type: "integer"
-          description: "Current thought number",
+          type: integer
+          description: "Current thought number"
           minimum: 1
         totalThoughts:
-          type: "integer",
-          description: "Estimated total thoughts needed",
+          type: integer
+          description: "Estimated total thoughts needed"
           minimum: 1
         isRevision:
-          type: "boolean",
+          type: boolean
           description: "Whether this revises previous thinking"
-        revisesThought: {
-          type: "integer",
-          description: "Which thought is being reconsidered",
+        revisesThought:
+          type: integer
+          description: "Which thought is being reconsidered"
           minimum: 1
         branchFromThought:
-          type: "integer",
-          description: "Branching point thought number",
+          type: integer
+          description: "Branching point thought number"
           minimum: 1
         branchId:
-          type: "string",
+          type: string
           description: "Branch identifier"
         needsMoreThoughts: 
-          type: "boolean",
+          type: boolean
           description: "If more thoughts are needed"
       required:
         - thought
@@ -100,3 +101,5 @@ You should:
       volumes: 
         - "mcp-sequentialthinking:/sequentialthinking"
 ---
+
+# anything

prompts/mcp/brave.md

@@ -2,7 +2,8 @@
 mcp:
   - container:
       image: mcp/brave-search:latest
-      environment:
-        BRAVE_API_KEY: "{{ brave.api_key }}"
+      workdir: /app
+      secrets:
+        brave.api_key: BRAVE_API_KEY
 ---
 

prompts/mcp/redis.md

@@ -2,5 +2,14 @@
 mcp:
   - container:
       image: mcp/redis:latest
+      workdir: /app
+      secrets:
+        redis.host: REDIS_HOST
+        redis.port: REDIS_PORT
+      command:
+        - "--redis-host"
+        - $REDIS_HOST
+        - "--redis-port"
+        - $REDIS_PORT
 ---
 

prompts/mcp/slack.md

@@ -2,8 +2,9 @@
 mcp:
   - container:
       image: mcp/slack:latest
-      environment:
-        SLACK_BOT_TOKEN: "{{ slack.bot_token }}"
-        SLACK_TEAM_ID: "{{ slack.team_id }} "
+      workdir: /app
+      secrets:
+        slack.bot_token: SLACK_BOT_TOKEN
+        slack.team_id: SLACK_TEAM_ID
 ---
 

prompts/mcp/stripe.md

@@ -1,9 +1,12 @@
 ---
 mcp:
   - container:
-      image: mcp/stripe:latest
+      image: vonwig/stripe:latest
+      workdir: /app
+      secrets:
+        stripe.api_key: API_KEY
       command:
         - "--tools=all"
-        - "--api-key={{stripe.api_key}}"
+        - "--api-key=$API_KEY"
 ---
 

runbook.md

@@ -1,17 +1,19 @@
 ```sh
-docker build -t mcp/docker .
-```
-
-```sh
-docker extension rm vonwig/labs-ai-tools-for-devs
+docker buildx build \
+    --builder hydrobuild \
+    --platform linux/amd64,linux/arm64 \
+    --tag mcp/docker:0.0.1 \
+    --file Dockerfile \
+    --push .
+docker pull mcp/docker:0.0.1
 ```
 
 ```sh
-docker extension install vonwig/labs-ai-tools-for-devs:0.1.16
+cd src/extension && make build-extension
 ```
 
 ```sh
-docker extension update docker/labs-ai-tools-for-devs:0.1.4
+docker extension update docker/labs-ai-tools-for-devs:0.2.7
 ```
 
 ```sh
@@ -30,10 +32,10 @@ docker pull mcp/docker:prerelease
 docker buildx build \
     --builder hydrobuild \
     --platform linux/amd64,linux/arm64 \
-    --tag mcp/docker:latest \
+    --tag mcp/docker:0.0.1 \
     --file Dockerfile \
     --push .
-docker pull mcp/docker:latest
+docker pull mcp/docker:0.0.1
 ```
 
 ```sh
@@ -49,11 +51,16 @@ docker run --rm -i --pull always -q --init \
            -v /var/run/docker.sock:/var/run/docker.sock \
            --mount type=volume,source=docker-prompts,target=/prompts \
            -p 8811:8811 \
-           mcp/docker:latest \
+           mcp/docker:0.0.1 \
            serve --mcp --port 8811 \
-                 --register "github:docker/labs-ai-tools-for-devs?path=prompts/bootstrap.md"
+           --register "github:docker/labs-ai-tools-for-devs?path=prompts/bootstrap.md"
 ```
 
 ```sh
 socat STDIO TCP:127.0.0.1:8811
 ```
+
+```sh
+docker x policy set my-policy '*'
+docker x secret set 'stripe.api_key=....' --policy my-policy
+```