low-level workdir metadata for non host-dir use cases

Author: slimslenderslacks

prompts/examples/git.md

@@ -33,27 +33,34 @@ tools:
      command:
        - --no-pager
        - "{{args|into}}"
-host-dir: /Users/slim/repo/bobloblaw
+  - name: gh
+    container:
+      env:
+        GITHUB_TOKEN: "{{pat}}"
+workdir: /thread/docker-test
 ---
 -->
 
 # Background
 
 This shows how an agent can work with a _private_ git repository.
 
-This tests that we can clone and make a change to a private repo. The git container mounts a prepared .ssh directory and .gitconfig file. In order to try this one, you'll need to do 3 things.
+This tests that we can clone and make a change to a private repo. The git container mounts a prepared .ssh directory and .gitconfig file. In order to try this one, you'll need to do 2 things.
 
-1. Update the `host-dir` entry in the above comment to point at a empty directory.  The agent is going to clone into this directory so start with an empty directory.
 1. Update the two mounts in git tool entry from the comment above. This is how you will provide credential access to the git container (read-only).
 2. Update the prompt in the section below to point at a private repo of your choosing.
 
 The next section contains the prompt that will be sent to the agent.  This is where the agent instructions begin.
 
 # prompt user
 
-1.  use the git tool to clone [email protected]:slimslenderslacks/bobloblaw.git into the current directory. Do not create a new directory.  It's okay if this 
-    fails because the repository is already cloned.
-2.  use the append tool to write me a special message in the README.md file.
-3.  use the git tool to commit the changes to the README.md file with the message "thankyou for being you".
-4.  use the git tool to push the changes.
+Create a random branch named that starts with the string 'slim/', contains 5 random numbers or letters, and no spaces. I will refer to this as the branch name.
+
+*  use the git tool to clone [email protected]:slimslenderslacks/bobloblaw.git into the current directory. Do not create a new directory.  It's okay if this 
+   fails because the repository is already cloned.
+*  use the git tool to create a branch with the branch name described above. 
+*  use the append tool to write me a special message in the README.md file.
+*  use the git tool to commit the changes to the README.md file with the message "thankyou for being you".
+*  use the git tool to push the changes.
+*  use the github cli to create a pull request for this branch name with the title "here's my secret message".
 

src/docker.clj

@@ -108,7 +108,7 @@
 ;; Tty wraps the process in a pseudo terminal
 {:StdinOnce true
  :OpenStdin true}
-(defn create-container [{:keys [image entrypoint working-dir command host-dir env thread-id opts mounts] :or {opts {:Tty true}} :as m}]
+(defn create-container [{:keys [image entrypoint workdir command host-dir env thread-id opts mounts] :or {opts {:Tty true}} :as m}]
   #_(jsonrpc/notify :message {:content (str m)})
   (let [payload (json/generate-string
                  (merge
@@ -124,7 +124,7 @@
                             (when host-dir [(format "%s:/project:rw" host-dir)])
                             (when thread-id [(format "%s:/thread:rw" thread-id)])
                             mounts)}
-                   :WorkingDir (or working-dir "/project")}
+                   :WorkingDir (or workdir "/project")}
                   (when entrypoint {:Entrypoint entrypoint})
                   (when command {:Cmd command})))]
     (curl/post

src/docker/main.clj

@@ -14,12 +14,16 @@
    [logging :refer [warn]]
    prompts
    state
+   trace
    user-loop)
   (:gen-class))
 
 (set! *warn-on-reflection* true)
 
-(defn- with-volume [f & {:keys [thread-id save-thread-volume]}]
+(defn- with-volume 
+  "callback with the thread-id for this conversation, make sure the thread volume exists
+   and possibly remove the volume afterwards"
+  [f & {:keys [thread-id save-thread-volume]}]
   (let [thread-id (or thread-id (str (random-uuid)))]
     (try
       (docker/thread-volume {:Name thread-id})
@@ -187,7 +191,8 @@
                           m))))
                     user-loop/state-reducer
                     in
-                    {})))
+                    {}))
+                  (trace/dump))
                 opts)))
     (fn []
       (:messages (prompts/get-prompts (with-options opts args))))))

src/git.clj

@@ -63,7 +63,7 @@
      :command (concat ["pull" "origin"]
                       (when ref [ref]))}
     (if (string/starts-with? (str dir) "/prompts")
-      {:working-dir (str dir)
+      {:workdir (str dir)
        :mounts ["docker-prompts:/prompts:rw"]}
       {:host-dir (str dir)}))))
 
@@ -72,7 +72,7 @@
    (merge
     {:image "alpine/git:latest"}
     (if (string/starts-with? (str dir) "/prompts")
-      {:working-dir (str dir)
+      {:workdir (str dir)
        :command (concat ["clone" "--depth" "1" (format "https://github.com/%s/%s" owner repo)]
                         (when ref ["-b" ref])
                         [(format "/prompts/%s" ref-hash)])

src/graph.clj

@@ -30,7 +30,7 @@
   [{:keys [messages functions metadata] {:keys [url model stream level]} :opts}]
   (let [[c h] (openai/chunk-handler)
         request (merge
-                 (dissoc metadata :agent :host-dir) ; TODO should we just select relevant keys instead of removing bad ones
+                 (dissoc metadata :agent :host-dir :workdir) ; TODO should we just select relevant keys instead of removing bad ones
                  {:messages messages
                   :level level}
                  (when (seq functions) {:tools functions})
@@ -91,7 +91,7 @@
                       (:opts state)
                       (select-keys state [:functions])
                         ;; note that host-dir, if it exists, is an override here
-                      (select-keys (:metadata state) [:host-dir :timeout])))
+                      (select-keys (:metadata state) [:host-dir :timeout :workdir])))
                     calls)
                    (async/reduce conj []))))})))
 

src/prompts.clj

@@ -94,7 +94,7 @@
         ["{{raw|safe}}" "man"]}}}
      {:type "function"
       :function
-      (merge
+      (medley/deep-merge
        {:description (format "Run a %s command." tool)
         :parameters
         {:type "object"

src/tools.clj

@@ -66,8 +66,12 @@
                                         {:command (interpolate-coll
                                                     (-> definition :container :command)
                                                     arg-context)}
-                                        (when-let [wd (-> definition :container :working-dir)] 
-                                          {:working-dir (first (interpolate arg-context wd))}))
+                                        ;; workdirs in a container definition will always override ones
+                                        ;; set in the metadata
+                                        (when-let [wd (or 
+                                                        (-> definition :container :workdir) 
+                                                        (:workdir defaults))] 
+                                          {:workdir (first (interpolate arg-context wd))}))
                                 (-> definition :stdin :file) (update-in [:stdin :file] (fn [s] (first (interpolate arg-context s)))))]
             (jsonrpc/notify 
               :message 

src/trace.clj

@@ -1,11 +1,16 @@
 (ns trace 
   (:require
-   [cheshire.core :as json]))
+   [cheshire.core :as json]
+   jsonrpc))
 
 (def trace (atom {}))
 
 (defn container-call [definition]
   (swap! trace update-in [:container-calls] (fnil concat []) [(into {} (dissoc definition :prompts))]))
 
 (defn dump []
-  (spit "trace.edn" (pr-str @trace)))
+  (spit "trace.json" (try 
+                       (json/generate-string @trace)
+                       (catch Throwable t
+                         (jsonrpc/notify :error {:content (str t)})))))
+