Merge branch 'next/kelvin/411' into fitz-bug-fix

.github/workflows/shared.yml

@@ -55,7 +55,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+        with:
+          lfs: true
 
       # We only want the extra nix config on linux, where it is necessary
       # for the docker build. We don't want in on Mac, where it isn't but
@@ -77,7 +79,6 @@ jobs:
       - if: ${{ matrix.os == 'ubuntu-latest' }}
         name: run urbit-tests
         run: |
-          cp -RL tests pkg/arvo/tests
           if [[ "${{ inputs.next }}" == "next/kelvin/"* ]]; then
             next=$(echo ${{ inputs.next }} | sed 's/[^0-9]//g')
             base="https://bootstrap.urbit.org/vere/next/kelvin/${next}"
@@ -91,7 +92,8 @@ jobs:
           url="$(echo ${base}/v${vere}/vere-v${vere}-linux-x86_64)"
           echo $vere
           echo $url
-          # put in .jam so it doesn't crash when it gets -A'd in
-          curl -Lo pkg/arvo/vere.jam "$url"
-          chmod +x pkg/arvo/vere.jam
-          nix-build -A urbit-tests
+          curl -Lo urbit "$url"
+          chmod +x urbit
+          git add urbit
+
+          nix flake check --keep-build-log -L

bin/solid.pill

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c0fb3cb223a884bb10dc2877c2dcbc597d7ba54392c8cdc73ac152626888cc9
-size 6379473
+oid sha256:feaae0eece54db3e92122263706c283674af581d14ffde8a29fb24e1873a35b1
+size 6453015

flake.lock

@@ -0,0 +1,76 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1687709756,
+        "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1688465017,
+        "narHash": "sha256-xzFcCnzPOgQaX7Acprfqo+tqHJ2UKWC38pXrcqvdXHU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0d5682acc109add20f70440269587a1b169cc2fe",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs",
+        "tools": "tools"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "tools": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1687273483,
+        "narHash": "sha256-41X9PWXGM7lFzPiIj4dw3i8bgMvpT85iYHSeyIxPJcc=",
+        "owner": "urbit",
+        "repo": "tools",
+        "rev": "2ad116fdb539e4116dc18d86772a241415cc1ef4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "urbit",
+        "repo": "tools",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,75 @@
+{
+  inputs = {
+    flake-utils.url = "github:numtide/flake-utils";
+    tools = {
+      flake = false;
+      url = "github:urbit/tools";
+    };
+  };
+
+  outputs = { self, nixpkgs, flake-utils, tools }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        usableTools = pkgs.runCommand "patched-tools" { } ''
+          cp -r ${tools} $out
+          chmod +w -R $out
+          patchShebangs $out
+        '';
+        pkgs = import nixpkgs { inherit system; };
+        bootFakeShip = { pill, arvo }:
+          pkgs.runCommand "fake-pier" { } ''
+            ${./urbit} --pier $out -F zod -B ${pill} -l -x -t -A ${arvo}
+          '';
+        fakePier = bootFakeShip {
+          pill = ./bin/solid.pill;
+          arvo = "${./pkg}/arvo";
+        };
+        testPier = bootFakeShip {
+          pill = ./bin/solid.pill;
+          arvo = pkgs.runCommand "test-arvo" {} ''
+            cp -r ${./pkg} $out
+            chmod +w -R $out
+            cp -r ${./tests} $out/arvo/tests
+            cp -r ${./test-desk.bill} $out/arvo/desk.bill
+          '' + "/arvo";
+        };
+        buildPillThread = pill:
+          pkgs.writeTextFile {
+            name = "";
+            text = ''
+              =/  m  (strand ,vase)
+              ;<  [=ship =desk =case]  bind:m  get-beak
+              ;<  ~  bind:m  (poke [ship %dojo] %lens-command !>([%$ [%dojo '+${pill}'] [%output-pill '${pill}/pill']]))
+              ;<  ~  bind:m  (poke [ship %hood] %drum-exit !>(~))
+              (pure:m !>(~))
+            '';
+          };
+        buildPill = pill:
+          pkgs.runCommand ("${pill}.pill") { buildInputs = [ pkgs.netcat ]; } ''
+            cp -r ${fakePier} pier
+            chmod +w -R pier
+            ${./urbit} -d pier
+            ${usableTools}/pkg/click/click -k -p -i ${buildPillThread pill} pier
+
+            # Sleep to let urbit spin down properly
+            sleep 5
+
+            cp pier/.urb/put/${pill}.pill $out
+          '';
+
+      in {
+        checks = {
+          testFakeShip = import ./nix/test-fake-ship.nix {
+            inherit pkgs;
+            pier = testPier;
+            click = usableTools + "/pkg/click/click";
+          };
+        };
+        packages = {
+          inherit fakePier testPier;
+          brass = buildPill "brass";
+          ivory = buildPill "ivory";
+          solid = buildPill "solid";
+        };
+      });
+}

nix/default.nix

@@ -1,34 +0,0 @@
-# The build system where packages will be _built_.
-{ system ? builtins.currentSystem
-  # The host system where packages will _run_.
-, crossSystem ? null
-  # Additional sources.json overrides.
-, sources ? { }
-  # Additional nixpkgs.config overrides.
-, config ? { }
-  # Additional nixpkgs.overlays.
-, overlays ? [ ]
-  # Overlays to apply to the last package set in cross compilation.
-, crossOverlays ? [ ] }:
-
-let
-
-  finalSources = import ./sources.nix { } // sources;
-
-  pkgs = import finalSources.nixpkgs {
-    inherit system config crossSystem crossOverlays;
-
-    overlays = [
-      # Make prev.sources available to subsequent overlays.
-      (_final: _prev: { sources = finalSources; })
-      # General unguarded (native) overrides for nixpkgs.
-      (import ./overlays/native.nix)
-      # Specific overrides guarded by the host platform.
-      (import ./overlays/musl.nix)
-      (import ./overlays/arm.nix)
-    ];
-  };
-
-in pkgs // {
-  pkgsStatic = pkgs.pkgsStatic.extend (import ./overlays/static.nix);
-}

nix/lib/boot-fake-ship.nix

@@ -1,72 +0,0 @@
-{ lib, stdenvNoCC, curl }:
-
-{ arvo ? null, pill, ship, arguments ? [ "-l" ] }:
-
-let
-
-  args = arguments ++ [ "-d" "-F" "${ship}" "-B" "${pill}" ]
-    ++ lib.optionals (arvo != null) [ "-A" "${arvo}" ];
-
-in stdenvNoCC.mkDerivation {
-  name = "fake-${ship}";
-
-  buildInputs = [ curl ];
-
-  phases = [ "buildPhase" "installPhase " ];
-
-  buildPhase = ''
-    set -xeuo pipefail
-
-    ${arvo}/vere.jam ${lib.concatStringsSep " " args} -c ./pier
-
-    cleanup () {
-      if [ -f ./pier/.vere.lock ]; then
-        kill $(< ./pier/.vere.lock) || true
-      fi
-
-      set +x
-    }
-
-    trap cleanup EXIT
-
-    port=$(cat ./pier/.http.ports | grep loopback | tr -s ' ' '\n' | head -n 1)
-
-    lensd() {
-      curl -f -s                                                           \
-        --data "{\"source\":{\"dojo\":\"$1\"},\"sink\":{\"stdout\":null}}" \
-        "http://localhost:$port" | xargs printf %s | sed 's/\\n/\n/g'
-    }
-
-    lensa() {
-      curl -f -s                                                           \
-        --data "{\"source\":{\"dojo\":\"$2\"},\"sink\":{\"app\":\"$1\"}}"  \
-        "http://localhost:$port" | xargs printf %s | sed 's/\\n/\n/g'
-    }
-
-    check () {
-      [ 3 -eq "$(lensd 3)" ]
-    }
-
-    if check && sleep 10 && check; then
-      header "boot success"
-      lensa hood '+hood/exit'
-      while [ -f ./pier/.vere.lock ]; do
-        echo "waiting for pier to shut down"
-        sleep 5
-      done
-    else
-      header "boot failure"
-      kill $(< ./pier/.vere.lock) || true
-      set +x
-      exit 1
-    fi
-
-    set +x
-  '';
-
-  installPhase = ''
-    ls
-    ls -a ./pier
-    mv ./pier $out
-  '';
-}

nix/lib/default.nix

@@ -1,13 +0,0 @@
-# Functions that are expected run on the native (non-cross) system.
-
-{ callPackage }:
-
-rec {
-  bootFakeShip = callPackage ./boot-fake-ship.nix { };
-
-  testFakeShip = callPackage ./test-fake-ship.nix { inherit bootFakeShip; };
-
-  fetchGitHubLFS = callPackage ./fetch-github-lfs.nix { };
-
-  makeReleaseTarball = callPackage ./make-release-tarball.nix { };
-}

nix/lib/fetch-github-lfs.nix

@@ -1,107 +0,0 @@
-{ lib, stdenvNoCC, runCommandLocal, cacert, curl, jq }:
-
-{ src
-# `name` shouldn't use `baseNameOf` otherwise we'll
-# get `is not allowed to refer to a store path` errors.
-, name ? baseNameOf src, owner ? "urbit", repo ? "urbit"
-, preferLocalBuild ? true }:
-
-assert builtins.isPath src;
-
-let
-
-  # Parse the first 7 characters of the supplied `src` path for the required
-  # `version` key as defined by the lfs specification:
-  # https://github.com/git-lfs/git-lfs/blob/master/docs/spec.md
-  #
-  # If `version` exists we assume we're dealing with a lfs pointer and parse
-  # the `oid` and `size` from the pointer and write these into a JSON object.
-  #
-  # If the first 7 characters are unrecognised we assume the path is a binary
-  # file and set both `oid` and `size` to `null`.
-  #
-  # The `oid` and `size` are then JSON decoded into an expression to use
-  # as the fixed-output derivation's `sha256 = oid`, and to form a download
-  # operation payload to request the actual lfs blob's real url.
-  pointer = builtins.fromJSON (builtins.readFile
-    (runCommandLocal "lfs-pointer-${name}" { } ''
-      oid="null"
-      size="null"
-
-      if [[ "$(head -c 7 "${src}")" != "version" ]]; then
-        header "lfs ${src} is a binary blob, skipping"
-      else
-        header "reading lfs pointer from ${src}"
-
-        contents=($(awk '{print $2}' "${src}"))
-        oid="''${contents[1]#sha256:}"
-        size="''${contents[2]}"
-      fi
-
-      cat <<EOF > "$out"
-      {"oid": "$oid", "size": $size}
-      EOF
-    ''));
-
-  downloadUrl =
-    "https://github.com/${owner}/${repo}.git/info/lfs/objects/batch";
-
-  # Encode `oid` and `size` into a download operation per:
-  # https://github.com/git-lfs/git-lfs/blob/master/docs/api/batch.md
-  #
-  # This is done using toJSON to avoid bash quotation issues.
-  downloadPayload = builtins.toJSON {
-    operation = "download";
-    objects = [ pointer ];
-  };
-
-  # Define a fixed-output derivation using the lfs pointer's `oid` as the
-  # expected sha256 output hash, if `oid` is not null.
-  #
-
-  # 1. Request the actual url of the binary file from the lfs batch api.
-  # 2. Download the binary file contents to `$out`.
-  download = stdenvNoCC.mkDerivation {
-    name = "lfs-blob-${name}";
-    nativeBuildInputs = [ curl jq ];
-    phases = [ "installPhase" ];
-    installPhase = ''
-      curl=(
-          curl
-          --location
-          --max-redirs 20
-          --retry 3
-          --disable-epsv
-          --cookie-jar cookies
-          $NIX_CURL_FLAGS
-        )
-
-      header "reading lfs metadata from ${downloadUrl}"
-
-      href=$("''${curl[@]}" \
-        -d '${downloadPayload}' \
-        -H 'Accept: application/vnd.git-lfs+json' \
-        '${downloadUrl}' \
-          | jq -r '.objects[0].actions.download.href')
-
-      header "download lfs data from remote"
-
-      # Pozor/Achtung: the href contains credential and signature information, 
-      # so we avoid echoing it to stdout/err.
-      "''${curl[@]}" -s --output "$out" "$href"
-    '';
-
-    impureEnvVars = lib.fetchers.proxyImpureEnvVars;
-
-    SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-
-    outputHashAlgo = "sha256";
-    outputHashMode = "flat";
-    outputHash = pointer.oid;
-
-    inherit preferLocalBuild;
-  };
-
-  # If `pointer.oid` is null then supplied the `src` must be a binary
-  # blob and can be returned directly.
-in if pointer.oid == null || pointer.size == null then src else download

nix/lib/make-release-tarball.nix

@@ -1,30 +0,0 @@
-{ lib, stdenvNoCC, coreutils }:
-
-{ name, extension ? "tgz", contents # { target = source, ... }
-}:
-
-let
-
-  transforms = builtins.concatStringsSep " " (lib.mapAttrsToList
-    (target: source: ''--transform "s,${source},${target},"'') contents);
-
-  sources = builtins.concatStringsSep " "
-    (lib.mapAttrsToList (_target: source: "${source}") contents);
-
-in stdenvNoCC.mkDerivation {
-  name = "${name}.${extension}";
-  phases = [ "buildPhase" ];
-
-  nativeBuildInputs = [ coreutils ];
-
-  buildPhase = ''
-    tar -vczf $out \
-      --owner=0 --group=0 --mode=u+rw,uga+r \
-      --absolute-names \
-      --hard-dereference \
-      ${transforms} \
-      ${sources}
-  '';
-
-  preferLocalBuild = true;
-}

nix/lib/test-fake-ship.nix

@@ -1,188 +0,0 @@
-{ lib, stdenvNoCC, curl, python3, bootFakeShip }:
-
-{ arvo ? null, pill, ship ? "bus", doCheck ? true }:
-
-stdenvNoCC.mkDerivation {
-  name = "test-${ship}";
-
-  src = bootFakeShip { inherit arvo pill ship; };
-
-  phases = [ "unpackPhase" "buildPhase" "checkPhase" ];
-
-  buildInputs = [ curl python3 ];
-
-  unpackPhase = ''
-    cp -R $src ./pier
-    chmod -R u+rw ./pier
-  '';
-
-  buildPhase = ''
-    set -x
-
-    ${arvo}/vere.jam -d ./pier 2> urbit-output
-
-    # Sledge Hammer!
-    # See: https://github.com/travis-ci/travis-ci/issues/4704#issuecomment-348435959
-    python3 -c $'import os\n[os.set_blocking(i, True) for i in range(3)]\n'
-
-    port=$(cat ./pier/.http.ports | grep loopback | tr -s ' ' '\n' | head -n 1)
-
-    lensd() {
-      # -f elided, this can hit server-side timeouts
-      curl -s                                                              \
-        --data "{\"source\":{\"dojo\":\"$1\"},\"sink\":{\"stdout\":null}}" \
-        "http://localhost:$port" | xargs printf %s | sed 's/\\n/\n/g'
-    }
-
-    lensa() {
-      # -f elided, this can hit server-side timeouts
-      curl -s                                                              \
-        --data "{\"source\":{\"dojo\":\"$2\"},\"sink\":{\"app\":\"$1\"}}"  \
-        "http://localhost:$port" | xargs printf %s | sed 's/\\n/\n/g'
-    }
-
-    tail -F urbit-output >&2 &
-
-    tailproc=$!
-
-    cleanup () {
-      kill $(cat ./pier/.vere.lock) || true
-      kill "$tailproc" 2>/dev/null || true
-
-      set +x
-    }
-
-    trap cleanup EXIT
-
-    #  measure initial memory usage
-    #
-    lensd '~&  ~  ~&  %init-mass-start  ~'
-    lensa hood '+hood/mass'
-    lensd '~&  ~  ~&  %init-mass-end  ~'
-
-    #  run the unit tests
-    #
-    lensd '~&  ~  ~&  %test-unit-start  ~'
-    lensd '-test %/tests ~'
-    lensd '~&  ~  ~&  %test-unit-end  ~'
-
-    #  use the :test app to build all agents, generators, and marks
-    #
-    lensa hood '+hood/start %test'
-
-    lensd '~&  ~  ~&  %test-agents-start  ~'
-    lensa test '%agents'
-    lensd '~&  ~  ~&  %test-agents-end  ~'
-
-    lensd '~&  ~  ~&  %test-generators-start  ~'
-    lensa test '%generators'
-    lensd '~&  ~  ~&  %test-generators-end  ~'
-
-    lensd '~&  ~  ~&  %test-marks-start  ~'
-    lensa test '%marks'
-    lensd '~&  ~  ~&  %test-marks-end  ~'
-
-    #  measure memory usage post tests
-    #
-    lensd '~&  ~  ~&  %test-mass-start  ~'
-    lensa hood '+hood/mass'
-    lensd '~&  ~  ~&  %test-mass-end  ~'
-
-    #  defragment the loom
-    #
-    lensd '~&  ~  ~&  %pack-start  ~'
-    lensa hood '+hood/pack'
-    lensd '~&  ~  ~&  %pack-end  ~'
-
-    #  reclaim space within arvo
-    #
-    lensd '~&  ~  ~&  %trim-start  ~'
-    lensa hood '+hood/trim'
-    lensd '~&  ~  ~&  %trim-end  ~'
-
-    #  measure memory usage pre |meld
-    #
-    lensd '~&  ~  ~&  %trim-mass-start  ~'
-    lensa hood '+hood/mass'
-    lensd '~&  ~  ~&  %trim-mass-end  ~'
-
-    #  globally deduplicate
-    #
-    lensd '~&  ~  ~&  %meld-start  ~'
-    lensa hood '+hood/meld'
-    lensd '~&  ~  ~&  %meld-end  ~'
-
-    #  measure memory usage post |meld
-    #
-    lensd '~&  ~  ~&  %meld-mass-start  ~'
-    lensa hood '+hood/mass'
-    lensd '~&  ~  ~&  %meld-mass-end  ~'
-
-    lensa hood '+hood/exit'
-
-    cleanup
-
-    # Collect output
-    cp urbit-output test-output-unit
-    cp urbit-output test-output-agents
-    cp urbit-output test-output-generators
-    cp urbit-output test-output-marks
-
-    sed -i '0,/test-unit-start/d'        test-output-unit
-    sed -i '/test-unit-end/,$d'          test-output-unit
-
-    sed -i '0,/test-agents-start/d'      test-output-agents
-    sed -i '/test-agents-end/,$d'        test-output-agents
-
-    sed -i '0,/test-generators-start/d'  test-output-generators
-    sed -i '/test-generators-end/,$d'    test-output-generators
-
-    sed -i '0,/test-marks-start/d'       test-output-marks
-    sed -i '/test-marks-end/,$d'         test-output-marks
-
-    mkdir -p $out
-
-    cp test-output-* $out/
-
-    set +x
-  '';
-
-  checkPhase = ''
-    hdr () {
-      echo =====$(sed 's/./=/g' <<< "$1")=====
-      echo ==== $1 ====
-      echo =====$(sed 's/./=/g' <<< "$1")=====
-    }
-
-    for f in $(find "$out/" -type f); do
-      hdr "$(basename $f)"
-      cat "$f"
-    done
-
-    fail=0
-
-    for f in $(find "$out/" -type f); do
-      if egrep "((FAILED|CRASHED)|warn:) " $f >/dev/null; then
-        if [[ $fail -eq 0 ]]; then
-          hdr "Test Failures"
-        fi
-
-        echo "ERROR Test failure in $(basename $f)"
-
-        ((fail++))
-      fi
-    done
-
-    if [[ $fail -eq 0 ]]; then
-      hdr "Success"
-    fi
-
-    exit "$fail"
-  '';
-
-  inherit doCheck;
-
-  # Fix 'bind: operation not permitted' when nix.useSandbox = true on darwin.
-  # See https://github.com/NixOS/nix/blob/5f6840fbb49ae5b534423bd8a4360646ee93dbaf/src/libstore/build.cc#L2961
-  __darwinAllowLocalNetworking = true;
-}

nix/overlays/arm.nix

@@ -1,14 +0,0 @@
-final: prev:
-
-let
-
-  isAarch64 = prev.stdenv.hostPlatform.isAarch64;
-  isDarwin  = prev.stdenv.isDarwin;
-
-in prev.lib.optionalAttrs (isAarch64 && !isDarwin) {
-  libsigsegv = prev.libsigsegv.overrideAttrs (attrs: {
-    preConfigure = (prev.preConfigure or "") + ''
-      sed -i 's/^CFG_FAULT=$/CFG_FAULT=fault-linux-arm.h/' configure
-    '';
-  });
-}

nix/overlays/musl.nix

@@ -1,26 +0,0 @@
-final: prev:
-
-let
-
-  isMusl = prev.stdenv.hostPlatform.isMusl;
-
-  optionalList = xs: if xs == null then [ ] else xs;
-
-  overrideStdenv = pkg: pkg.override { stdenv = prev.gcc9Stdenv; };
-
-in prev.lib.optionalAttrs isMusl {
-  libsigsegv = prev.libsigsegv.overrideAttrs (attrs: {
-    preConfigure = (attrs.preConfigure or "") + ''
-      sed -i 's/^CFG_FAULT=$/CFG_FAULT=fault-linux-i386.h/' configure
-    '';
-  });
-
-  secp256k1 = prev.secp256k1.overrideAttrs (attrs: {
-    nativeBuildInputs = (attrs.nativeBuildInputs or [ ])
-      ++ [ prev.buildPackages.stdenv.cc ];
-  });
-
-  rhash = overrideStdenv prev.rhash;
-
-  numactl = overrideStdenv prev.numactl;
-}

nix/overlays/native.nix

@@ -1,40 +0,0 @@
-final: prev:
-
-let
-
-  optionalList = xs: if xs == null then [ ] else xs;
-
-in {
-  h2o = prev.h2o.overrideAttrs (_attrs: {
-    version = final.sources.h2o.rev;
-    src = final.sources.h2o;
-    outputs = [ "out" "dev" "lib" ];
-    meta.platforms = prev.lib.platforms.linux ++ prev.lib.platforms.darwin;
-  });
-
-  libsigsegv = prev.libsigsegv.overrideAttrs (attrs: {
-    patches = optionalList attrs.patches ++ [
-      ../pkgs/libsigsegv/disable-stackvma_fault-linux-arm.patch
-      ../pkgs/libsigsegv/disable-stackvma_fault-linux-i386.patch
-    ];
-  });
-
-  curlUrbit = prev.curlMinimal.override {
-    http2Support = false;
-    scpSupport = false;
-    gssSupport = false;
-    ldapSupport = false;
-    brotliSupport = false;
-  };
-
-  # lies, all lies
-  openssl-static-osx = prev.openssl;
-  zlib-static-osx = prev.zlib;
-
-  lmdb = prev.lmdb.overrideAttrs (attrs: {
-    patches =
-      optionalList attrs.patches ++ prev.lib.optional prev.stdenv.isDarwin [
-        ../pkgs/lmdb/darwin-fsync.patch
-      ];
-  });
-}

nix/overlays/static.nix

@@ -1,40 +0,0 @@
-final: prev:
-
-let
-
-  # https://github.com/NixOS/nixpkgs/pull/97047/files
-  # Will make pkgs.stdenv.isStatic available indepedent of the platform.
-  # isStatic = prev.stdenv.hostPlatform.isStatic;
-
-  configureFlags = attrs: {
-    configureFlags = (attrs.configureFlags or [ ])
-      ++ [ "--disable-shared" "--enable-static" ];
-  };
-
-  enableStatic = pkg: pkg.overrideAttrs configureFlags;
-
-in {
-  gmp = enableStatic prev.gmp;
-
-  curlUrbit = enableStatic (prev.curlUrbit.override { openssl = final.openssl-static-osx; zlib = final.zlib-static-osx; });
-
-  libuv = enableStatic prev.libuv;
-
-  libffi = enableStatic prev.libffi;
-
-  openssl-static-osx = prev.openssl.override {
-    static   = true;
-    withPerl = false;
-  };
-
-  zlib-static-osx = if final.stdenv.isDarwin then prev.zlib.static else prev.zlib;
-
-  secp256k1 = enableStatic prev.secp256k1;
-
-  lmdb = prev.lmdb.overrideAttrs (old:
-    configureFlags old // {
-      postPatch = ''
-        sed '/^ILIBS\t/s/liblmdb\$(SOEXT)//' -i Makefile
-      '';
-    });
-}

nix/pkgs/arvo/default.nix

@@ -1,21 +0,0 @@
-{ lib, stdenvNoCC, marsSources }:
-
-stdenvNoCC.mkDerivation {
-  name = "arvo";
-
-  src = marsSources;
-
-  outputs = [ "out" "goerli" ];
-
-  phases = [ "mainnetPhase" "goerliPhase" ];
-
-  mainnetPhase = ''
-    ln -s ${marsSources.out}/arvo $out
-    '';
-
-  goerliPhase = ''
-    ln -s ${marsSources.goerli}/arvo $goerli
-    '';
-
-  preferLocalBuild = true;
-}

nix/pkgs/ca-bundle/default.nix

@@ -1,29 +0,0 @@
-{ stdenvNoCC, xxd, cacert }:
-
-stdenvNoCC.mkDerivation {
-  name = "ca-bundle";
-
-  nativeBuildInputs = [ cacert xxd ];
-
-  phases = [ "installPhase" ];
-
-  installPhase = ''
-    set -euo pipefail
-
-    if ! [ -f "$SSL_CERT_FILE" ]; then
-      header "$SSL_CERT_FILE doesn't exist"
-      exit 1
-    fi
-
-    mkdir include
-
-    cat $SSL_CERT_FILE > include/ca-bundle.crt
-    xxd -i include/ca-bundle.crt > ca-bundle.h
-
-    mkdir -p $out/include
-
-    mv ca-bundle.h $out/include
-  '';
-
-  preferLocalBuild = true;
-}

nix/pkgs/docker-image/default.nix

@@ -1,112 +0,0 @@
-{ urbit, curl, libcap, coreutils, bashInteractive, dockerTools, writeScriptBin, amesPort ? 34343 }:
-let
-  startUrbit = writeScriptBin "start-urbit" ''
-    #!${bashInteractive}/bin/bash
-
-    set -eu
-
-    # set defaults
-    amesPort=${toString amesPort}
-
-    # check args
-    for i in "$@"
-    do
-    case $i in
-        -p=*|--port=*)
-            amesPort="''${i#*=}"
-            shift
-            ;;
-    esac
-    done
-
-    # If the container is not started with the `-i` flag
-    # then STDIN will be closed and we need to start
-    # Urbit/vere with the `-t` flag.
-    ttyflag=""
-    if [ ! -t 0 ]; then
-      echo "Running with no STDIN"
-      ttyflag="-t"
-    fi
-
-    # Check if there is a keyfile, if so boot a ship with its name, and then remove the key
-    if [ -e *.key ]; then
-      # Get the name of the key
-      keynames="*.key"
-      keys=( $keynames )
-      keyname=''${keys[0]}
-      mv $keyname /tmp
-
-      # Boot urbit with the key, exit when done booting
-      urbit $ttyflag -w $(basename $keyname .key) -k /tmp/$keyname -c $(basename $keyname .key) -p $amesPort -x
-
-      # Remove the keyfile for security
-      rm /tmp/$keyname
-      rm *.key || true
-    elif [ -e *.comet ]; then
-      cometnames="*.comet"
-      comets=( $cometnames )
-      cometname=''${comets[0]}
-      rm *.comet
-
-      urbit $ttyflag -c $(basename $cometname .comet) -p $amesPort -x
-    fi
-
-    # Find the first directory and start urbit with the ship therein
-    dirnames="*/"
-    dirs=( $dirnames )
-    dirname=''${dirnames[0]}
-
-    exec urbit $ttyflag -p $amesPort $dirname
-    '';
-
-  getUrbitCode = writeScriptBin "get-urbit-code" ''
-    #!${bashInteractive}/bin/bash
-
-    raw=$(curl -s -X POST -H "Content-Type: application/json" \
-      -d '{ "source": { "dojo": "+code" }, "sink": { "stdout": null } }' \
-      http://127.0.0.1:12321)
-
-    # trim \n" from the end
-    trim="''${raw%\\n\"}"
-
-    # trim " from the start
-    code="''${trim#\"}"
-
-    echo "$code"
-    '';
-
-  resetUrbitCode = writeScriptBin "reset-urbit-code" ''
-    #!${bashInteractive}/bin/bash
-
-    curl=$(curl -s -X POST -H "Content-Type: application/json" \
-      -d '{ "source": { "dojo": "+hood/code %reset" }, "sink": { "app": "hood" } }' \
-      http://127.0.0.1:12321)
-
-    if [[ $? -eq 0 ]]
-    then
-      echo "OK"
-    else
-      echo "Curl error: $?"
-    fi
-    '';
-    
-in dockerTools.buildImage {
-  name = "urbit";
-  tag = "v${urbit.version}";
-  contents = [ bashInteractive urbit curl startUrbit getUrbitCode resetUrbitCode coreutils ];
-  runAsRoot = ''
-    #!${bashInteractive}
-    mkdir -p /urbit
-    mkdir -p /tmp
-    ${libcap}/bin/setcap 'cap_net_bind_service=+ep' /bin/urbit
-    '';
-  config = {
-    Cmd = [ "/bin/start-urbit" ];
-    Env = [ "PATH=/bin" ];
-    WorkingDir = "/urbit";
-    Volumes = {
-      "/urbit" = {};
-    };
-    Expose = [ "80/tcp" "${toString amesPort}/udp" ];
-  };
-}

nix/pkgs/ent/default.nix

@@ -1,14 +0,0 @@
-{ lib, stdenv, enableParallelBuilding ? true }:
-
-stdenv.mkDerivation {
-  name = "ent";
-  src = lib.cleanSource ../../../pkg/ent;
-
-  postPatch = ''
-    patchShebangs ./configure
-  '';
-
-  installFlags = [ "PREFIX=$(out)" ];
-
-  inherit enableParallelBuilding;
-}

nix/pkgs/herb/default.nix

@@ -1,29 +0,0 @@
-{ lib, stdenvNoCC, python }:
-
-# Avoid using `python.withPackages` as it creates a wrapper script to set
-# PYTHONPATH, and the script is used verbatim as a python shebang.
-#
-# Unfortunately Darwin does not allow scripts as a shebang - so to get a
-# cross platform python interpreter with appropriate site-packages setup
-# we use `wrapPython/Packages` which handles these cases correctly.
-
-stdenvNoCC.mkDerivation {
-  name = "herb";
-  src = ../../../pkg/herb/herb;
-
-  nativeBuildInputs = [ python.pkgs.wrapPython ];
-  buildInputs = [ python python.pkgs.requests ];
-  pythonPath = [ python.pkgs.requests ];
-
-  phases = [ "installPhase" "fixupPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp $src $out/bin/herb
-    chmod +x $out/bin/herb
-  '';
-
-  postFixup = ''
-    wrapPythonPrograms
-  '';
-}

nix/pkgs/libaes_siv/cmakefiles_static.patch

@@ -1,34 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,6 +5,8 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "")
- set(CMAKE_BUILD_TYPE Release)
- endif("${CMAKE_BUILD_TYPE}" STREQUAL "")
- 
-+option(BUILD_SHARED_LIBS "Build shared libraries" ON)
-+
- include(GNUInstallDirs)
- 
- # Warning: don't use the UB sanitizer in production builds. It can introduce timing side-channels
-@@ -31,10 +33,12 @@ endif(NOT DISABLE_DOCS)
- configure_file(config.h.in config.h)
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
-+if(BUILD_SHARED_LIBS)
- add_library(aes_siv SHARED aes_siv.c)
- target_include_directories(aes_siv PUBLIC ${OPENSSL_INCLUDE_DIR})
- target_link_libraries(aes_siv ${OPENSSL_CRYPTO_LIBRARY})
- set_target_properties(aes_siv PROPERTIES VERSION "1.0.1" SOVERSION 1)
-+endif()
- 
- add_library(aes_siv_static STATIC aes_siv.c)
- target_include_directories(aes_siv_static PUBLIC ${OPENSSL_INCLUDE_DIR})
-@@ -63,7 +67,9 @@ endif(ENABLE_SANITIZER)
- add_executable(bench EXCLUDE_FROM_ALL bench.c)
- target_link_libraries(bench aes_siv_static)
- 
-+if(BUILD_SHARED_LIBS)
- install(TARGETS aes_siv LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+endif()
- install(TARGETS aes_siv_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- install(FILES aes_siv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 

nix/pkgs/libaes_siv/default.nix

@@ -1,17 +0,0 @@
-{ stdenv, sources, cmake, openssl, enableParallelBuilding ? true }:
-
-stdenv.mkDerivation {
-  name = "libaes_siv";
-  version = sources.libaes_siv.rev;
-  src = sources.libaes_siv;
-  patches = [ ./cmakefiles_static.patch ];
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ openssl ];
-
-  cmakeFlags = [
-    "-DBUILD_SHARED_LIBS=OFF"
-  ];
-
-  inherit enableParallelBuilding;
-}

nix/pkgs/libsigsegv/disable-stackvma_fault-linux-arm.patch

@@ -1,11 +0,0 @@
---- a/src/fault-linux-arm.h
-+++ b/src/fault-linux-arm.h
-@@ -17,6 +17,8 @@
- 
- #include "fault-posix-ucontext.h"
- 
-+#define HAVE_STACKVMA 0
-+
- #if defined(__aarch64__) || defined(__ARM_64BIT_STATE) || defined(__ARM_PCS_AAPCS64) /* 64-bit */
- 
- /* See glibc/sysdeps/unix/sysv/linux/aarch64/sys/ucontext.h.

nix/pkgs/libsigsegv/disable-stackvma_fault-linux-i386.patch

@@ -1,11 +0,0 @@
---- a/src/fault-linux-i386.h
-+++ b/src/fault-linux-i386.h
-@@ -18,6 +18,8 @@
- 
- #include "fault-posix-ucontext.h"
- 
-+#define HAVE_STACKVMA 0
-+
- #if defined __x86_64__
- /* 64 bit registers */
- 

nix/pkgs/lmdb/darwin-fsync.patch

@@ -1,13 +0,0 @@
-diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
-index fe65e30..0070215 100644
---- a/libraries/liblmdb/mdb.c
-+++ b/libraries/liblmdb/mdb.c
-@@ -2526,7 +2526,7 @@ mdb_env_sync(MDB_env *env, int force)
- 					rc = ErrCode();
- 			} else
- #endif
--			if (MDB_FDATASYNC(env->me_fd))
-+			if (fcntl(env->me_fd, F_FULLFSYNC, 0))
- 				rc = ErrCode();
- 		}
- 	}

nix/pkgs/marsSources/default.nix

@@ -1,46 +0,0 @@
-{ lib, stdenvNoCC, bc }:
-
-stdenvNoCC.mkDerivation {
-  name = "sources";
-  src = lib.cleanSource ../../../pkg;
-
-  buildInputs = [ bc ];
-
-  outputs = [ "out" "goerli" ];
-
-  phases = [ "mainnetPhase" "goerliPhase" ];
-
-  mainnetPhase = ''
-    cp -r $src $out
-    chmod -R u+w $out
-  '';
-
-  goerliPhase = ''
-    cp -r $src tmp
-    chmod -R u+w tmp
-
-    ZUSE=tmp/arvo/sys/zuse.hoon
-    AMES=tmp/arvo/sys/vane/ames.hoon
-    ACME=tmp/arvo/app/acme.hoon
-
-    # Replace the mainnet azimuth contract with the goerli contract
-    sed --in-place \
-      's/\(\+\+  contracts  \)mainnet\-contracts/\1goerli-contracts/' \
-      $ZUSE
-
-    # Increment the %ames protocol version
-    sed -r --in-place \
-      's_^(=/  protocol\-version=\?\(.*\)  %)([0-7])_echo "\1$(echo "(\2+1) % 8" | bc)"_e' \
-      $AMES
-
-    # Use the staging API in :acme
-    sed --in-place \
-      's_https://acme-v02.api.letsencrypt.org/directory_https://acme-staging-v02.api.letsencrypt.org/directory_' \
-      $ACME
-
-    cp -r tmp $goerli
-    chmod -R u+w $goerli
-  '';
-
-  preferLocalBuild = true;
-}

nix/pkgs/murmur3/default.nix

@@ -1,17 +0,0 @@
-{ stdenv, sources }:
-
-stdenv.mkDerivation {
-  pname = "murmur3";
-  version = sources.murmur3.rev;
-  src = sources.murmur3;
-
-  buildPhase = ''
-    $CC -fPIC -O3 -o murmur3.o -c $src/murmur3.c
-  '';
-
-  installPhase = ''
-    mkdir -p $out/{lib,include}
-    $AR rcs $out/lib/libmurmur3.a murmur3.o
-    cp $src/*.h $out/include/
-  '';
-}

nix/pkgs/pill/brass.nix

@@ -1,22 +0,0 @@
-{ lib, stdenvNoCC, fetchGitHubLFS, bootFakeShip, solid, urbit, arvo, curl
-, withGoerli ? false }:
-
-let
-
-  lfs = fetchGitHubLFS { src = ../../../bin/brass.pill; };
-
-in {
-  build = import ./builder.nix {
-    inherit stdenvNoCC urbit curl;
-
-    name = "brass" + lib.optionalString withGoerli "-goerli";
-    builder = ./brass.sh;
-    arvo = if withGoerli then arvo.goerli else arvo;
-    pier = bootFakeShip {
-      inherit urbit;
-
-      pill = solid.lfs;
-      ship = "zod";
-    };
-  };
-} // lib.optionalAttrs (!withGoerli) { inherit lfs; }

nix/pkgs/pill/brass.sh

@@ -1,40 +0,0 @@
-source $stdenv/setup
-
-set -euo pipefail
-
-cp -r $src ./pier
-chmod -R u+rw ./pier
-
-urbit -d ./pier
-
-cleanup () {
-  if [ -f ./pier/.vere.lock ]; then
-    kill $(< ./pier/.vere.lock) || true
-  fi
-}
-
-trap cleanup EXIT
-
-header "running +brass"
-
-port=$(cat ./pier/.http.ports | grep loopback | tr -s ' ' '\n' | head -n 1)
-
-lensa() {
-  # -f elided, this can hit server-side timeouts
-  curl -s                                                              \
-    --data "{\"source\":{\"dojo\":\"$2\"},\"sink\":{\"app\":\"$1\"}}"  \
-    "http://localhost:$port" | xargs printf %s | sed 's/\\n/\n/g'
-}
-
-lensf() {
-  # -f elided, this can hit server-side timeouts
-  d=$(echo $1 | sed 's/\./\//g')
-  curl -sJO                                                                   \
-    --data "{\"source\":{\"dojo\":\"$2\"},\"sink\":{\"output-pill\":\"$d\"}}" \
-    "http://localhost:$port"
-}
-
-lensf brass.pill '+brass'
-lensa hood '+hood/exit'
-
-stopNest

nix/pkgs/pill/builder.nix

@@ -1,16 +0,0 @@
-{ stdenvNoCC, urbit, arvo, curl, name, builder, pier }:
-
-stdenvNoCC.mkDerivation {
-  name = "${name}.pill";
-  src = pier;
-  buildInputs = [ curl urbit ];
-  dontUnpack = true;
-
-  buildPhase = builtins.readFile builder;
-
-  installPhase = ''
-    mv ${name}.pill $out
-  '';
-
-  ARVO = arvo;
-}

nix/pkgs/pill/ivory.nix

@@ -1,42 +0,0 @@
-{ lib, stdenvNoCC, fetchGitHubLFS, bootFakeShip, solid, urbit, arvo, curl, xxd
-, withGoerli ? false }:
-
-let
-
-  lfs = fetchGitHubLFS { src = ../../../bin/ivory.pill; };
-
-in {
-  build = import ./builder.nix {
-    inherit stdenvNoCC urbit curl;
-
-    name = "ivory" + lib.optionalString withGoerli "-goerli";
-    builder = ./ivory.sh;
-    arvo = if withGoerli then arvo.goerli else arvo;
-    pier = bootFakeShip {
-      inherit urbit;
-
-      pill = solid.lfs;
-      ship = "zod";
-    };
-  };
-
-  # The hexdump of the `.lfs` pill contents as a C header.
-  header = stdenvNoCC.mkDerivation {
-    name = "ivory-header";
-    src = lfs;
-    nativeBuildInputs = [ xxd ];
-    phases = [ "installPhase" ];
-
-    installPhase = ''
-      file=u3_Ivory.pill
-
-      header "writing $file"
-
-      mkdir -p $out/include
-      cat $src > $file
-      xxd -i $file > $out/include/ivory_impl.h
-    '';
-
-    preferLocalBuild = true;
-  };
-} // lib.optionalAttrs (!withGoerli) { inherit lfs; }

nix/pkgs/pill/ivory.sh

@@ -1,40 +0,0 @@
-source $stdenv/setup
-
-set -euo pipefail
-
-cp -r $src ./pier
-chmod -R u+rw ./pier
-
-urbit -d ./pier
-
-cleanup () {
-  if [ -f ./pier/.vere.lock ]; then
-    kill $(< ./pier/.vere.lock) || true
-  fi
-}
-
-trap cleanup EXIT
-
-header "running +ivory"
-
-port=$(cat ./pier/.http.ports | grep loopback | tr -s ' ' '\n' | head -n 1)
-
-lensa() {
-  # -f elided, this can hit server-side timeouts
-  curl -s                                                              \
-    --data "{\"source\":{\"dojo\":\"$2\"},\"sink\":{\"app\":\"$1\"}}"  \
-    "http://localhost:$port" | xargs printf %s | sed 's/\\n/\n/g'
-}
-
-lensf() {
-  # -f elided, this can hit server-side timeouts
-  d=$(echo $1 | sed 's/\./\//g')
-  curl -sJO                                                                   \
-    --data "{\"source\":{\"dojo\":\"$2\"},\"sink\":{\"output-pill\":\"$d\"}}" \
-    "http://localhost:$port"
-}
-
-lensf ivory.pill '+ivory'
-lensa hood '+hood/exit'
-
-stopNest

nix/pkgs/pill/solid.nix

@@ -1,23 +0,0 @@
-{ stdenvNoCC, fetchGitHubLFS, bootFakeShip, solid, urbit, arvo, curl }:
-
-let
-
-  lfs = fetchGitHubLFS { src = ../../../bin/solid.pill; };
-
-in {
-  inherit lfs;
-
-  build = import ./builder.nix {
-    inherit stdenvNoCC urbit arvo curl;
-
-    name = "solid";
-    builder = ./solid.sh;
-    pier = bootFakeShip {
-      inherit urbit;
-
-      arvo = null;
-      pill = solid.lfs;
-      ship = "zod";
-    };
-  };
-}

nix/pkgs/pill/solid.sh

@@ -1,99 +0,0 @@
-source $stdenv/setup
-
-set -euo pipefail
-
-ARVO=${ARVO?:ARVO location is unset}
-
-cp -r $src ./pier
-chmod -R u+rw ./pier
-
-urbit -d ./pier
-
-cleanup () {
-  if [ -f ./pier/.vere.lock ]; then
-    kill $(< ./pier/.vere.lock) || true
-  fi
-}
-
-trap cleanup EXIT
-
-port=$(cat ./pier/.http.ports | grep loopback | tr -s ' ' '\n' | head -n 1)
-
-lensa() {
-  # -f elided, this can hit server-side timeouts
-  curl -s                                                              \
-    --data "{\"source\":{\"dojo\":\"$2\"},\"sink\":{\"app\":\"$1\"}}"  \
-    "http://localhost:$port" | xargs printf %s | sed 's/\\n/\n/g'
-}
-
-lensf() {
-  # -f elided, this can hit server-side timeouts
-  d=$(echo $1 | sed 's/\./\//g')
-  curl -sJO                                                                   \
-    --data "{\"source\":{\"dojo\":\"$2\"},\"sink\":{\"output-pill\":\"$d\"}}" \
-    "http://localhost:$port"
-}
-
-header "updating %base"
-
-# Update pill strategy to ensure correct staging
-lensa hood "+hood/mount /=base="
-
-until [ -d ./pier/base ]; do
-  sleep 1
-done
-
-# Update :lens, :dojo and dependencies
-# FIXME: reduce this list
-cp $ARVO/app/lens.hoon   ./pier/base/app/
-cp $ARVO/app/dojo.hoon   ./pier/base/app/
-cp $ARVO/lib/plume.hoon  ./pier/base/lib/
-cp $ARVO/lib/server.hoon ./pier/base/lib/
-cp $ARVO/lib/sole.hoon   ./pier/base/lib/
-cp $ARVO/lib/xray.hoon   ./pier/base/lib/
-cp $ARVO/lib/pprint.hoon ./pier/base/lib/
-
-mkdir -p ./pier/base/mar/lens/
-
-cp $ARVO/mar/lens/*      ./pier/base/mar/lens/
-
-cp $ARVO/sur/lens.hoon   ./pier/base/sur/
-cp $ARVO/sur/plum.hoon   ./pier/base/sur/
-cp $ARVO/sur/sole.hoon   ./pier/base/sur/
-cp $ARVO/sur/xray.hoon   ./pier/base/sur/
-
-# Update +solid and its dependencies
-cp $ARVO/lib/pill.hoon   ./pier/base/lib/
-cp $ARVO/gen/solid.hoon  ./pier/base/gen/
-
-chmod -R u+rw ./pier/base/
-
-lensa hood "+hood/commit %base"
-lensa hood "+hood/unmount %base"
-
-# FIXME: horrible hack to ensure the update is applied first
-sleep 10
-
-header "updating %stage"
-
-# Stage new desk for pill contents
-lensa hood '+hood/merge %stage our %base'
-lensa hood "+hood/mount /=stage="
-
-until [ -d ./pier/stage ]; do
-  sleep 1
-done
-
-rm -rf ./pier/stage
-cp -r $ARVO ./pier/stage
-chmod -R u+rw ./pier/stage
-
-lensa hood "+hood/commit %stage"
-lensa hood "+hood/unmount %stage"
-
-header "running +solid"
-
-lensf solid.pill '+solid /=stage=/sys, =dub &'
-lensa hood '+hood/exit'
-
-stopNest

nix/pkgs/softfloat3/default.nix

@@ -1,28 +0,0 @@
-{ stdenv, sources, enableParallelBuilding ? true }:
-
-stdenv.mkDerivation {
-  pname = "softfloat3";
-  version = sources.softfloat3.rev;
-  src = sources.softfloat3;
-
-  postPatch = ''
-    for f in $(find build -type f -name 'Makefile'); do
-      substituteInPlace $f \
-        --replace 'gcc' '$(CC)' \
-        --replace 'ar crs' '$(AR) crs'
-    done
-  '';
-
-  preBuild = ''
-    cd build/Linux-x86_64-GCC 
-  '';
-
-  installPhase = ''
-    mkdir -p $out/{lib,include}
-    cp $src/source/include/*.h $out/include/
-    cp softfloat.a $out/lib/libsoftfloat3.a
-  '';
-
-  inherit enableParallelBuilding;
-}
-

nix/pkgs/urbit/default.nix

@@ -1,85 +0,0 @@
-{ lib, stdenv, coreutils, pkgconfig                      # build/env
-, cacert, ca-bundle, ivory                               # codegen
-, curlUrbit, ent, gmp, h2o, libsigsegv, libuv, lmdb      # libs
-, murmur3, openssl, openssl-static-osx, softfloat3       #
-, urcrypt, zlib, zlib-static-osx                         #
-, enableStatic           ? stdenv.hostPlatform.isStatic  # opts
-, enableDebug            ? false
-, verePace               ? ""
-, doCheck                ? true
-, enableParallelBuilding ? true
-, dontStrip              ? true }:
-
-let
-
-  src = lib.cleanSource ../../../pkg/urbit;
-
-  version = builtins.readFile "${src}/version";
-
-  # See https://github.com/urbit/urbit/issues/5561
-  oFlags =
-    if stdenv.isDarwin
-    then (if enableDebug then [ "-O0" "-g" ] else [ "-O3" ])
-    else [ (if enableDebug then "-O0" else "-O3") "-g" ];
-
-in stdenv.mkDerivation {
-  inherit src version;
-
-  pname = "urbit" + lib.optionalString enableDebug "-debug"
-    + lib.optionalString enableStatic "-static";
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  buildInputs = [
-    cacert
-    ca-bundle
-    curlUrbit
-    ent
-    gmp
-    h2o
-    ivory.header
-    libsigsegv
-    libuv
-    lmdb
-    murmur3
-    (if stdenv.isDarwin && enableStatic then openssl-static-osx else openssl)
-    softfloat3
-    urcrypt
-    (if stdenv.isDarwin && enableStatic then zlib-static-osx else zlib)
-  ];
-
-  # Ensure any `/usr/bin/env bash` shebang is patched.
-  postPatch = ''
-    patchShebangs ./configure
-  '';
-
-  checkTarget = "test";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ./build/urbit $out/bin/urbit
-  '';
-
-  dontDisableStatic = enableStatic;
-
-  configureFlags = if enableStatic
-    then [ "--disable-shared" "--enable-static" ]
-    else [];
-
-  CFLAGS = oFlags ++ lib.optionals (!enableDebug) [ "-Werror" ];
-
-  MEMORY_DEBUG = enableDebug;
-  CPU_DEBUG = enableDebug;
-  EVENT_TIME_DEBUG = false;
-  VERE_PACE = if enableStatic then verePace else "";
-
-  # See https://github.com/NixOS/nixpkgs/issues/18995
-  hardeningDisable = lib.optionals enableDebug [ "all" ];
-
-  inherit enableParallelBuilding doCheck dontStrip;
-
-  meta = {
-    debug = enableDebug;
-    arguments = lib.optionals enableDebug [ "-g" ];
-  };
-}

nix/pkgs/urcrypt/default.nix

@@ -1,21 +0,0 @@
-{ stdenv, autoreconfHook, pkgconfig
-, libaes_siv, openssl, openssl-static-osx, secp256k1
-, enableStatic ? stdenv.hostPlatform.isStatic }:
-
-stdenv.mkDerivation rec {
-  name = "urcrypt";
-  src  = ../../../pkg/urcrypt;
-
-  # XX why are these required for darwin?
-  dontDisableStatic = enableStatic;
-
-  configureFlags = if enableStatic
-    then [ "--disable-shared" "--enable-static" ]
-    else [];
-
-  nativeBuildInputs =
-    [ autoreconfHook pkgconfig ];
-
-  propagatedBuildInputs =
-    [ openssl secp256k1 libaes_siv ];
-}

nix/sources-openssl.json

@@ -1,18 +0,0 @@
-{
-    "openssl": {
-        "branch": "1_1_1n",
-        "homepage": "https://www.openssl.org/",
-        "pmnsh": {
-            "include": "build/include",
-            "lib": "build",
-            "prepare": "./config --prefix=`mkdir -p build && readlink -f ./build` --libdir=. no-shared no-tests",
-            "make": "install_dev"
-        },
-        "owner": "openssl",
-        "repo": "openssl",
-        "rev": "OpenSSL_1_1_1n",
-        "type": "tarball",
-        "url": "https://github.com/openssl/openssl/archive/refs/tags/OpenSSL_1_1_1n.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/refs/tags/<rev>.tar.gz"
-    }
-}

nix/sources-pmnsh.json

@@ -1,95 +0,0 @@
-{
-    "curl": {
-        "branch": "master",
-        "description": "A command line tool and library for transferring data with URL syntax",
-        "homepage": "http://curl.se/",
-        "pmnsh": {
-            "compat": {
-                "openbsd": {
-                    "prepare": "autoreconf -vfi && ./configure --disable-shared --disable-ldap --disable-rtsp --without-brotli --without-libidn2 --without-libpsl --without-nghttp2 --with-openssl=`readlink -f ../openssl/build`"
-                }
-            },
-            "include": "include",
-            "lib": "lib/.libs",
-            "prepare": "autoreconf -vfi && ./configure --disable-shared --disable-ldap --disable-rtsp --without-brotli --without-libidn2 --without-libpsl --without-nghttp2 --with-openssl",
-            "make": "-C lib libcurl.la"
-        },
-        "owner": "curl",
-        "repo": "curl",
-        "rev": "curl-7_77_0",
-        "type": "tarball",
-        "url": "https://github.com/curl/curl/archive/curl-7_77_0.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "lmdb": {
-        "branch": "mdb.master",
-        "description": "LMDB library",
-        "homepage": "http://www.lmdb.tech/",
-        "pmnsh": {
-            "strip": 2,
-            "make": "liblmdb.a"
-        },
-        "owner": "LMDB",
-        "repo": "lmdb",
-        "rev": "48a7fed59a8aae623deff415dda27097198ca0c1",
-        "type": "tarball",
-        "url": "https://github.com/LMDB/lmdb/archive/48a7fed59a8aae623deff415dda27097198ca0c1.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "secp256k1": {
-        "branch": "master",
-        "description": "Optimized C library for ECDSA signatures and secret/public key operations on curve secp256k1.",
-        "homepage": null,
-        "owner": "bitcoin-core",
-        "pmnsh": {
-            "include": "include",
-            "lib": ".libs",
-            "make": "libsecp256k1.la",
-            "prepare": "./autogen.sh && ./configure --disable-shared --enable-benchmark=no --enable-exhaustive-tests=no --enable-experimental --enable-module-ecdh --enable-module-recovery --enable-module-schnorrsig --enable-tests=yes CFLAGS=-DSECP256K1_API="
-        },
-        "repo": "secp256k1",
-        "rev": "5dcc6f8dbdb1850570919fc9942d22f728dbc0af",
-        "sha256": "x9qG2S6tBSRseWaFIN9N2fRpY1vkv8idT3d3rfJnmaU",
-        "type": "tarball",
-        "url": "https://github.com/bitcoin-core/secp256k1/archive/5dcc6f8dbdb1850570919fc9942d22f728dbc0af.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "uv": {
-        "branch": "v1.x",
-        "description": "Cross-platform asynchronous I/O",
-        "homepage": "http://libuv.org/",
-        "pmnsh": {
-            "include": "include",
-            "lib": ".libs",
-            "prepare": "./autogen.sh && ./configure --disable-shared",
-            "make": "libuv.la",
-            "compat": {
-                "m1brew": false
-            }
-        },
-        "owner": "libuv",
-        "repo": "libuv",
-        "rev": "v1.40.0",
-        "type": "tarball",
-        "url": "https://github.com/libuv/libuv/archive/v1.40.0.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "ent": {
-        "pmnsh": {
-            "prepare": "./configure"
-        }
-    },
-    "urcrypt": {
-        "pmnsh": {
-            "compat": {
-                "openbsd": {
-                    "make": "install prefix=`readlink -f .` exec_prefix=`readlink -f .`",
-                    "include": "include",
-                    "lib": "lib"
-                }
-            },
-            "prepare": "./autogen.sh && ./configure --disable-shared PKG_CONFIG_PATH=../secp256k1 CFLAGS=\"-I../secp256k1/include -I../libaes_siv\" LDFLAGS=-L../libaes_siv",
-            "make": "install"
-        }
-    }
-}

nix/sources.json

@@ -1,123 +0,0 @@
-{
-    "h2o": {
-        "branch": "master",
-        "description": "H2O - the optimized HTTP/1, HTTP/2, HTTP/3 server",
-        "homepage": "https://h2o.examp1e.net",
-        "owner": "h2o",
-        "pmnsh": {
-            "compat": {
-                "mingw": {
-                    "prepare": "cmake -G\"MSYS Makefiles\" -DCMAKE_INSTALL_PREFIX=. ."
-                },
-                "openbsd": {
-                    "prepare": "cmake -DOPENSSL_ROOT_DIR=`readlink -f ../openssl/build` ."
-                }
-            },
-            "include": "include",
-            "make": "libh2o",
-            "prepare": "cmake ."
-        },
-        "repo": "h2o",
-        "rev": "v2.2.6",
-        "sha256": "0qni676wqvxx0sl0pw9j0ph7zf2krrzqc1zwj73mgpdnsr8rsib7",
-        "type": "tarball",
-        "url": "https://github.com/h2o/h2o/archive/v2.2.6.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "libaes_siv": {
-        "branch": "master",
-        "description": null,
-        "homepage": null,
-        "owner": "dfoxfranke",
-        "pmnsh": {
-            "compat": {
-                "m1brew": {
-                    "make": "install CFLAGS=$(pkg-config --cflags openssl)",
-                    "prepare": "cmake ."
-                },
-                "mingw": {
-                    "make": "aes_siv_static",
-                    "prepare": "cmake -G\"MSYS Makefiles\" -DDISABLE_DOCS:BOOL=ON ."
-                },
-                "openbsd": {
-                    "make": "aes_siv_static",
-                    "prepare": "cmake -DDISABLE_DOCS:BOOL=ON -DOPENSSL_ROOT_DIR=`readlink -f ../openssl/build` ."
-                }
-            }
-        },
-        "repo": "libaes_siv",
-        "rev": "9681279cfaa6e6399bb7ca3afbbc27fc2e19df4b",
-        "sha256": "1g4wy0m5wpqx7z6nillppkh5zki9fkx9rdw149qcxh7mc5vlszzi",
-        "type": "tarball",
-        "url": "https://github.com/dfoxfranke/libaes_siv/archive/9681279cfaa6e6399bb7ca3afbbc27fc2e19df4b.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "murmur3": {
-        "branch": "master",
-        "description": null,
-        "homepage": null,
-        "owner": "urbit",
-        "pmnsh": {
-            "make": "static"
-        },
-        "repo": "murmur3",
-        "rev": "71a75d57ca4e7ca0f7fc2fd84abd93595b0624ca",
-        "sha256": "0k7jq2nb4ad9ajkr6wc4w2yy2f2hkwm3nkbj2pklqgwsg6flxzwg",
-        "type": "tarball",
-        "url": "https://github.com/urbit/murmur3/archive/71a75d57ca4e7ca0f7fc2fd84abd93595b0624ca.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "niv": {
-        "branch": "master",
-        "description": "Easy dependency management for Nix projects",
-        "homepage": "https://github.com/nmattia/niv",
-        "owner": "nmattia",
-        "repo": "niv",
-        "rev": "9d35b9e4837ab88517210b1701127612c260eccf",
-        "sha256": "0q50xhnm8g2yfyakrh0nly4swyygxpi0a8cb9gp65wcakcgvzvdh",
-        "type": "tarball",
-        "url": "https://github.com/nmattia/niv/archive/9d35b9e4837ab88517210b1701127612c260eccf.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "nixpkgs": {
-        "branch": "master",
-        "description": "Nix Packages collection",
-        "homepage": "",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "376d67e1cd05d5ac8a64a3f47f17b80fb6394792",
-        "sha256": "1l4ai1dppwdbkkjbvnavsivr5kx00b3q8640pilpnifskfmfc8mp",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/376d67e1cd05d5ac8a64a3f47f17b80fb6394792.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "softfloat3": {
-        "branch": "master",
-        "description": null,
-        "homepage": null,
-        "owner": "urbit",
-        "pmnsh": {
-            "compat": {
-                "m1brew": {
-                    "lib": "build/template-FAST_INT64",
-                    "make": "-C build/template-FAST_INT64 libsoftfloat3.a"
-                },
-                "mingw": {
-                    "lib": "build/Win64-MinGW-w64",
-                    "make": "-C build/Win64-MinGW-w64 libsoftfloat3.a"
-                },
-                "openbsd": {
-                    "lib": "build/template-FAST_INT64",
-                    "make": "-C build/template-FAST_INT64 libsoftfloat3.a"
-                }
-            },
-            "include": "source/include"
-        },
-        "repo": "berkeley-softfloat-3",
-        "rev": "ec4c7e31b32e07aad80e52f65ff46ac6d6aad986",
-        "sha256": "1lz4bazbf7lns1xh8aam19c814a4n4czq5xsq5rmi9sgqw910339",
-        "type": "tarball",
-        "url": "https://github.com/urbit/berkeley-softfloat-3/archive/ec4c7e31b32e07aad80e52f65ff46ac6d6aad986.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    }
-}

nix/sources.nix

@@ -1,174 +0,0 @@
-# This file has been generated by Niv.
-
-let
-
-  #
-  # The fetchers. fetch_<type> fetches specs of type <type>.
-  #
-
-  fetch_file = pkgs: name: spec:
-    let
-      name' = sanitizeName name + "-src";
-    in
-      if spec.builtin or true then
-        builtins_fetchurl { inherit (spec) url sha256; name = name'; }
-      else
-        pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
-
-  fetch_tarball = pkgs: name: spec:
-    let
-      name' = sanitizeName name + "-src";
-    in
-      if spec.builtin or true then
-        builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
-      else
-        pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
-
-  fetch_git = name: spec:
-    let
-      ref =
-        if spec ? ref then spec.ref else
-          if spec ? branch then "refs/heads/${spec.branch}" else
-            if spec ? tag then "refs/tags/${spec.tag}" else
-              abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
-    in
-      builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };
-
-  fetch_local = spec: spec.path;
-
-  fetch_builtin-tarball = name: throw
-    ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`.
-        $ niv modify ${name} -a type=tarball -a builtin=true'';
-
-  fetch_builtin-url = name: throw
-    ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`.
-        $ niv modify ${name} -a type=file -a builtin=true'';
-
-  #
-  # Various helpers
-  #
-
-  # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695
-  sanitizeName = name:
-    (
-      concatMapStrings (s: if builtins.isList s then "-" else s)
-        (
-          builtins.split "[^[:alnum:]+._?=-]+"
-            ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name)
-        )
-    );
-
-  # The set of packages used when specs are fetched using non-builtins.
-  mkPkgs = sources: system:
-    let
-      sourcesNixpkgs =
-        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; };
-      hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
-      hasThisAsNixpkgsPath = <nixpkgs> == ./.;
-    in
-      if builtins.hasAttr "nixpkgs" sources
-      then sourcesNixpkgs
-      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
-        import <nixpkgs> {}
-      else
-        abort
-          ''
-            Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
-            add a package called "nixpkgs" to your sources.json.
-          '';
-
-  # The actual fetching function.
-  fetch = pkgs: name: spec:
-
-    if ! builtins.hasAttr "type" spec then
-      abort "ERROR: niv spec ${name} does not have a 'type' attribute"
-    else if spec.type == "file" then fetch_file pkgs name spec
-    else if spec.type == "tarball" then fetch_tarball pkgs name spec
-    else if spec.type == "git" then fetch_git name spec
-    else if spec.type == "local" then fetch_local spec
-    else if spec.type == "builtin-tarball" then fetch_builtin-tarball name
-    else if spec.type == "builtin-url" then fetch_builtin-url name
-    else
-      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
-
-  # If the environment variable NIV_OVERRIDE_${name} is set, then use
-  # the path directly as opposed to the fetched source.
-  replace = name: drv:
-    let
-      saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
-      ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
-    in
-      if ersatz == "" then drv else
-        # this turns the string into an actual Nix path (for both absolute and
-        # relative paths)
-        if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
-
-  # Ports of functions for older nix versions
-
-  # a Nix version of mapAttrs if the built-in doesn't exist
-  mapAttrs = builtins.mapAttrs or (
-    f: set: with builtins;
-    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
-  );
-
-  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
-  range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1);
-
-  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
-  stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
-
-  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
-  stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
-  concatMapStrings = f: list: concatStrings (map f list);
-  concatStrings = builtins.concatStringsSep "";
-
-  # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
-  optionalAttrs = cond: as: if cond then as else {};
-
-  # fetchTarball version that is compatible between all the versions of Nix
-  builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchTarball;
-    in
-      if lessThan nixVersion "1.12" then
-        fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
-      else
-        fetchTarball attrs;
-
-  # fetchurl version that is compatible between all the versions of Nix
-  builtins_fetchurl = { url, name ? null, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchurl;
-    in
-      if lessThan nixVersion "1.12" then
-        fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
-      else
-        fetchurl attrs;
-
-  # Create the final "sources" from the config
-  mkSources = config:
-    mapAttrs (
-      name: spec:
-        if builtins.hasAttr "outPath" spec
-        then abort
-          "The values in sources.json should not have an 'outPath' attribute"
-        else
-          spec // { outPath = replace name (fetch config.pkgs name spec); }
-    ) config.sources;
-
-  # The "config" used by the fetchers
-  mkConfig =
-    { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
-    , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
-    , system ? builtins.currentSystem
-    , pkgs ? mkPkgs sources system
-    }: rec {
-      # The sources, i.e. the attribute set of spec name to spec
-      inherit sources;
-
-      # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
-      inherit pkgs;
-    };
-
-in
-mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }

nix/test-fake-ship.nix

@@ -0,0 +1,125 @@
+{ click, pier, pkgs }:
+
+let
+  poke = ''
+    =>
+    |%
+    ++  take-poke-ack
+      |=  =wire
+      =/  m  (strand ,?)
+      ^-  form:m
+      |=  tin=strand-input:strand
+      ?+  in.tin  `[%skip ~]
+          ~  `[%wait ~]
+          [~ %agent * %poke-ack *]
+        ?.  =(wire wire.u.in.tin)
+          `[%skip ~]
+        ?~  p.sign.u.in.tin
+          `[%done %.y]
+        `[%done %.n]
+      ==
+    ++  poke
+      |=  [=dock =cage]
+      =/  m  (strand ,?)
+      ^-  form:m
+      =/  =card:agent:gall  [%pass /poke %agent dock %poke cage]
+      ;<  ~  bind:m  (send-raw-card card)
+      (take-poke-ack /poke)
+    -- 
+    
+  '';
+  testThread = dojoCommand:
+    pkgs.writeTextFile {
+      name = "${dojoCommand}.hoon";
+      text = ''
+        ${poke}
+        =/  m  (strand ,vase)
+        ;<  [=ship =desk =case]  bind:m  get-beak
+        ;<  ok=?  bind:m  (poke [ship %dojo] %lens-command !>([%$ [%dojo '${dojoCommand}'] [%stdout ~]]))
+        (pure:m !>(ok))
+      '';
+    };
+  appThread = generator: app:
+    pkgs.writeTextFile {
+      name = ":${app}|${generator}.hoon";
+      text = ''
+        ${poke}
+        =/  m  (strand ,vase)
+        ;<  [=ship =desk =case]  bind:m  get-beak
+        ;<  ok=?  bind:m  (poke [ship %dojo] %lens-command !>([%$ [%dojo '+${app}/${generator}'] [%app %${app}]]))
+        (pure:m !>(ok))
+      '';
+    };
+  pokeApp = hoon: mark: app:
+    pkgs.writeTextFile {
+      name = ":${app} &${mark} ${hoon}.hoon";
+      text = ''
+        ${poke}
+        =/  m  (strand ,vase)
+        ;<  [=ship =desk =case]  bind:m  get-beak
+        ;<  ok=?  bind:m  (poke [ship %${app}] %${mark} !>(${hoon}))
+        (pure:m !>(ok))
+      '';
+    };
+in pkgs.stdenvNoCC.mkDerivation {
+  name = "test-urbit";
+
+  src = pier;
+
+  phases = [ "unpackPhase" "buildPhase" "checkPhase" ];
+
+  nativeBuildInputs = [ pkgs.netcat ];
+
+  unpackPhase = ''
+    cp -R $src ./pier
+    chmod -R u+rw ./pier
+  '';
+
+  buildPhase = ''
+    set -x
+    set -e
+
+    ${../urbit} -d ./pier 1>&2 2> $out
+
+    tail -F $out >&2 &
+ 
+    ${click} -k -p -i ${appThread "mass" "hood"} ./pier
+
+    sleep 2
+
+    ${click} -k -p -i ${testThread "-test %/tests ~"} ./pier
+
+    ${click} -k -p -i ${pokeApp "%agents" "noun" "test"} ./pier
+    ${click} -k -p -i ${pokeApp "%generators" "noun" "test"} ./pier
+    ${click} -k -p -i ${pokeApp "%marks" "noun" "test"} ./pier
+
+    ${click} -k -p -i ${appThread "mass" "hood"} ./pier
+    sleep 2
+
+    ${click} -k -p -i ${pokeApp "~" "helm-pack" "hood"} ./pier
+
+    ${click} -k -p -i ${appThread "trim" "hood"} ./pier
+
+    ${click} -k -p -i ${appThread "mass" "hood"} ./pier
+
+    ${click} -k -p -i ${appThread "meld" "hood"} ./pier
+
+    ${click} -k -p -i ${appThread "mass" "hood"} ./pier
+
+    ${click} -k -p -i ${appThread "exit" "hood"} ./pier
+
+    set +x
+  '';
+
+  checkPhase = ''
+    if egrep "((FAILED|CRASHED|Failed)|warn:)" $out >/dev/null; then
+      exit 1
+    fi
+  '';
+
+  doCheck = true;
+
+  # Fix 'bind: operation not permitted' when nix.useSandbox = true on darwin.
+  # See https://github.com/NixOS/nix/blob/5f6840fbb49ae5b534423bd8a4360646ee93dbaf/src/libstore/build.cc#L2961
+  __darwinAllowLocalNetworking = true;
+}

pkg/arvo/app/acme.hoon

@@ -346,6 +346,7 @@
   ++  on-poke
     |=  [=mark =vase]
     ^-  (quip card _this)
+    ?>  (team:title [our src]:bowl)
     =^  cards  state
       ?+  mark  (on-poke:def mark vase)
         %acme-order  (poke-acme-order:ac !<((set turf) vase))
@@ -460,7 +461,7 @@
   :-  ~
   ^-  octs
   =;  pro=json
-    (as-octt:mimes:html (en-json:html (sign:jws key.act pro bod)))
+    (as-octs:mimes:html (en:json:html (sign:jws key.act pro bod)))
   :-  %o  %-  my  :~
     nonce+s+non
     url+s+(crip (en-purl:html url))
@@ -487,7 +488,7 @@
   ::
   ?.  =(400 p.rep)  |
   ?~  r.rep  |
-  =/  jon=(unit json)  (de-json:html q.u.r.rep)
+  =/  jon=(unit json)  (de:json:html q.u.r.rep)
   ?~  jon  |
   =('urn:ietf:params:acme:error:badNonce' type:(error:grab u.jon))
 ::  +rate-limited: handle Acme service rate-limits
@@ -496,7 +497,7 @@
   |=  [try=@ud act=@tas spur=wire bod=(unit octs)]
   ^+  this
   =/  jon=(unit json)
-    ?~(bod ~ (de-json:html q.u.bod))
+    ?~(bod ~ (de:json:html q.u.bod))
   ?~  jon
     ::  no details, back way off
     ::  XX specifically based on wire
@@ -839,7 +840,7 @@
       ?:  (lth try 10)
         (retry:effect try %directory / (min ~m30 (backoff try)))
       (emil (notify (failure-message directory-base) [(sell !>(rep)) ~]))
-    =.  dir  (directory:grab (need (de-json:html q:(need r.rep))))
+    =.  dir  (directory:grab (need (de:json:html q:(need r.rep))))
     ?~(reg.act register:effect this)
   ::  +nonce: accept new nonce and trigger next effect
   ::
@@ -883,7 +884,7 @@
       ?~  r.rep
         (scot %da now.bow)
       =/  bod=acct:body
-        (acct:grab (need (de-json:html q.u.r.rep)))
+        (acct:grab (need (de:json:html q.u.r.rep)))
       ?>  ?=(%valid sas.bod)
       wen.bod
     =.  reg.act  `[wen loc]
@@ -913,7 +914,7 @@
     ::  XX check status
     ::
     =/  bod=order:body
-      (order:grab (need (de-json:html q:(need r.rep))))
+      (order:grab (need (de:json:html q:(need r.rep))))
     =/  dom=(set turf)  ~(key by dom.u.next-order)
     ::  XX maybe generate key here?
     ::
@@ -956,7 +957,7 @@
       ::
       (emil (notify (failure-message ego.u.rod) [(sell !>(rep)) ~]))
     =/  bod=order:body
-      (order:grab (need (de-json:html q:(need r.rep))))
+      (order:grab (need (de:json:html q:(need r.rep))))
     ?+  sas.bod
       ~&  [%check-order-status-unknown sas.bod]
       this
@@ -1063,7 +1064,7 @@
       ::
       (emil (notify (failure-message i.pending.aut.u.rod) [(sell !>(rep)) ~]))
     =/  bod=auth:body
-      (auth:grab (need (de-json:html q:(need r.rep))))
+      (auth:grab (need (de:json:html q:(need r.rep))))
     =/  cal=trial
        ::  XX parse token to verify url-safe base64?
        ::
@@ -1147,7 +1148,7 @@
       ::  XX get challenge, confirm urn:ietf:params:acme:error:connection
       ::
       ::  =/  err=error:body
-      ::    (error:grab (need (de-json:html q:(need r.rep))))
+      ::    (error:grab (need (de:json:html q:(need r.rep))))
       ::  ?:  =('urn:ietf:params:acme:error:malformed' status.err)
       ::
       =<  cancel-order:effect
@@ -1155,7 +1156,7 @@
        'unable to finalize domain validation challenge'
       (emil (notify msg [(sell !>(rep)) ~]))
     =/  bod=challenge:body
-      (challenge:grab (need (de-json:html q:(need r.rep))))
+      (challenge:grab (need (de:json:html q:(need r.rep))))
     ::  XX check for other possible values in 200 response
     ::  note: may have already been validated
     ::

pkg/arvo/app/aqua.hoon

@@ -80,6 +80,7 @@
   ::
   ++  on-poke
     |=  [=mark =vase]
+    ?>  (team:title [our src]:bowl)
     ^-  step:agent:gall
     =^  cards  state
       ?+  mark  ~|([%aqua-bad-mark mark] !!)
@@ -615,7 +616,7 @@
           ::
             ?:  fake.ae  ~
             =+  [%raw-poke %noun %refresh-rate ~s30]
-            [/g/aqua/reduce-refresh-rate %deal [. .]:who.ae %azimuth -]~
+            [/g/aqua/reduce-refresh-rate %deal [. . /]:who.ae %azimuth -]~
         ==
       ==
     =.  this

pkg/arvo/app/azimuth-rpc.hoon

@@ -45,7 +45,6 @@
     |=  [=mark =vase]
     ^-  (quip card _this)
     |^
-    ?>  (team:title our.bowl src.bowl)
     ?+  mark  (on-poke:def mark vase)
         %handle-http-request
       =+  !<([id=@ta req=inbound-request:eyre] vase)
@@ -53,6 +52,7 @@
       (handle-http-request id req)
     ::
         %azimuth-action
+      ?>  (team:title [our src]:bowl)
       =+  !<([%disconnect bind=binding:eyre] vase)
       ~&  >>>  "disconnecting at {<bind>}"
       :_  this

pkg/arvo/app/azimuth-tracker.hoon

@@ -121,6 +121,7 @@
 ::
 ++  on-poke
   |=  [=mark =vase]
+  ?>  (team:title [our src]:bowl)
   ?.  ?=(%azimuth-tracker-poke mark)
     (on-poke:def mark vase)
   =+  !<(poke=poke-data vase)

pkg/arvo/app/azimuth.hoon

@@ -208,6 +208,7 @@
   ++  on-poke
     |=  [=mark =vase]
     ^-  (quip card _this)
+    ?>  (team:title [our src]:bowl)
     ?:  =(%noun mark)
       ?+    q.vase  !!
           [%refresh-rate @]

pkg/arvo/app/claz.hoon

@@ -31,6 +31,7 @@
   ++  on-poke
     |=  [=mark =vase]
     ^-  (quip card _this)
+    ?>  (team:title [our src]:bowl)
     ?.  ?=(%noun mark)  [~ this]
     ?^  in-progress
       ~&  %still-running-please-try-again-later
@@ -269,7 +270,7 @@
   |=  reg=cord
   ^-  (list [=ship rights])
   ~|  %registration-json-insane
-  =+  jon=(need (de-json:html reg))
+  =+  jon=(need (de:json:html reg))
   ~|  %registration-json-invalid
   ?>  ?=(%o -.jon)
   =.  p.jon  (~(del by p.jon) 'idCode')

pkg/arvo/app/dbug.hoon

@@ -361,16 +361,58 @@
     ::
       [%eyre %authentication ~]
     %-  some
-    :-  %a
-    %+  turn
-      %+  sort  ~(tap by sessions:auth-state:v-eyre)
-      |=  [[@uv a=session:eyre] [@uv b=session:eyre]]
-      (gth expiry-time.a expiry-time.b)
-    |=  [cookie=@uv session:eyre]
+    =/  auth  auth-state:v-eyre
     %-  pairs
-    :~  'cookie'^s+(end [3 4] (rsh [3 2] (scot %x (shax cookie))))
-        'expiry'^(time expiry-time)
-        'channels'^(numb ~(wyt in channels))
+    :~  :-  'sessions'
+        :-  %a
+        %+  turn
+          %+  sort  ~(tap by sessions.auth)
+          |=  [[@uv a=session:eyre] [@uv b=session:eyre]]
+          (gth expiry-time.a expiry-time.b)
+        |=  [cookie=@uv session:eyre]
+        %-  pairs
+        :~  'cookie'^s+(scot %uv cookie)
+            'identity'^(render-identity:v-eyre identity)
+            'expiry'^(time expiry-time)
+            'channels'^(numb ~(wyt in channels))
+        ==
+      ::
+        :-  'visitors'
+        :-  %a
+        %+  turn
+          %+  sort  ~(tap by visitors.auth)
+          |=  [[@uv a=visitor:eyre] [@uv b=visitor:eyre]]
+          ?@  +.a  &
+          ?@  +.b  |
+          (aor (scot %p ship.a) (scot %p ship.b))
+        |=  [nonce=@uv v=visitor:eyre]
+        %-  pairs
+        :+  'nonce'^s+(scot %uv nonce)
+          'duct'^?~(duct.v ~ a+(turn u.duct.v path))
+        ?@  +.v  ['sesh' s+(scot %uv sesh.v)]~
+        :~  'pend'^b+?=(^ pend.v)
+            'ship'^(ship ship.v)
+            'last'^s+last.v
+            'toke'^?~(toke.v ~ s+(scot %uv u.toke.v))
+        ==
+      ::
+        :-  'visiting'
+        :-  %a
+        %-  zing
+        %+  turn
+          %+  sort  ~(tap by visiting.auth)
+          |=  [[a=@p *] [b=@p *]]
+          (aor (scot %p a) (scot %p b))
+        |=  [who=@p q=(qeu @uv) m=(map @uv portkey)]
+        %+  turn  ~(tap by m)
+        |=  [nonce=@uv p=portkey]
+        %-  pairs
+        :+  'who'^(ship who)
+          'nonce'^s+(scot %uv nonce)
+        ?@  p  ['made' (time made.p)]~
+        :~  ['pend' b+?=(^ pend.p)]
+            ['toke' ?~(toke.p ~ s+(scot %uv u.toke.p))]
+        ==
     ==
   ::
     ::  /eyre/channels.json
@@ -383,6 +425,7 @@
     |=  [key=@t channel:eyre]
     %-  pairs
     :~  'session'^s+key
+        'identity'^(render-identity:v-eyre identity)
         'connected'^b+!-.state
         'expiry'^?-(-.state %& (time date.p.state), %| ~)
         'next-id'^(numb next-id)
@@ -585,6 +628,8 @@
     ::      duct: ['/paths', ...],
     ::      message-num: 123
     ::    }, ...],
+    ::    closing: [bone, ..., bone],
+    ::    corked: [bone, ..., bone],
     ::    heeds: [['/paths', ...] ...]
     ::    scries:
     ::    ->  { =path
@@ -663,8 +708,8 @@
           |^  =/  mix=(list flow)
                 =-  (sort - dor)
                 %+  welp
-                  (turn ~(tap by snd) (tack %snd))
-                (turn ~(tap by rcv) (tack %rcv))
+                  (turn ~(tap by snd) (tack %snd closing corked))
+                (turn ~(tap by rcv) (tack %rcv closing corked))
               =/  [forward=(list flow) backward=(list flow)]
                 %+  skid  mix
                 |=  [=bone *]
@@ -676,6 +721,8 @@
           ::
           +$  flow
             $:  =bone
+                closing=?
+                corked=?
               ::
                 $=  state
                 $%  [%snd message-pump-state]
@@ -684,17 +731,17 @@
             ==
           ::
           ++  tack
-            |*  =term
+            |*  [=term closing=(set bone) corked=(set bone)]
             |*  [=bone =noun]
-            [bone [term noun]]
+            [bone (~(has in closing) bone) (~(has in corked) bone) [term noun]]
           ::
           ++  build
             |=  flow
             ^-  json
             %+  frond  -.state
             ?-  -.state
-              %snd  (snd-with-bone ossuary bone +.state)
-              %rcv  (rcv-with-bone ossuary bone +.state)
+              %snd  (snd-with-bone ossuary bone closing corked +.state)
+              %rcv  (rcv-with-bone ossuary bone closing corked +.state)
             ==
           --
         ::
@@ -706,6 +753,10 @@
           :*  'message-num'^(numb message-num)
               (bone-to-pairs bone ossuary)
           ==
+        ::
+          'closing'^(set-array closing numb)
+        ::
+          'corked'^(set-array corked numb)
         ::
           'heeds'^(set-array heeds from-duct)
         ::
@@ -713,14 +764,16 @@
       ==
     ::
     ++  snd-with-bone
-      |=  [=ossuary =bone message-pump-state]
+      |=  [=ossuary =bone closing=? corked=? message-pump-state]
       ^-  json
       %-  pairs
-      :*  'current'^(numb current)
+      :*  'closing'^b+closing
+          'corked'^b+corked
+          'current'^(numb current)
           'next'^(numb next)
         ::
           :-  'unsent-messages'  ::  as byte sizes
-          (set-array unsent-messages (cork (cury met 3) numb))
+          (set-array unsent-messages (cork jam (cork (cury met 3) numb)))
         ::
           'unsent-fragments'^(numb (lent unsent-fragments))  ::  as lent
         ::
@@ -768,10 +821,12 @@
       ==
     ::
     ++  rcv-with-bone
-      |=  [=ossuary =bone message-sink-state]
+      |=  [=ossuary =bone closing=? corked=? message-sink-state]
       ^-  json
       %-  pairs
-      :*  'last-acked'^(numb last-acked)
+      :*  'closing'^b+closing
+          'corked'^b+corked
+          'last-acked'^(numb last-acked)
           'last-heard'^(numb last-heard)
         ::
           :-  'pending-vane-ack'
@@ -992,6 +1047,16 @@
   ++  channel-state
     (scry ^channel-state %e %channel-state ~)
   ::
+  ++  render-identity
+    |=  =identity
+    ^-  json
+    %-  ship:enjs:format
+    ?-  -.identity
+      %ours  our.bowl
+      %fake  who.identity
+      %real  who.identity
+    ==
+  ::
   ++  render-action
     |=  =action
     ^-  json

pkg/arvo/app/dojo.hoon

@@ -115,7 +115,7 @@
 ::  |parser-at: parsers for dojo expressions using :dir as working directory
 ::
 ++  parser-at
-  |=  [our=ship dir=beam]
+  |=  [our=ship now=@da dir=beam]
   |%
   ++  default-app         %hood
   ++  hoon-parser         (vang | (en-beam dir))
@@ -129,7 +129,7 @@
     =/  =desk
       ::TODO  maybe should recognize if the user specified a desk explicitly.
       ::      currently eats the :app|desk#gen case.
-      =+  gop=(en-beam dir(q q.gol, s /$))
+      =+  gop=/(scot %p our)/[q.gol]/(scot %da now)/$
       ?.  .^(? %gu gop)
         q.dir
       .^(desk %gd gop)
@@ -365,7 +365,7 @@
     dir(r [%da now.hid])
   ::
   ++  he-beak    `beak`[p q r]:he-beam
-  ++  he-parser  (parser-at our.hid he-beam)
+  ++  he-parser  (parser-at our.hid now.hid he-beam)
   ::
   ++  dy                                                ::  project work
     |_  dojo-project                                    ::
@@ -846,7 +846,6 @@
       ::  kev: key-value named arguments
       ::  kuv: default keyword arguments
       ::  sam: fully populated sample
-      ::  rog: default gat sample
       ::
       |.  ^-  vase
       =/  gat=vase  (slot 3 q.cay)
@@ -870,9 +869,11 @@
                 !(~(has by q.cig) %drum-session)
             ==
           [[%drum-session !>(ses.id)] soz]  ::TODO  does the who matter?
-        ?:  =(~ soz)
+        ?~  soz
           (fall kuv !>(~))
-        ~|  keyword-arg-failure+~(key by q.cig)
+        ~_  'dojo: bad-keyword (supplied sample incorrect)'
+        ~_  'dojo: keywords allowed'
+        ~_  (skol p:(fall kuv !>(~)))
         %+  slap
           (with-faces kuv+(need kuv) rep+(with-faces soz) ~)
         :+  %cncb  [%kuv]~
@@ -882,13 +883,57 @@
         [[var]~ [%wing var %rep ~]]
       ::
       =/  sam=vase  :(slop ven poz kev)
-      ?.  (~(nest ut p.som) | p.sam)
-        ~>  %slog.1^leaf+"dojo: nest-need"
-        ~>  %slog.0^(skol p.som)
-        ~>  %slog.1^leaf+"dojo: nest-have"
-        ~>  %slog.0^(skol p.sam)
-        !!
-      (slam gat sam)
+      ?:  (~(nest ut p.som) | p.sam)
+        (slam gat sam)
+      ::  something is wrong
+      ::
+      %-  mean
+      ^-  (list tank)
+      =/  cez=type  [%cell %noun [%cell %noun %noun]]
+      ?.  (~(nest ut cez) | p.som)
+        ::  [ven poz kev] can't nest in som
+        ::
+        :~  'dojo: nest-need'
+            (skol p.som)
+            'dojo: nest-have'
+            (skol p.sam)
+            'dojo: bad gate lost-argument (generator incorrect)'
+        ==
+      ::
+      =/  hed=vase  (slot 2 som)
+      ?.  (~(nest ut p.hed) | p.ven)
+        ::  ven can't nest in head
+        ::
+        :~  'dojo: nest-need'
+            (skol p.hed)
+            'dojo: nest-have'
+            (skol p.ven)
+            'dojo: bad gate event-sample (generator incorrect)'
+        ==
+      ::
+      =/  zop=vase  (slot 6 som)
+      =/  lon=vase  !>(*(lest))
+      ?:  ?&  !(~(nest ut p.zop) | -:!>(~))
+              !(~(nest ut p.lon) | p.zop)
+              !(~(nest ut p.zop) | -:!>((slop zop !>(~))))
+          ==
+        ::  argument required, but nothing can nest
+        ::
+        :~  'dojo: nest-need'
+            (skol p.zop)
+            'dojo: nest-have'
+            (skol p.poz)
+            'dojo: bad gate impossible-nest (generator incorrect)'
+        ==
+      ::  poz doesn't nest in zop
+      ::
+      ?<  (~(nest ut p.zop) | p.poz)
+      :~  'dojo: nest-need'
+          (skol p.zop)
+          'dojo: nest-have'
+          (skol p.poz)
+          'dojo: bad-argument (supplied sample incorrect)'
+      ==
     ::
     ++  dy-made-dial                                    ::  dialog product
       |=  cag=cage
@@ -1172,6 +1217,16 @@
     ::
         %kick  +>.$
     ==
+  ::
+  ++  he-self
+    |=  [way=wire =sign:agent:gall]
+    ^+  +>
+    ?.  ?=(%poke-ack -.sign)
+      ~&  [%strange-self sign]
+      +>
+    ?~  p.sign
+      +>
+    (he-diff %tan leaf+"dojo: failed to process input" ~)
   ::  +he-http-response: result from http-client
   ::
   ++  he-http-response
@@ -1429,23 +1484,34 @@
     =/  naked-gen=(unit term)
       %+  rust  txt
       (full (ifix [lus (just `@`10)] ;~(pose sym (easy %$))))
-    ?~  naked-gen
+    ?^  naked-gen
+      (complete-naked-gen u.naked-gen)
+    =/  naked-ted=(unit term)
+      %+  rust  txt
+      (full (ifix [hep (just `@`10)] ;~(pose sym (easy %$))))
+    ?~  naked-ted
       res
-    (complete-naked-gen u.naked-gen)
+    (complete-naked-ted u.naked-ted)
     ::
     ++  complete-naked-poke
       |=  app=term
-      =/  pax=path
-        /(scot %p our.hid)/[q:he-beam]/(scot %da now.hid)/app
+      =+  [our=(scot %p our.hid) now=(scot %da now.hid)]
+      =+  .^(desks=(set desk) %cd /[our]//[now])
+      =.  desks  (~(del in desks) %kids)
       %+  complete  (cat 3 ':' app)
-      %+  murn  ~(tap by dir:.^(arch %cy pax))
-      |=  [=term ~]
-      ^-  (unit [^term tank])
-      ?.  =(app (end [3 (met 3 app)] term))
+      %-  zing
+      %+  turn  ~(tap in desks)
+      |=  =desk
+      %+  murn
+        %~  tap  in
+        .^((set [dude:gall ?]) %ge /[our]/[desk]/[now]/$)
+      |=  [=dude:gall live=?]
+      ^-  (unit [term tank])
+      ?.  live
         ~
-      ?~  =<(fil .^(arch %cy (weld pax ~[term %hoon])))
+      ?.  =(app (end [3 (met 3 app)] dude))
         ~
-      `[(cat 3 ':' term) *tank]
+      `[(cat 3 ':' dude) *tank]
     ::
     ++  complete-variable
       |=  variable=term
@@ -1459,14 +1525,17 @@
     ::
     ++  complete-gen-poke-to-app
       |=  [app=term gen=term]
-      =.  app
-        ?:(?=(%$ app) %hood app)
+      =?  app  =(%$ app)
+        %hood
       %+  complete
         ?:  =(%hood app)
           (cat 3 '|' gen)
         :((cury cat 3) ':' app '|' gen)
-      =/  pfix=path
-        /(scot %p our.hid)/[q:he-beam]/(scot %da now.hid)/gen/[app]
+      =+  [our=(scot %p our.hid) now=(scot %da now.hid)]
+      ?.  .^(? %gu /[our]/[app]/[now]/$)
+        ~
+      =+  .^(=desk %gd /[our]/[app]/[now]/$)
+      =/  pfix=path  /[our]/[desk]/[now]/gen/[app]
       ::
       %^  tab-generators:auto  pfix  `app
       %+  murn
@@ -1493,6 +1562,27 @@
         ~
       (some term)
     ::
+    ++  complete-naked-ted
+      |=  ted=term
+      =/  pfix=path
+        /(scot %p our.hid)/[q:he-beam]/(scot %da now.hid)/ted
+      =+  .^(paths=(list path) %ct pfix)
+      %+  complete  (cat 3 '-' ted)
+      %+  murn  paths
+      |=  pax=path
+      ^-  (unit [term tank])
+      ?~  pax
+        ~
+      ?~  t.pax
+        ~
+      ?.  =(%hoon (rear t.pax))
+        ~
+      =/  =cord
+        (reel (join '-' (snip `path`t.pax)) (cury cat 3))
+      ?.  =(ted (end [3 (met 3 ted)] cord))
+        ~
+      `[(cat 3 '-' cord) *tank]
+    ::
     ++  complete
       |=  [completing=term options=(list [term tank])]
       ?~  options
@@ -1528,7 +1618,9 @@
       ::  Else, print results
       ::
       %+  he-diff  %tab
-      options
+      %+  sort  options
+      |=  [[a=term *] [b=term *]]
+      (aor a b)
     --
   ::
   ++  he-type                                           ::  apply input
@@ -1538,7 +1630,7 @@
       he-pine:(~(dy-type dy u.poy) act)
     ?-  -.dat.act
       %det  (he-stir +.dat.act)
-      %ret  (he-done (tufa buf.say))
+      %ret  (he-card %pass /self %agent [our.hid %dojo] %poke %done !>(id))
       %clr  he-pine(buf "")
       %tab  (he-tab +.dat.act)
     ==
@@ -1656,6 +1748,7 @@
 ++  on-poke
   |=  [=mark =vase]
   ^-  (quip card:agent:gall _..on-init)
+  ?>  (team:title [our src]:hid)
   =^  moves  state
     ^-  (quip card:agent:gall house)
     ?+  mark  ~|([%dojo-poke-bad-mark mark] !!)
@@ -1668,6 +1761,11 @@
       =+  !<([ses=@ta =command:lens] vase)
       =/  =id  [our.hid ses]
       he-abet:(~(he-lens he hid id ~ (~(got by hoc) id)) command)
+    ::
+        %done
+      =+  !<(=id vase)
+      =/  ses=session  (~(got by hoc) id)
+      he-abet:(~(he-done he hid id ~ ses) (tufa buf.say.ses))
     ::
         %allow-remote-login
       =/  who  !<(@p vase)
@@ -1736,6 +1834,7 @@
     ?+  i.t.t.wire  ~|([%dojo-bad-on-agent wire -.sign] !!)
       %poke  (he-unto:he-full t.wire sign)
       %wool  (he-wool:he-full t.wire sign)
+      %self  (he-self:he-full t.wire sign)
     ==
   [moves ..on-init]
 ::

pkg/arvo/app/eth-sender.hoon

@@ -58,6 +58,7 @@
   ++  on-poke
     |=  [=mark =vase]
     ^-  (quip card _this)
+    ?>  (team:title [our src]:bowl)
     ?.  ?=(%noun mark)  [~ this]
     =/  =command  !<(command vase)
     ?-  -.command

pkg/arvo/app/eth-watcher.hoon

@@ -327,6 +327,7 @@
 ::
 ++  on-poke
   |=  [=mark =vase]
+  ?>  (team:title [our src]:bowl)
   ?:  ?=(%noun mark)
     ~&  state
     `this

pkg/arvo/app/gaze.hoon

@@ -1,618 +0,0 @@
-::  gaze: azimuth statistics
-::
-::    general flow:
-::    - receive events
-::    - process events whose timestamp is known
-::    - request timestamps for unknown block numbers (if not already running)
-::    - receive timestamps, process events
-::
-/-  eth-watcher
-/+  *ethereum, *azimuth, default-agent, verb
-::
-=>  |%
-    +$  state-0
-      $:  %0
-          ::  qued: event logs waiting on block timestamp, oldest first
-          ::  time: timstamps of block numbers
-          ::  seen: events sorted by timestamp, newest first
-          ::  days: stats by day, newest first
-          ::
-          running=(unit @ta)
-          qued=loglist
-          time=(map @ud @da)
-          seen=(list [wen=@da wat=event])
-          days=(list [day=@da sat=stats])
-      ==
-    ::
-    +$  loglist  loglist:eth-watcher
-    +$  event
-      $%  [%azimuth who=ship dif=diff-point]
-          [%invite by=ship of=ship gift=ship to=address]
-      ==
-    ::
-    +$  stats
-      $:  spawned=(list @p)
-          activated=(list @p)
-          transfer-p=(list @p)
-          transferred=(list @p)
-          configured=(list @p)
-          breached=(list @p)
-          request=(list @p)
-          sponsor=(list @p)
-          management-p=(list @p)
-          voting-p=(list @p)
-          spawn-p=(list @p)
-          invites-senders=(list @p)
-      ==
-    ::
-    +$  card  card:agent:gall
-    ::
-    ++  node-url  'http://eth-mainnet.urbit.org:8545'
-    ++  refresh-rate  ~h1
-    ++  timeout-time  ~h2
-    --
-::
-=|  state-0
-=*  state  -
-::
-%+  verb  |
-^-  agent:gall
-=<
-  |_  =bowl:gall
-  +*  this  .
-      do    ~(. +> bowl)
-      def   ~(. (default-agent this %|) bowl)
-      bec   byk.bowl(r da+now.bowl)
-  ::
-  ++  on-init
-    ^-  (quip card _this)
-    [setup-cards:do this]
-  ::
-  ++  on-save  !>(state)
-  ++  on-load
-    |=  old=vase
-    ^-  (quip card _this)
-    [~ this(state !<(state-0 old))]
-  ::
-  ++  on-poke
-    |=  [=mark =vase]
-    ^-  (quip card _this)
-    ?>  ?=(%noun mark)
-    =/  =noun  !<(noun vase)
-    |-  ^-  [cards=(list card) =_this]
-    ?+  noun  ~|([dap.bowl %unknown-poke noun] !!)
-        %reconnect
-      :_  this
-      :~  leave-eth-watcher:do
-          watch-eth-watcher:do
-      ==
-    ::
-        %reload
-      :-  cards:$(noun %reconnect)
-      this(qued ~, seen ~, days ~)
-    ::
-        %rewatch
-      :_  this:$(noun %reset)
-      :~  leave-eth-watcher:do
-          clear-eth-watcher:do
-          setup-eth-watcher:do
-          await-eth-watcher:do
-      ==
-    ::
-        %export
-      [export:do this]
-    ::
-        %debug
-      ~&  latest=(turn (scag 5 seen) head)
-      ~&  oldest=(turn (slag (sub (max 5 (lent seen)) 5) seen) head)
-      ~&  :-  'order is'
-          =-  ?:(sane 'sane' 'insane')
-          %+  roll  seen
-          |=  [[this=@da *] last=@da sane=?]
-          :-  this
-          ?:  =(*@da last)  &
-          (lte this last)
-      ~&  time=~(wyt by time)
-      ~&  qued=(lent qued)
-      ~&  days=(lent days)
-      [~ this]
-    ==
-  ::
-  ++  on-agent
-    |=  [=wire =sign:agent:gall]
-    ^-  (quip card _this)
-    ?+  -.sign  (on-agent:def wire sign)
-        %kick
-      ?.  =(/watcher wire)  [~ this]
-      [[watch-eth-watcher:do]~ this]
-    ::
-        %fact
-      ?+  wire  (on-agent:def wire sign)
-          [%watcher ~]
-        ?.  ?=(%eth-watcher-diff p.cage.sign)
-          (on-agent:def wire sign)
-        =^  cards  state
-          %-  handle-eth-watcher-diff:do
-          !<(diff:eth-watcher q.cage.sign)
-        [cards this]
-      ::
-          [%timestamps @ ~]
-        ?+  p.cage.sign  (on-agent:def wire sign)
-            %thread-fail
-          =+  !<([=term =tang] q.cage.sign)
-          =/  =tank  leaf+"{(trip dap.bowl)} thread failed; will retry"
-          %-  (slog tank leaf+<term> tang)
-          =^  cards  state
-            request-timestamps:do
-          [cards this]
-        ::
-            %thread-done
-          =^  cards  state
-            %-  save-timestamps:do
-            !<((list [@ud @da]) q.cage.sign)
-          [cards this]
-        ==
-      ==
-    ==
-  ::
-  ++  on-arvo
-    |=  [=wire =sign-arvo]
-    ^-  (quip card _this)
-    ?+  +<.sign-arvo  ~|([dap.bowl %strange-arvo-sign +<.sign-arvo] !!)
-        %wake
-      ?:  =(/export wire)
-        [[wait-export:do export:do] this]
-      ?:  =(/watch wire)
-        [[watch-eth-watcher:do]~ this]
-      ~&  [dap.bowl %strange-wake wire]
-      [~ this]
-    ==
-  ::
-  ++  on-peek   on-peek:def
-  ++  on-watch  on-watch:def
-  ++  on-leave  on-leave:def
-  ++  on-fail   on-fail:def
-  --
-::
-|_  =bowl:gall
-++  bec  byk.bowl(r da+now.bowl)
-++  setup-cards
-  ^-  (list card)
-  :~  wait-export
-      setup-eth-watcher
-      ::  we punt on subscribing to the eth-watcher for a little while.
-      ::  this way we get a %history diff containing all past events,
-      ::  instead of so many individual %log diffs that we bail meme.
-      ::  (to repro, replace this with `watch-eth-watcher`)
-      ::
-      await-eth-watcher
-  ==
-::
-++  wait
-  |=  [=wire =@dr]
-  ^-  card
-  [%pass wire %arvo %b %wait (add now.bowl dr)]
-::
-++  wait-export  (wait /export refresh-rate)
-::
-++  to-eth-watcher
-  |=  [=wire =task:agent:gall]
-  ^-  card
-  [%pass wire %agent [our.bowl %eth-watcher] task]
-::
-++  setup-eth-watcher
-  %+  to-eth-watcher  /setup
-  :+  %poke   %eth-watcher-poke
-  !>  ^-  poke:eth-watcher
-  :+  %watch  /[dap.bowl]
-  :*  node-url
-      |
-      refresh-rate
-      timeout-time
-      public:mainnet-contracts
-      ~
-      ~[azimuth delegated-sending]:mainnet-contracts
-      ~
-      ~
-  ==
-::
-::  see also comment in +setup-cards
-++  await-eth-watcher  (wait /watch ~m30)
-::
-++  watch-eth-watcher
-  %+  to-eth-watcher  /watcher
-  [%watch /logs/[dap.bowl]]
-::
-++  leave-eth-watcher
-  %+  to-eth-watcher  /watcher
-  [%leave ~]
-::
-++  clear-eth-watcher
-  %+  to-eth-watcher  /clear
-  :+  %poke  %eth-watcher-poke
-  !>  ^-  poke:eth-watcher
-  [%clear /logs/[dap.bowl]]
-::
-++  poke-spider
-  |=  [=wire =cage]
-  ^-  card
-  [%pass wire %agent [our.bowl %spider] %poke cage]
-::
-++  watch-spider
-  |=  [=wire =sub=path]
-  ^-  card
-  [%pass wire %agent [our.bowl %spider] %watch sub-path]
-::
-::  +handle-eth-watcher-diff: process new logs, clear state on rollback
-::
-::    processes logs for which we know the timestamp
-::    adds timestamp-less logs to queue
-::
-++  handle-eth-watcher-diff
-  |=  =diff:eth-watcher
-  ^-  (quip card _state)
-  =^  logs  state
-    ^-  [loglist _state]
-    ?-  -.diff
-      %history  ~&  [%got-history (lent loglist.diff)]
-                [loglist.diff state(qued ~, seen ~)]
-      %logs     ~&  %got-log
-                [loglist.diff state]
-      %disavow  ~&  %disavow-unimplemented
-                [~ state]
-    ==
-  %-  process-logs
-  %+  skip  logs
-  |=  =event-log:rpc
-  %-  is-lockup-block
-  block-number:(need mined.event-log)
-::
-::  +is-lockup-block: whether the block contains lockup/ignorable transactions
-::
-::    this is the stupid dumb equivalent to actually identifying lockup
-::    transactions procedurally, which is still in git history, but didn't
-::    work quite right for unidentified reasons
-::
-++  is-lockup-block
-  |=  num=@ud
-  ^-  ?
-  %+  roll
-    ^-  (list [@ud @ud])
-    :~  [7.050.978 7.051.038]
-    ==
-  |=  [[start=@ud end=@ud] in=_|]
-  ?:  in  &
-  &((gte num start) (lte num end))
-::
-::  +request-timestamps: request block timestamps for the logs as necessary
-::
-::    will come back as a thread result
-::
-++  request-timestamps
-  ^-  (quip card _state)
-  ?~  qued  [~ state]
-  ?^  running  [~ state]
-  =/  tid=@ta
-    %+  scot  %ta
-    :((cury cat 3) dap.bowl '_' (scot %uv eny.bowl))
-  :_  state(running `tid)
-  :~  (watch-spider /timestamps/[tid] /thread-result/[tid])
-    ::
-      %+  poke-spider  /timestamps/[tid]
-      :-  %spider-start
-      =-  !>([~ `tid bec %eth-get-timestamps -])
-      !>  ^-  [@t (list @ud)]
-      :-  node-url
-      =-  ~(tap in -)
-      %-  ~(gas in *(set @ud))
-      ^-  (list @ud)
-      %+  turn  qued
-      |=  log=event-log:rpc
-      block-number:(need mined.log)
-  ==
-::
-::  +save-timestamps: store timestamps into state
-::
-++  save-timestamps
-  |=  timestamps=(list [@ud @da])
-  ^-  (quip card _state)
-  =.  time     (~(gas by time) timestamps)
-  =.  running   ~
-  (process-logs ~)
-::
-::  +process-logs: handle new incoming logs
-::
-++  process-logs
-  |=  new=loglist  ::  oldest first
-  ^-  (quip card _state)
-  =.  qued  (weld qued new)
-  ?~  qued  [~ state]
-  =-  %_  request-timestamps
-        qued  (flop rest)  ::  oldest first
-        seen  (weld logs seen)  ::  newest first
-        days  (count-events (flop logs))  ::  oldest first
-      ==
-  %+  roll  `loglist`qued
-  |=  [log=event-log:rpc [rest=loglist logs=(list [wen=@da wat=event])]]
-  ::  to ensure logs are processed in sane order,
-  ::  stop processing as soon as we skipped one
-  ::
-  ?^  rest  [[log rest] logs]
-  =/  tim=(unit @da)
-    %-  ~(get by time)
-    block-number:(need mined.log)
-  ?~  tim  [[log rest] logs]
-  :-  rest
-  =+  ven=(event-log-to-event log)
-  ?~  ven  logs
-  [[u.tim u.ven] logs]
-::
-::  +event-log-to-event: turn raw log into gaze noun
-::
-++  event-log-to-event
-  |=  log=event-log:rpc
-  ^-  (unit event)
-  ?:  =(azimuth:mainnet-contracts address.log)
-    =+  (event-log-to-point-diff log)
-    ?~  -  ~
-    `azimuth+u
-  ?:  =(delegated-sending:mainnet-contracts address.log)
-    ?.  .=  i.topics.log
-        0x4763.8e3c.ddee.2204.81e4.c3f9.183d.639c.
-          0efe.a7f0.5fcd.2df4.1888.5572.9f71.5419
-      ~
-    =/  [of=@ pool=@]
-      ~|  t.topics.log
-      %+  decode-topics:abi:ethereum  t.topics.log
-      ~[%uint %uint]
-    =/  [by=@ gift=@ to=@]
-      ~|  data.log
-      %+  decode-topics:abi:ethereum
-        %+  rash  data.log
-        =-  ;~(pfix (jest '0x') -)
-        %+  stun  [3 3]
-        (bass 16 (stun [64 64] hit))
-      ~[%uint %uint %address]
-    `invite+[by of gift to]
-  ~
-::
-::  +count-events: add events to the daily stats
-::
-++  count-events
-  |=  logs=_seen  ::  oldest first
-  ^+  days
-  =/  head=[day=@da sat=stats]
-    ?^  days  i.days
-    *[@da stats]
-  =+  tail=?~(days ~ t.days)
-  |-
-  ::  when done, store updated head, but only if it's set
-  ::
-  ?~  logs
-    ?:  =(*[@da stats] head)  tail
-    [head tail]
-  =*  log  i.logs
-  ::  calculate day for current event, set head if unset
-  ::
-  =/  day=@da
-    (sub wen.log (mod wen.log ~d1))
-  =?  day.head  =(*@da day.head)  day
-  ::  same day as head, so add to it
-  ::
-  ?:  =(day day.head)
-    %_  $
-      sat.head  (count-event wat.log sat.head)
-      logs      t.logs
-    ==
-  ~|  [%weird-new-day old=day.head new=day]
-  ?>  (gth day day.head)
-  ::  newer day than head of days, so start new head
-  ::
-  %_  $
-    tail  [head tail]
-    head  [day *stats]
-  ==
-::
-::  +count-event: add event to the stats, if it's relevant
-::
-++  count-event
-  |=  [eve=event sat=stats]
-  ^-  stats
-  ?-  -.eve
-    %invite  sat(invites-senders [by.eve invites-senders.sat])
-  ::
-      %azimuth
-    ?+  -.dif.eve  sat
-      %spawned           sat(spawned [who.dif.eve spawned.sat])
-      %activated         sat(activated [who.eve activated.sat])
-      %transfer-proxy    ?:  =(0x0 new.dif.eve)  sat
-                         sat(transfer-p [who.eve transfer-p.sat])
-      %owner             sat(transferred [who.eve transferred.sat])
-      %keys              sat(configured [who.eve configured.sat])
-      %continuity        sat(breached [who.eve breached.sat])
-      %escape            ?~  new.dif.eve  sat
-                         sat(request [who.eve request.sat])
-      %sponsor           ?.  has.new.dif.eve  sat
-                         sat(sponsor [who.eve sponsor.sat])
-      %management-proxy  sat(management-p [who.eve management-p.sat])
-      %voting-proxy      sat(voting-p [who.eve voting-p.sat])
-      %spawn-proxy       sat(spawn-p [who.eve spawn-p.sat])
-    ==
-  ==
-::
-::
-::  +export: periodically export data
-::
-++  export
-  ^-  (list card)
-  :~  (export-move %days (export-days days))
-      (export-move %months (export-months days))
-      (export-move %events export-raw)
-  ==
-::
-::  +export-move: %info move to write exported .txt
-::
-++  export-move
-  |=  [nom=@t dat=(list @t)]
-  ^-  card
-  =-  [%pass /export/[nom] %arvo %c %info -]
-  %+  foal:space:userlib
-    /(scot %p our.bowl)/base/(scot %da now.bowl)/gaze-exports/[nom]/txt
-  [%txt !>(dat)]
-::
-::  +peek-x: accept gall scry
-::
-::    %/days/txt:   per day, digest stats
-::    %/months/txt: per month, digest stats
-::    %/raw/txt:    all observed events
-::
-++  peek-x  ::TODO
-  |=  pax=path
-  ^-  (unit (unit (pair mark *)))
-  ?~  pax  ~
-  ?:  =(%days i.pax)
-    :^  ~  ~  %txt
-    (export-days days)
-  ?:  =(%months i.pax)
-    :^  ~  ~  %txt
-    (export-months days)
-  ?:  =(%raw i.pax)
-    ``txt+export-raw
-  ~
-::
-::  +export-months: generate a csv of stats per month
-::
-++  export-months
-  |=  =_days
-  %-  export-days
-  ^+  days
-  %+  roll  (flop days)
-  |=  [[day=@da sat=stats] mos=(list [mod=@da sat=stats])]
-  ^+  mos
-  =/  mod=@da
-    %-  year
-    =+  (yore day)
-    -(d.t 1)
-  ?~  mos  [mod sat]~
-  ?:  !=(mod mod.i.mos)
-    [[mod sat] mos]
-  :_  t.mos
-  :-  mod
-  ::TODO  this is hideous. can we make a wet gate do this?
-  :*  (weld spawned.sat spawned.sat.i.mos)
-      (weld activated.sat activated.sat.i.mos)
-      (weld transfer-p.sat transfer-p.sat.i.mos)
-      (weld transferred.sat transferred.sat.i.mos)
-      (weld configured.sat configured.sat.i.mos)
-      (weld breached.sat breached.sat.i.mos)
-      (weld request.sat request.sat.i.mos)
-      (weld sponsor.sat sponsor.sat.i.mos)
-      (weld management-p.sat management-p.sat.i.mos)
-      (weld voting-p.sat voting-p.sat.i.mos)
-      (weld spawn-p.sat spawn-p.sat.i.mos)
-      (weld invites-senders.sat invites-senders.sat.i.mos)
-  ==
-::
-::  +export-days: generate a csv of stats per day
-::
-++  export-days
-  |=  =_days
-  :-  %-  crip
-      ;:  weld
-        "date,"
-        "spawned,"
-        "activated,"
-        "transfer proxy,"
-        "transferred,"
-        "transferred (unique),"
-        "configured,"
-        "configured (unique),"
-        "escape request,"
-        "sponsor change,"
-        "invites,"
-        "invites (unique senders)"
-      ==
-  |^  ^-  (list @t)
-      %+  turn  days
-      |=  [day=@da stats]
-      %-  crip
-      ;:  weld
-        (scow %da day)            ","
-        (count spawned)           ","
-        (count activated)         ","
-        (count transfer-p)        ","
-        (unique transferred)      ","
-        (unique configured)       ","
-        (count request)           ","
-        (count sponsor)           ","
-        (unique invites-senders)
-      ==
-  ::
-  ++  count
-    |*  l=(list)
-    (num (lent l))
-  ::
-  ++  unique
-    |*  l=(list)
-    ;:  weld
-      (count l)
-      ","
-      (num ~(wyt in (~(gas in *(set)) l)))
-    ==
-  ::
-  ++  num  (d-co:co 1)
-  --
-::
-::  +export-raw: generate a csv of individual transactions
-::
-++  export-raw
-  :-  %-  crip
-      ;:  weld
-        "date,"
-        "point,"
-        "event,"
-        "field 1,field2,field3"
-      ==
-  |^  ^-  (list @t)
-      %+  turn  seen
-      :: (cork tail event-to-row crip)
-      |=  [wen=@da =event]
-      (crip "{(scow %da wen)},{(event-to-row event)}")
-  ::
-  ++  event-to-row
-    |=  =event
-    ?-  -.event
-      %azimuth  (point-diff-to-row +.event)
-      %invite   (invite-to-row +.event)
-    ==
-  ::
-  ++  point-diff-to-row
-    |=  [who=ship dif=diff-point]
-    ^-  tape
-    %+  weld  "{(pon who)},"
-    ?-  -.dif
-      %full               "full,"
-      %owner              "owner,{(adr new.dif)}"
-      %activated          "activated,"
-      %spawned            "spawned,{(pon who.dif)}"
-      %keys               "keys,{(num life.dif)}"
-      %continuity         "breached,{(num new.dif)}"
-      %sponsor            "sponsor,{(spo has.new.dif)},{(pon who.new.dif)}"
-      %escape             "escape-req,{(req new.dif)}"
-      %management-proxy   "management-p,{(adr new.dif)}"
-      %voting-proxy       "voting-p,{(adr new.dif)}"
-      %spawn-proxy        "spawn-p,{(adr new.dif)}"
-      %transfer-proxy     "transfer-p,{(adr new.dif)}"
-    ==
-  ::
-  ++  invite-to-row
-    |=  [by=ship of=ship ship to=address]
-    "{(pon by)},invite,{(pon of)},{(adr to)}"
-  ::
-  ++  num  (d-co:co 1)
-  ++  pon  (cury scow %p)
-  ++  adr  |=(a=@ ['0' 'x' ((x-co:co (mul 2 20)) a)])
-  ++  spo  |=(h=? ?:(h "escaped to" "detached from"))
-  ++  req  |=(r=(unit @p) ?~(r "canceled" (pon u.r)))
-  --
---

pkg/arvo/app/herm.hoon

@@ -81,6 +81,7 @@
 ++  on-poke
   |=  [=mark =vase]
   ^-  (quip card:agent:gall _this)
+  ?>  (team:title [our src]:bowl)
   :_  this
   :_  ~
   ?+  mark  ~|([%unexpected-mark mark] !!)

pkg/arvo/app/hood.hoon

@@ -2,8 +2,8 @@
 /+  drum=hood-drum, helm=hood-helm, kiln=hood-kiln
 |%
 +$  state
-  $~  [%26 *state:drum *state:helm *state:kiln]
-  $>(%26 any-state)
+  $~  [%27 *state:drum *state:helm *state:kiln]
+  $>(%27 any-state)
 ::
 +$  any-state
   $%  [ver=?(%1 %2 %3 %4 %5 %6) lac=(map @tas fin-any-state)]
@@ -27,6 +27,7 @@
       [%24 drum=state-4:drum helm=state-2:helm kiln=state-10:kiln]
       [%25 drum=state-5:drum helm=state-2:helm kiln=state-10:kiln]
       [%26 drum=state-6:drum helm=state-2:helm kiln=state-10:kiln]
+      [%27 drum=state-6:drum helm=state-2:helm kiln=state-11:kiln]
   ==
 +$  any-state-tuple
   $:  drum=any-state:drum

pkg/arvo/app/language-server.hoon

@@ -77,6 +77,7 @@
     ^+  on-poke:*agent:gall
     |=  [=mark =vase]
     ^-  (quip card _this)
+    ?>  (team:title [our src]:bowl)
     =^  cards  state
       ?+    mark  (on-poke:def mark vase)
           %language-server-rpc-notification

pkg/arvo/app/lens.hoon

@@ -50,6 +50,7 @@
   ^-  (quip card:agent:gall _this)
   ::
   ?:  &(?=(%noun mark) ?=(%cancel q.vase))
+    ?>  (team:title [our src]:bowl)
     ~&  %lens-cancel
     [~ this(job.state ~)]
   ::
@@ -70,7 +71,7 @@
     ^-  card:agent:gall
     [%pass /import-all %agent [our.bowl app] %poke %import !>(data)]
   =/  jon=json
-    (need (de-json:html body))
+    (need (de:json:html body))
   =/  com=command:lens
     (json:grab:lens-mark jon)
   ::

pkg/arvo/app/ping.hoon

@@ -9,126 +9,50 @@
 ::  Note this issue manifests itself even for bootstrapping a planet to
 ::  talk to its own star.
 ::
-/+  default-agent, verb
+/+  default-agent, verb, dbug
 =*  point  point:kale
 ::
 |%
+::  How often to ping our sponsor when we might be behind a NAT.
+::
+::    NAT timeouts are often pretty short for UDP entries.  5 minutes is
+::    a common value.  We use 25 seconds, same as Wireguard.
+::
+++  nat-timeout  ~s25
+::
+::  How often to check our IP when we know we're not behind a NAT.
+::
+++  ip-timeout   ~m5
+::
+::  Chosen because it's run by Cloudflare, and others I tried were
+::  inconsistently slow.
+::
+++  ip-reflector  'https://icanhazip.com'
+::
 +$  card  card:agent:gall
 +$  ship-state
   $%  [%idle ~]
       [%poking ~]
+      [%http until=@da]
       [%waiting until=@da]
   ==
++$  state-1
+  $:  %1
+      ships=(set ship)
+      nonce=@ud
+      $=  plan
+      $~  [%nat ~]
+      $%  [%nat ~]
+          [%pub ip=(unit @t)]
+      ==
+  ==
 --
 ::
-=|  state=[%0 ships=(map ship [=rift =ship-state])]
+%-  agent:dbug
+::
+=|  state=state-1
 =>  |%
-    ::  +print-error: maybe +slog
-    ::
-    ++  print-error
-      |=  [=tape error=(unit tang)]
-      ^+  same
-      ?~  error  same
-      %-  (slog leaf+tape u.error)  same
-    ::  +set-timer: send a card to behn to set a timer
-    ::
-    ++  set-timer
-      |=  [now=@da =ship]
-      ^-  (quip card _state)
-      =/  s  (~(get by ships.state) ship)
-      ?~  s
-        `state
-      ?.  ?=(%poking -.ship-state.u.s)
-        %-  (slog leaf+"ping: strange state {<ship s>}" ~)
-        `state
-      ::  NAT timeouts are often pretty short for UDP entries.  5
-      ::  minutes is a common value.  We use 25 seconds, same as Wireguard.
-      ::
-      =/  until  (add ~s25 now)
-      =.  ships.state
-        (~(put by ships.state) ship u.s(ship-state [%waiting until]))
-      :_  state
-      =/  =wire  /ping-wait/(scot %p ship)/(scot %da until)
-      [%pass wire %arvo %b %wait `@da`until]~
-    ::  +send-ping: poke their %ping app
-    ::
-    ++  send-ping
-      |=  [our=@p now=@da =ship]
-      ^-  (quip card _state)
-      ::
-      ?:  =(our ship)
-        `state
-      =/  s  (~(get by ships.state) ship)
-      ?~  s
-        `state
-      ?.  ?=(%idle -.ship-state.u.s)
-        `state
-      :_  state(ships (~(put by ships.state) ship u.s(ship-state [%poking ~])))
-      [%pass /ping-send/(scot %p ship) %agent [ship %ping] %poke %noun !>(~)]~
-    ::  +stop-ping-ship: stop listening to jael if not sponsor or old rift
-    ::
-    ++  stop-ping-ship
-      |=  [our=@p now=@da =ship =old=rift =ship-state]
-      ^-  (quip card _state)
-      =+  .^(=new=rift %j /(scot %p our)/rift/(scot %da now)/(scot %p ship))
-      ::  if nothing's changed about us, don't cancel
-      ::
-      ?:  ?&  =(old-rift new-rift)
-              (~(has in (silt (saxo:title our now our))) ship)
-          ==
-        `state
-      ::  otherwise, kill jael subscription and timer
-      ::
-      :_  state(ships (~(del by ships.state) ship))
-      [%pass /jael/(scot %p ship) %arvo %j %nuke (silt ship ~)]~
-    ::  +start-ping-ship: start listening to jael updates if not already
-    ::
-    ::    While %public-keys is idempotent in most senses, it does
-    ::    trigger a response, and this function is called on that
-    ::    response, so we need a guard to avoid an infinite loop.
-    ::
-    ++  start-ping-ship
-      |=  [our=@p now=@da =ship]
-      ^-  (quip card _state)
-      ::
-      ?:  (~(has by ships.state) ship)
-        (send-ping our now ship)
-      ::
-      ;<  new-state=_state  (rind card state)
-        =+  .^(=rift %j /(scot %p our)/rift/(scot %da now)/(scot %p ship))
-        :_  state(ships (~(put by ships.state) ship rift %idle ~))
-        [%pass /jael/(scot %p ship) %arvo %j %public-keys (silt ship ~)]~
-      =.  state  new-state
-      ::
-      (send-ping our now ship)
-    ::  +kick: idempotent operation to make clean start for all pings
-    ::
-    ++  kick
-      |=  [our=@p now=@da]
-      ^-  (quip card _state)
-      ?:  =(%czar (clan:title our))
-        `state
-      ::
-      =/  old-ships=(list [=ship =rift =ship-state])  ~(tap by ships.state)
-      |-  ^-  (quip card _state)
-      =*  loop  $
-      ?^  old-ships
-        ;<  new-state=_state  (rind card state)
-          (stop-ping-ship our now i.old-ships)
-        =.  state  new-state
-        loop(old-ships t.old-ships)
-      ::
-      =/  new-ships  (saxo:title our now our)
-      |-  ^-  (quip card _state)
-      =*  loop  $
-      ?^  new-ships
-        ;<  new-state=_state  (rind card state)
-          (start-ping-ship our now i.new-ships)
-        =.  state  new-state
-        loop(new-ships t.new-ships)
-      ::
-      `state
-    ::  +rind: bind for the the writer monad on (quip effect state)
+    ::  Bind for the the writer monad on (quip effect state)
     ::
     ++  rind
       |*  [effect=mold state=*]
@@ -141,6 +65,211 @@
       =^  effects-2=(list effect)  state  (fun state)
       [(weld effects-1 effects-2) state]
     ::
+    ++  once
+      |=  =cord
+      =(cord (scot %uw nonce.state))
+    ::
+    ::  Subsystem to keep track of which ships to ping across breaches
+    ::  and sponsorship changes
+    ::
+    ++  ships
+      |%
+      ++  rind  (^rind card state)
+      ++  kick
+        |=  [our=@p now=@da]
+        ^-  (quip card _state)
+        ::  ?:  =(%czar (clan:title our))
+        ::    `state
+        ::
+        ::  NB: !! This includes our own ship, and for moons, this is
+        ::  what has caused Jael to fetch our own rift from our parent.
+        ::  This role may be taken by Ames's subscription to
+        ::  %public-keys, but this must be tested before changing the
+        ::  behavior here.
+        ::
+        =/  new-ships  (~(gas in *(set ship)) (saxo:title our now our))
+        =/  removed  (~(dif in ships.state) new-ships)
+        =/  added    (~(dif in new-ships) ships.state)
+        ;<  new-state=_state  rind
+          ?~  removed  `state
+          [[%pass /jael %arvo %j %nuke removed]~ state]
+        =.  state  new-state
+        ::
+        ;<  new-state=_state  rind
+          ?~  added  `state
+          [[%pass /jael %arvo %j %public-keys added]~ state]
+        =.  state  new-state
+        ::
+        ::  Kick even if ships weren't added or removed
+        ::
+        (kick-pings our now new-ships)
+      ::
+      ::  Kick whenever we get a response.  We really care about
+      ::  breaches and sponsorship changes.
+      ::
+      ::  Delay until next event in case of breach, so that ames can
+      ::  clear its state.
+      ::
+      ++  take-jael
+        |=  now=@da
+        ^-  (quip card _state)
+        [[%pass /jael/delay %arvo %b %wait now]~ state]
+      ::
+      ++  take-delay  kick
+      --
+    ::
+    ::  Starts pinging a new set of `ships`.
+    ::
+    ++  kick-pings
+      |=  [our=@p now=@da ships=(set ship)]
+      ^-  (quip card _state)
+      =:  nonce.state  +(nonce.state)
+          ships.state  ships
+        ==
+      ::
+      ?:  ?=(%nat -.plan.state)
+        (kick:nat our)
+      (kick:pub our now)
+    ::
+    ::  Subsystem for pinging our sponsors when we might be behind a NAT
+    ::
+    ::    Ping each ship every 25 seconds to keep the pinhole open.
+    ::    This is expensive, but if you don't do it and you are behind a
+    ::    NAT, you will stop receiving packets from other ships except
+    ::    during the 30 seconds following each packet you send.
+    ::
+    ++  nat
+      ?>  ?=(%nat -.plan.state)
+      |%
+      ++  rind  (^rind card state)
+      ++  kick
+        |=  our=@p
+        ^-  (quip card _state)
+        =/  ships  ~(tap in ships.state)
+        |-  ^-  (quip card _state)
+        ?~  ships  `state
+        ?:  =(our i.ships)  $(ships t.ships)
+        ;<  new-state=_state  rind  (send-ping i.ships)
+        =.  state  new-state
+        $(ships t.ships)
+      ::
+      ++  send-ping
+        |=  =ship
+        ^-  (quip card _state)
+        :_  state
+        =/  wire  /nat/(scot %uw nonce.state)/ping/(scot %p ship)
+        [%pass wire %agent [ship %ping] %poke %noun !>(~)]~
+      ::
+      ++  take-ping
+        |=  [now=@da =wire error=(unit tang)]
+        ^-  (quip card _state)
+        ?.  ?=([%nat @ %ping @ ~] wire)  `state
+        ?.  (once i.t.wire)  `state
+        =/  ship  (slav %p i.t.t.t.wire)
+        %-  (slog ?~(error ~ ['ping: got nack' >ship< u.error]))
+        :_  state
+        =/  wire  /nat/(scot %uw nonce.state)/wait/(scot %p ship)
+        [%pass wire %arvo %b %wait (add nat-timeout now)]~
+      ::
+      ++  take-wait
+        |=  =wire
+        ^-  (quip card _state)
+        ?.  ?=([%nat @ %wait @ ~] wire)  `state
+        ?.  (once i.t.wire)  `state
+        =/  ship  (slav %p i.t.t.t.wire)
+        (send-ping ship)
+      --
+    ::
+    ::  Subsystem for pinging our sponsors when we know we're not behind a NAT
+    ::
+    ::    Check our IP address every minute, and only if it changes,
+    ::    ping all our sponsors.
+    ::
+    ++  pub
+      ?>  ?=(%pub -.plan.state)
+      |%
+      ++  rind  (^rind card state)
+      ++  kick
+        |=  [our=@p now=@da]
+        ^-  (quip card _state)
+        ;<  new-state=_state  rind  (send-pings our)
+        =.  state  new-state
+        ::
+        ;<  new-state=_state  rind  check-ip
+        =.  state  new-state
+        ::
+        (set-timer now)
+      ::
+      ++  send-pings
+        |=  our=@p
+        ^-  (quip card _state)
+        :_  state
+        %+  murn  ~(tap in ships.state)
+        |=  =ship
+        ?:  =(our ship)
+          ~
+        =/  wire  /pub/(scot %uw nonce.state)/ping/(scot %p ship)
+        `u=[%pass wire %agent [ship %ping] %poke %noun !>(~)]
+      ::
+      ++  take-pings
+        |=  [=wire error=(unit tang)]
+        ^-  (quip card _state)
+        ?.  ?=([%pub @ %ping @ ~] wire)  `state
+        ?.  (once i.t.wire)  `state
+        =/  ship  (slav %p i.t.t.t.wire)
+        %-  (slog ?~(error ~ ['ping: got nack' >ship< u.error]))
+        `state
+      ::
+      ++  check-ip
+        ^-  (quip card _state)
+        :_  state
+        =/  wire  /pub/(scot %uw nonce.state)/ip
+        =/  =request:http  [%'GET' ip-reflector ~ ~]
+        [%pass wire %arvo %i %request request *outbound-config:iris]~
+      ::
+      ++  take-ip
+        |=  [our=@p =wire resp=client-response:iris]
+        ^-  (quip card _state)
+        ?.  ?=([%pub @ %ip ~] wire)  `state
+        ?.  (once i.t.wire)  `state
+        ::
+        ?.  ?=(%finished -.resp)  `state  :: will retry in a minute
+        ?.  ?=(%200 status-code.response-header.resp)
+          =*  s  status-code.response-header.resp
+          %-  (slog leaf+"ping: ip check failed: {<s>}" ~)
+          `state
+        ::
+        ?~  full-file.resp
+          %-  (slog 'ping: ip check body empty' ~)
+          `state
+        ::
+        =*  body  q.data.u.full-file.resp
+        ?~  body
+          %-  (slog 'ping: ip check body empty' ~)
+          `state
+        ::
+        =/  ip  (end [3 (dec (met 3 body))] body)
+        ?:  =(ip.plan.state `ip)  `state
+        ::
+        =.  ip.plan.state  `ip
+        (send-pings our)
+      ::
+      ++  set-timer
+        |=  now=@da
+        ^-  (quip card _state)
+        =/  =wire  /pub/(scot %uw nonce.state)/wait
+        [[%pass wire %arvo %b %wait (add ip-timeout now)]~ state]
+      ::
+      ++  take-wait
+        |=  [our=@p now=@da =wire]
+        ^-  (quip card _state)
+        ?.  ?=([%pub @ %wait ~] wire)  `state
+        ?.  (once i.t.wire)  `state
+        ;<  new-state=_state  rind  check-ip
+        =.  state  new-state
+        ::
+        (set-timer now)
+      --
     --
 %+  verb  |
 ^-  agent:gall
@@ -152,25 +281,47 @@
 ::
 ++  on-init
   ^-  [(list card) _this]
-  =^  cards  state  (kick our.bowl now.bowl)
+  =.  plan.state  [%nat ~]
+  =^  cards  state  (kick:ships our.bowl now.bowl)
   [cards this]
 ::
 ++  on-save   !>(state)
 ++  on-load
-  |=  old=vase
-  =.  state  !<(_state old)
-  (on-poke %noun !>(%kick))
+  |=  old-vase=vase
+  |^
+  =/  old  !<(state-any old-vase)
+  =?  old  ?=(%0 -.old)  (state-0-to-1 old)
+  ?>  ?=(%1 -.old)
+  =.  state  old
+  =^  cards  state  (kick:ships our.bowl now.bowl)
+  [cards this]
+  ::
+  +$  state-any  $%(state-0 state-1)
+  +$  state-0  [%0 ships=(map ship [=rift =ship-state])]
+  ::
+  ++  state-0-to-1
+    |=  old=state-0
+    ^-  state-1
+    [%1 ~ 0 %nat ~]
+  --
 ::  +on-poke: positively acknowledge pokes
 ::
 ++  on-poke
   |=  [=mark =vase]
-  ?:  =(q.vase %kick)
-    =.  ships.state
-      %-  ~(run by ships.state)
-      |=  [=rift =ship-state]
-      [999.999 ship-state]
-    on-init
-  `this
+  ?.  =(our src):bowl    :: don't crash, this is where pings are handled
+    `this
+  ::
+  =^  cards  state
+    ?:  =(q.vase %kick)  :: NB: ames calls this on %born
+      (kick:ships our.bowl now.bowl)
+    ?:  =(q.vase %nat)
+      =.  plan.state  [%nat ~]
+      (kick:ships our.bowl now.bowl)
+    ?:  =(q.vase %no-nat)
+      =.  plan.state  [%pub ~]
+      (kick:ships our.bowl now.bowl)
+    `state
+  [cards this]
 ::
 ++  on-watch  on-watch:def
 ++  on-leave  on-leave:def
@@ -183,46 +334,56 @@
 ++  on-agent
   |=  [=wire =sign:agent:gall]
   ^-  [(list card) _this]
-  ?>  ?=([%ping-send @ ~] wire)
-  ?>  ?=(%poke-ack -.sign)
-  ::
-  %-  (print-error "ping: ack" p.sign)
   =^  cards  state
-    (set-timer now.bowl (slav %p i.t.wire))
+    ?+    wire  `state
+        [%nat *]
+      ?.  ?=(%nat -.plan.state)  `state
+      ?.  ?=(%poke-ack -.sign)   `state
+      (take-ping:nat now.bowl wire p.sign)
+    ::
+        [%pub *]
+      ?.  ?=(%pub -.plan.state)  `state
+      ?.  ?=(%poke-ack -.sign)   `state
+      (take-pings:pub wire p.sign)
+    ==
   [cards this]
 ::  +on-arvo: handle timer firing
 ::
 ++  on-arvo
   |=  [=wire =sign-arvo]
   ^-  [(list card) _this]
-  ?+    wire  !!
-      [%ping-wait @ @ ~]
-    ?>  ?=(%wake +<.sign-arvo)
-    =/  =ship      (slav %p i.t.wire)
-    =/  until=@da  (slav %da i.t.t.wire)
-    =/  s  (~(get by ships.state) ship)
-    ?~  s
-      `this
-    ?.  =([%waiting until] ship-state.u.s)
-      `this
-    =.  ships.state  (~(put by ships.state) ship u.s(ship-state [%idle ~]))
-    %-  (print-error "ping: wake" error.sign-arvo)
-    =^  cards  state
-      (send-ping our.bowl now.bowl ship)
-    [cards this]
-  ::
-      [%jael @ ~]
-    ::  whenever we get an update from Jael, kick
+  =^  cards  state
+    ?+    wire  `state
+        [%jael %delay ~]
+      ?>  ?=(%wake +<.sign-arvo)
+      ?^  error.sign-arvo
+        %-  (slog 'ping: strange jael wake fail!' u.error.sign-arvo)
+        `state
+      (take-delay:ships our.bowl now.bowl)
     ::
-    ?>  ?=(%public-keys +<.sign-arvo)
-    :_  this
-    [%pass /delay %arvo %b %wait now.bowl]~
-  ::  Delayed until next event so that ames can clear its state
-  ::
-      [%delay ~]
-    ?>  ?=(%wake +<.sign-arvo)
-    on-init
-  ==
+        [%jael ~]
+      ?>  ?=(%public-keys +<.sign-arvo)
+      (take-jael:ships now.bowl)
+    ::
+        [%nat *]
+      ?.  ?=(%nat -.plan.state)  `state
+      ?>  ?=(%wake +<.sign-arvo)
+      ?^  error.sign-arvo
+        %-  (slog 'ping: strange nat wake fail!' u.error.sign-arvo)
+        `state
+      (take-wait:nat wire)
+    ::
+        [%pub @ %ip *]
+      ?.  ?=(%pub -.plan.state)  `state
+      ?>  ?=(%http-response +<.sign-arvo)
+      (take-ip:pub our.bowl wire client-response.sign-arvo)
+    ::
+        [%pub @ %wait *]
+      ?.  ?=(%pub -.plan.state)  `state
+      ?>  ?=(%wake +<.sign-arvo)
+      (take-wait:pub our.bowl now.bowl wire)
+    ==
+  [cards this]
 ::
 ++  on-fail   on-fail:def
 --

pkg/arvo/app/roller-rpc.hoon

@@ -45,7 +45,6 @@
     |=  [=mark =vase]
     ^-  (quip card _this)
     |^
-    ?>  (team:title our.bowl src.bowl)
     ?+  mark  (on-poke:def mark vase)
         %handle-http-request
       =+  !<([id=@ta req=inbound-request:eyre] vase)
@@ -53,6 +52,7 @@
       (handle-http-request id req)
     ::
         %azimuth-action
+      ?>  (team:title our.bowl src.bowl)
       =+  !<([%disconnect bind=binding:eyre] vase)
       ~&  >>>  "disconnecting at {<bind>}"
       :_  this
@@ -89,7 +89,6 @@
   ++  on-watch
     |=  =path
     ^-  (quip card _this)
-    ?>  (team:title our.bowl src.bowl)
     ?+  path  (on-watch:def path)
         [%http-response *]  [~ this]
     ==

pkg/arvo/app/roller.hoon

@@ -363,7 +363,7 @@
     ++  state-0
       $:  %0
           pending=(list pend-tx)
-          sending=(tree [l1-tx-pointer send-tx])
+          sending=(tree [l1-tx-pointer old-send-tx-4])
           finding=(map keccak ?(%confirmed %failed [=time l1-tx-pointer]))
           history=(map address:ethereum (tree hist-tx))
           next-nonce=(unit @ud)

pkg/arvo/app/spider.hoon

@@ -214,6 +214,7 @@
     ~/  %on-poke
     |=  [=mark =vase]
     ^-  (quip card _this)
+    ?>  (team:title [our src]:bowl)
     ?:  ?=(%spider-kill mark)
       (on-load on-save)
     =^  cards  state
@@ -315,7 +316,7 @@
   ::
   =/  tube  (convert-tube %json input-mark desk bowl)
   ?>  ?=(^ body.request.inbound-request)
-  =/  body=json  (need (de-json:html q.u.body.request.inbound-request))
+  =/  body=json  (need (de:json:html q.u.body.request.inbound-request))
   =/  input=vase  (slop !>(~) (tube !>(body)))
   =/  boc  bec
   =/  =start-args:spider  [~ `tid boc(q desk, r da+now.bowl) thread input]
@@ -554,9 +555,13 @@
     ~
   %+  give-simple-payload:app:server  u.eyre-id
   ^-  simple-payload:http
-  :_  ~  :_  ~
   ?.  ?=(http-error:spider term)
-    ((slog tang) 500)
+    %-  (slog tang)
+    =/  tube  (convert-tube %tang %json desk bowl)
+    :-  [500 [['content-type' 'application/json'] ~]]
+    =-  `(as-octs:mimes:html (en:json:html -))
+    o/(malt `(list [key=@t json])`[term+s/term tang+!<(json (tube !>(tang))) ~])
+  :_  ~  :_  ~
   ?-  term
     %bad-request  400
     %forbidden    403
@@ -570,9 +575,9 @@
   ::%-  (slog leaf+"strand {<yarn>} failed" leaf+<term> tang)
   =/  =tid  (yarn-to-tid yarn)
   =/  fail-cards  (thread-say-fail tid term tang)
-  =^  cards       state  (thread-clean yarn)
   =^  http-cards  state  (thread-http-fail tid term tang)
   =^  scry-card   state  (cancel-scry tid silent=%.n)
+  =^  cards       state  (thread-clean yarn)
   :_  state
   :(weld fail-cards cards http-cards scry-card)
 ::

pkg/arvo/app/test.hoon

@@ -25,6 +25,7 @@
 ++  on-poke
   |=  [=mark =vase]
   ^-  [(list card) _this]
+  ?>  (team:title [our src]:bowl)
   |^
   =+  !<(=test vase)
   ?-  test

pkg/arvo/app/time.hoon

@@ -15,6 +15,7 @@
 ++  on-load  _on-init
 ++  on-poke
   |=  [=mark =vase]
+  ?>  (team:title [our src]:bowl)
   ?+    mark  !!
       %noun  :_  this
              [%pass /(scot %da now.bowl) %arvo %b %wait `@da`+(now.bowl)]~

pkg/arvo/gen/hood/approve-merge.hoon

@@ -0,0 +1,6 @@
+:-  %say
+|=  $:  [now=@da eny=@uvJ bec=beak]
+        [syd=desk her=ship sud=desk approve=? ~]
+        ~
+    ==
+kiln-approve-merge+[[syd her sud] approve]

pkg/arvo/gen/hood/close-flows.hoon

@@ -4,6 +4,88 @@
 ::    To actually close the flows, run with |close-flows, =dry |
 ::
 :-  %say
-|=  [^ arg=~ dry=?]
+|=  [[now=@da eny=@uvJ bec=beak] arg=~ peer=(unit @p) dry=? veb=?]
 ::
-[%helm-ames-kroc dry]
+=/  peers-map
+  .^((map ship ?(%alien %known)) %ax /(scot %p p.bec)//(scot %da now)/peers)
+::
+=/  peers=(list ship)
+  %+  murn  ~(tap by peers-map)
+  |=  [=ship val=?(%alien %known)]
+  ?:  =(ship p.bec)
+    ~  ::  this is weird, but we saw it
+  ?-  val
+    %alien  ~
+    %known  (some ship)
+  ==
+::
+=;  bones=(list [ship bone])
+  :-  %helm-ames-kroc
+  ~?  dry  "#{<(lent bones)>} flows can be closed"
+  dry^bones
+::
+%+  roll  peers
+|=  [=ship bones=(list [ship bone])]
+?:  &(?=(^ peer) !=(u.peer ship))
+  bones
+::
+=+  .^  =ship-state:ames
+        %ax  /(scot %p p.bec)//(scot %da now)/peers/(scot %p ship)
+    ==
+=/  =peer-state:ames  ?>(?=(%known -.ship-state) +.ship-state)
+|^
+=/  subs=(jar path [bone sub-nonce=@])  resubscriptions
+%+  roll  ~(tap by subs)
+|=  [[=wire flows=(list [bone sub-nonce=@])] bones=_bones]
+::
+%-  flop  %-  tail
+%+  roll  (sort flows |=([[@ n=@] [@ m=@]] (lte n m)))
+|=  [[=bone nonce=@] resubs=_(lent flows) bones=_bones]
+=/  app=term  ?>(?=([%gall %use sub=@ *] wire) i.t.t.wire)
+=/  =path     (slag 7 wire)
+=/  log=tape  "[bone={<bone>} agent={<app>} nonce={<nonce>}] {<path>}"
+=;  corkable=?
+  =?  bones  corkable  [[ship bone] bones]
+  (dec resubs)^bones
+::  checks if this is a stale re-subscription
+::
+?.  =(resubs 1)
+  ~?  veb  [ship (weld "stale %watch plea " log)]
+  &
+::  the current subscription can be safely corked if there
+::  is a flow with a naxplanation ack on a backward bone
+::
+=+  backward-bone=(mix 0b10 bone)
+?.  =(%2 (mod backward-bone 4))
+  |
+?~  (~(get by rcv.peer-state) backward-bone)
+  |
+~?  veb  [ship (weld "failed %watch plea " log)]
+&
+::
+++  resubscriptions
+  %+  roll  ~(tap by snd.peer-state)
+  |=  $:  [=forward=bone message-pump-state:ames]
+          subs=(jar path [bone sub-nonce=@])
+      ==
+  ?:  (~(has in closing.peer-state) forward-bone)
+    ~?  veb
+      :-  ship
+      %+  weld  "stale flow bone={<forward-bone>} in closing, "
+      "#{<~(wyt in live:packet-pump-state)>} packets retrying"
+    subs
+  ?~  duct=(~(get by by-bone.ossuary.peer-state) forward-bone)
+    subs
+  ?.  ?=([* [%gall %use sub=@ @ %out @ @ *] *] u.duct)
+    subs
+  =/  =wire           i.t.u.duct
+  =/  nonce=(unit @)  ?~((slag 7 wire) ~ (slaw %ud &8.wire))
+  %-  ~(add ja subs)
+  ::  0 for old pre-nonce subscriptions
+  ::
+  :_  [forward-bone ?~(nonce 0 u.nonce)]
+  ?~  nonce  wire
+  ::  don't include the sub-nonce in the key
+  ::
+  (weld (scag 7 wire) (slag 8 wire))
+--

pkg/arvo/gen/hood/doze.hoon

@@ -1,4 +0,0 @@
-:-  %say
-|=  [^ [dap=term wake=$@(~ [%wake ~])] ~]
-=/  mode  ?@(wake %idle %jolt)
-[%helm-pass %g %fade dap mode]

pkg/arvo/gen/hood/fade.hoon

@@ -1,17 +0,0 @@
-::  Drum: destroy app
-::
-::::  /hoon/fade/hood/gen
-  ::
-/?    310
-::
-::::
-  ::
-:-  %say
-|=  $:  [now=@da eny=@uvJ bec=beak]
-        [arg=[@ $@(~ [@ ~])] ~]
-    ==
-:-  %drum-fade
-?>  ((sane %tas) -.arg)
-?@  +.arg  [q.bec -.arg]
-?>  ((sane %tas) +<.arg)
-[-.arg +<.arg]

pkg/arvo/gen/hood/global-automerge.hoon

@@ -0,0 +1,6 @@
+:-  %say
+|=  $:  [now=@da eny=@uvJ bec=beak]
+        [auto=? ~]
+        ~
+    ==
+kiln-global-automerge+auto

pkg/arvo/gen/hood/jump/approve.hoon

@@ -0,0 +1,6 @@
+:-  %say
+|=  $:  [now=@da eny=@uvJ bec=beak]
+        [old=dock new=dock ~]
+        ~
+    ==
+kiln-jump-opt+[old new &]

pkg/arvo/gen/hood/jump/propose.hoon

@@ -0,0 +1,16 @@
+/+  *generators
+:-  %ask
+|=  $:  [now=@da eny=@uvJ bec=beak]
+        [syd=desk her=ship sud=desk ~]
+        hard=_|
+    ==
+?:  hard  (produce %kiln-jump-propose syd her sud)
+=/  msg
+  leaf+"Are you sure you want to tell subscribers to get ".
+  "updates for {<syd>} from {<her>}/{(trip sud)}?"
+%+  print  msg
+%+  prompt  [%& %prompt "(y/N) "]
+|=  in=tape
+?.  |(=("y" in) =("Y" in) =("yes" in))
+  no-product
+(produce %kiln-jump-propose syd her sud)

pkg/arvo/gen/hood/jump/reject.hoon

@@ -0,0 +1,6 @@
+:-  %say
+|=  $:  [now=@da eny=@uvJ bec=beak]
+        [old=dock new=dock ~]
+        ~
+    ==
+kiln-jump-opt+[old new |]

pkg/arvo/gen/hood/rc.hoon

@@ -1,13 +0,0 @@
-::  Helm: Reload %clay
-::
-::::  /hoon/rc/hood/gen
-  ::
-/?    310
-::
-::::
-  ::
-:-  %say
-|=  $:  [now=@da eny=@uvJ bec=beak]
-        [arg=~ ~]
-    ==
-[%helm-reload ~[%c]]

pkg/arvo/gen/hood/resume.hoon

@@ -1,5 +0,0 @@
-:-  %say
-|=  $:  [now=@da eny=@uvJ bec=beak]
-        [[=desk ~] ~]
-    ==
-[%kiln-resume desk]

pkg/arvo/gen/hood/sync-automerge.hoon

@@ -0,0 +1,6 @@
+:-  %say
+|=  $:  [now=@da eny=@uvJ bec=beak]
+        [syd=desk her=ship sud=desk auto=(unit ?) ~]
+        ~
+    ==
+kiln-sync-automerge+[[syd her sud] auto]

pkg/arvo/gen/jumps.hoon

@@ -0,0 +1,16 @@
+/-  h=hood
+:-  %say
+|=  [[now=@da eny=@uvJ bec=beak] ~ ~]
+:-  %tang
+^-  tang
+=+  .^  hop=jump:h
+      %gx
+      (scot %p p.bec)
+      %hood
+      (scot %da now)
+      /kiln/jumps/noun
+    ==
+?>  ?=(%all -.hop)
+%+  turn  ~(tap by all.hop)
+|=  [old=dock new=dock]
+leaf+"{<p.old>}/{(trip q.old)} -> {<p.new>}/{(trip q.new)}"

pkg/arvo/gen/stale-flows.hoon

@@ -4,24 +4,26 @@
 ::    |stale-flows, =veb %2  :: stale flows that keep (re)trying to connect
 ::    |stale-flows, =veb %21 :: ... per app (only forward)
 ::    |stale-flows, =veb %3  :: stale resubscriptions
+::    |stale-flows, =veb %4  :: print live naxplanation flows
 ::
 =>  |%
-    +$  subs  (jar path [ship bone @])
+    +$  subs  (jar path [ship bone @ close=?])
     +$  pags  (jar app=term [dst=term =ship =path])  ::  per-agent
     +$  naks  (set [ship bone])
     ::  verbosity
     ::
-    +$  veb  ?(%0 %1 %2 %21 %3 %31)
+    +$  veb  ?(%0 %1 %2 %21 %3 %4 ~)
     ::
     ++  resubs
       |=  [=subs =veb]
       ^-  @
-      ::=/  sorted
-      ::  %+  sort  ~(tap by subs)
-      ::  |=([a=(list *) b=(list *)] (lte (lent a) (lent b)))
-      %+  roll  ~(tap by subs)::sorted
-      |=  [[k=path v=(list [ship bone @])] num=@]
+      %+  roll  ~(tap by subs)
+      |=  [[k=path v=(list [ship bone @ close=?])] num=@]
+      =/  in-close=@
+        (roll v |=([[@ @ @ c=?] n=@] ?:(c +(n) n)))
       ~?  &(=(%3 veb) (gth (lent v) 1))
+        %+  weld  ?:  =(in-close 0)  ""
+          "[#{<in-close>} %close] "
         "#{<(dec (lent v))>} stale resubs on {<k>}"
       ?.  (gth (lent v) 1)  num
       (add (dec (lent v)) num)
@@ -29,7 +31,7 @@
 ::
 :-  %say
 |=  $:  [now=@da eny=@uvJ bec=beak]
-        [arg=~ dry=? =veb]
+        [arg=~ peer=(unit @p) dry=? =veb]
     ==
 ::
 =/  peers-map
@@ -45,12 +47,14 @@
     %known  (some ship)
   ==
 ::
-=;  [[=subs =pags backward=@ forward=@] =naks]
+=;  [[=subs =pags close=@ incoming=@ outgoing=@ nax=@] =naks]
   :-  %tang  %-  flop
   %+  weld
     :~  leaf+"#{<~(wyt in naks)>} flows from %nacking %watches"
-        leaf+"#{<backward>} live backward flows with (keep retrying)"
-        leaf+"#{<forward>} live forward flows with (keep retrying)"
+        leaf+"#{<incoming>} live backward flows"
+        leaf+"#{<outgoing>} live forward flows"
+        leaf+"#{<nax>} live naxplanations"
+        leaf+"#{<close>} flows in closing"
         leaf+"#{<(resubs subs veb)>} stale resubscriptions"
     ==
   ?.  =(%21 veb)  ~
@@ -60,13 +64,17 @@
             (gth (lent v) (lent w))
   |=  [app=term v=(list [dst=term =ship =path])]
   :-  %leaf
-  %+  weld  "#{<(lent v)>} flows for {<app>} with >10 retries"
+  %+  weld  "#{<(lent v)>} flows for {<app>}"
   ?.  =(1 (lent v))  ~
   ?>  ?=(^ v)
   " on {<ship.i.v>} to {<dst.i.v>} at {<path.i.v>}"
 ::
 %+  roll  peers
-|=  [=ship [=subs p=pags b=@ f=@] n=naks]
+|=  [=ship [=subs p=pags cl=@ in=@ ou=@ na=@] =naks]
+?:  ?&  ?=(^ peer)
+        !=(u.peer ship)
+    ==
+  +<+
 =+  .^  =ship-state:ames
         %ax  /(scot %p p.bec)//(scot %da now)/peers/(scot %p ship)
     ==
@@ -78,55 +86,63 @@
   %+  roll  ~(tap by snd.peer-state)
   |=  $:  [=bone message-pump-state:ames]
           subs=_subs   pags=_p
-          backward=_b  forward=_f
+          close=_cl
+          incoming=_in  outgoing=_ou  nax=_na
       ==
   =,  packet-pump-state
+  =+  closing=(~(has ^in closing.peer-state) bone)
   :-  ?~  duct=(~(get by by-bone.ossuary.peer-state) bone)  subs
-      ?.  ?=([* [%gall %use sub=@ @ %out @ @ nonce=@ pub=@ *] *] u.duct)
+      ?.  ?=([* [%gall %use sub=@ @ %out @ @ *] *] u.duct)
         subs
-      =/  =wire           i.t.u.duct
-      =/  nonce=(unit @)  (rush i.t.t.t.t.t.t.t.i.t.u.duct dem)
+      =/  =wire  i.t.u.duct
+      =/  nonce=(unit @ud)
+        ?~  (slag 7 wire)  ~
+        (slaw %ud &8.wire)
       %-  ~(add ja subs)
-      :_  [ship bone ?~(nonce 0 u.nonce)]  :: 0, 1?
-      ?~  nonce  wire
+      :_  [ship bone ?~(nonce 0 u.nonce) closing] :: 0 = pre-nonce subscriptions
+      ?~  nonce
+        wire
       ::  don't include the sub-nonce in the key
       ::
       (weld (scag 7 wire) (slag 8 wire))
-  %+  roll  ~(tap in live)
-  |=  $:  [[msg=@ frag=@] [packet-state:ames *]]
-          pags=_pags
-          out=[b=_backward f=_forward]
-      ==
-  ::
+  ?~  live  [pags close incoming outgoing nax]
   ::  only forward flows
   ::
-  =?  pags  &(=(0 (end 0 bone)) (gth tries 10))
+  =?  pags  =(%0 (mod bone 4))
     ?~  duct=(~(get by by-bone.ossuary.peer-state) bone)
       pags
-    ?.  ?=([* [%gall %use sub=@ @ %out @ @ nonce=@ pub=@ *] *] u.duct)
+    ?.  ?=([* [%gall %use sub=@ @ %out @ @ *] *] u.duct)
       pags
     =/  =wire  i.t.u.duct
-    (~(add ja pags) (snag 2 wire) (snag 8 wire) ship (slag 9 wire))
+    (~(add ja pags) (snag 2 wire) (snag 6 wire) ship (slag 7 wire))
   ::
-  ~?  &(=(%2 veb) (gth tries 10))
-    =+  arrow=?:(=(0 (end 0 bone)) "<-" "->")
-    =+  closing=(~(has in closing.peer-state) bone)
-    %+  weld  "{arrow} ({(cite:title ship)}) bone=#{<bone>} "
-    "closing={<closing>} msg=#{<msg>} frag=#{<frag>} #{<tries>}"
-  :-  pags
-  =?  out  (gth tries 10)
-    ?:  =(0 (end 0 bone))
-      [b.out +(f.out)]
-    [+(b.out) f.out]
-  out
+  =?  close  closing  +(close)
+  ~?  =(%2 veb)
+    =/  arrow=tape
+      ?+  (mod bone 4)  ~|([%odd-bone bone] !!)
+        %0  "<-"
+        %1  "->"
+        %3  "<-"
+      ==
+    "{arrow} ({(cite:title ship)}) bone=#{<bone>} closing={<closing>}"
+  ::
+  =/  is-nax=?  =(%3 (mod bone 4))
+  ~?  &(=(%4 veb) is-nax)
+    "nax: ({(cite:title ship)}) bone=#{<bone>} closing={<closing>}"
+  :+  pags  close
+  ?+  (mod bone 4)  ~|([%odd-bone bone] !!)
+    %0  [incoming +(outgoing) nax]
+    %1  [+(incoming) outgoing nax]
+    %3  [incoming outgoing +(nax)]
+  ==
 ::
 ++  nacks
   %+  roll  ~(tap by rcv.peer-state)
-  |=  [[=bone *] nacks=_n]
+  |=  [[=bone *] n=_naks]
   ?.  &(=(0 (end 0 bone)) =(1 (end 0 (rsh 0 bone))))
     ::  not a naxplanation ack bone
     ::
-    nacks
+    n
   ::  by only corking forward flows that have received
   ::  a nack we avoid corking the current subscription
   ::
@@ -134,16 +150,18 @@
   ::  make sure that the nack bone has a forward flow
   ::
   ?~  duct=(~(get by by-bone.ossuary.peer-state) target)
-    nacks
+    n
   ?.  ?=([* [%gall %use sub=@ @ %out @ @ nonce=@ pub=@ *] *] u.duct)
-    nacks
+    n
   =/  =wire      i.t.u.duct
+  =+  closing=(~(has ^in closing.peer-state) bone)
   ?>  ?=([%gall %use sub=@ @ %out @ @ nonce=@ pub=@ *] wire)
   =/  app=term   i.t.t.wire
   =/  nonce=@
     =-  ?~(- 0 u.-)
-    (rush i.t.t.t.t.t.t.t.wire dem)
-  =/  =path      t.t.t.t.t.t.t.t.wire
-  ~?  =(%1 veb)  "[bone={<target>} nonce={<nonce>} agent={<app>}] {<path>}"
-  (~(put in nacks) [ship target])
+    (slaw %ud &8.wire)
+  =/  =path  |8.wire
+  ~?  =(%1 veb)
+    "[bone={<target>} nonce={<nonce>} agent={<app>} close={<closing>}] {<path>}"
+  (~(put ^in n) [ship target])
 --

pkg/arvo/gen/updates.hoon

@@ -0,0 +1,16 @@
+/-  h=hood
+:-  %say
+|=  [[now=@da eny=@uvJ bec=beak] ~ ~]
+:-  %tang
+^-  tang
+=+  .^  upd=sync-update:h
+      %gx
+      (scot %p p.bec)
+      %hood
+      (scot %da now)
+      /kiln/pending/noun
+    ==
+?>  ?=(%pending -.upd)
+%+  turn  ~(tap in pending.upd)
+|=  [sync-record:h rev=@ud]
+leaf+"{<syd>} <- {<her>}/{(trip sud)}/{<rev>}"

pkg/arvo/gen/vats.hoon

@@ -22,7 +22,7 @@
 %-  zing
 %+  turn
   %+  sort
-    =/  sed  .^((set desk) %cd /(scot %p p.bec)/base/(scot %da now))
+    =/  sed  .^((set desk) %cd /(scot %p p.bec)//(scot %da now))
     (sort ~(tap in sed) |=([a=@ b=@] !(aor a b)))
   |=([a=desk b=desk] ?|(=(a %kids) =(b %base)))
 |=(syd=desk (report-vat (report-prep p.bec now) p.bec now syd verb))

pkg/arvo/lib/aqua-azimuth.hoon

@@ -57,7 +57,7 @@
   ++  get-single-req
     |=  req=@t
     =/  batch
-      ((ar:dejs:format same) (need (de-json:html req)))
+      ((ar:dejs:format same) (need (de:json:html req)))
     ?>  ?=([* ~] batch)
     i.batch
   ::
@@ -110,8 +110,7 @@
     |=  [req=@t result=json]
     ^-  card:agent:gall
     =/  resp
-      %-  crip
-      %-  en-json:html
+      %-  en:json:html
       :-  %a  :_  ~
       %-  pairs
       :~  id+s+(get-id req)

pkg/arvo/lib/hood/helm.hoon

@@ -246,8 +246,9 @@
   (emit %pass /helm %arvo %a %stir '')
 ::
 ++  poke-ames-kroc
-  |=  dry=?  =<  abet
-  (emit %pass /helm %arvo %a %kroc dry)
+  |=  [dry=? bones=(list [ship bone])]  =<  abet
+  ?:  dry  this
+  (emit %pass /helm %arvo %a %kroc bones)
 ::
 ++  poke-ames-cong
   |=  cong=[msg=@ud mem=@ud]  =<  abet

pkg/arvo/lib/hood/kiln.hoon

@@ -5,7 +5,8 @@
 =,  format
 =*  dude  dude:gall
 |%
-+$  state     state-10
++$  state     state-11
++$  state-11  [%11 pith-11]
 +$  state-10  [%10 pith-10]
 +$  state-9   [%9 pith-9]
 +$  state-8   [%8 pith-9]
@@ -19,7 +20,8 @@
 +$  state-0   [%0 pith-0]
 +$  any-state
   $~  *state
-  $%  state-10
+  $%  state-11
+      state-10
       state-9
       state-8
       state-7
@@ -32,10 +34,32 @@
       state-0
   ==
 ::
++$  pith-11
+  $:  rem=(map desk per-desk)
+      nyz=@ud
+      zyn=(map sync-record sync-state)
+      ::  requests from publishers to switch sync source
+      hop=(map dock dock)
+      ::  toggle global update auto-merge
+      mer=?
+      ::
+      commit-timer=[way=wire nex=@da tim=@dr mon=term]
+      ::  map desk to the currently ongoing fuse request
+      ::  and the latest version numbers for beaks to
+      fus=(map desk per-fuse)
+      ::  used for fuses - every time we get a fuse we
+      ::  bump this. used when calculating hashes to
+      ::  ensure they're unique even when the same
+      ::  request is made multiple times.
+      hxs=(map desk @ud)
+  ==
+::
++$  sync-state-10  [nun=@ta kid=(unit desk) let=@ud]
+::
 +$  pith-10
   $:  rem=(map desk per-desk)
       nyz=@ud
-      zyn=(map kiln-sync sync-state)
+      zyn=(map sync-record sync-state-10)
       commit-timer=[way=wire nex=@da tim=@dr mon=term]
       ::  map desk to the currently ongoing fuse request
       ::  and the latest version numbers for beaks to
@@ -50,7 +74,7 @@
 +$  pith-9
   $:  wef=(unit weft)
       rem=(map desk per-desk)
-      syn=(map kiln-sync let=@ud)
+      syn=(map sync-record let=@ud)
       ark=(map desk arak-9)
       commit-timer=[way=wire nex=@da tim=@dr mon=term]
       ::  map desk to the currently ongoing fuse request
@@ -78,7 +102,7 @@
 +$  pith-7
   $:  wef=(unit weft)
       rem=(map desk per-desk)
-      syn=(map kiln-sync let=@ud)
+      syn=(map sync-record let=@ud)
       ark=(map desk arak-7)
       commit-timer=[way=wire nex=@da tim=@dr mon=term]
       ::  map desk to the currently ongoing fuse request
@@ -121,7 +145,7 @@
 +$  pith-6
   $:  wef=(unit weft)
       rem=(map desk per-desk)                           ::
-      syn=(map kiln-sync let=@ud)                       ::
+      syn=(map sync-record let=@ud)                       ::
       ark=(map desk arak-6)                             ::
       commit-timer=[way=wire nex=@da tim=@dr mon=term]  ::
       ::  map desk to the currently ongoing fuse request
@@ -139,7 +163,7 @@
 ::
 +$  pith-5
   $:  rem=(map desk per-desk)                           ::
-      syn=(map kiln-sync let=@ud)                       ::
+      syn=(map sync-record let=@ud)                       ::
       ark=(map desk arak-6)                             ::
       commit-timer=[way=wire nex=@da tim=@dr mon=term]  ::
       ::  map desk to the currently ongoing fuse request
@@ -154,7 +178,7 @@
 ::
 +$  pith-4                                              ::
   $:  rem=(map desk per-desk)                           ::
-      syn=(map kiln-sync let=@ud)                       ::
+      syn=(map sync-record let=@ud)                       ::
       ark=(map desk arak-4)                             ::
       commit-timer=[way=wire nex=@da tim=@dr mon=term]  ::
       ::  map desk to the currently ongoing fuse request
@@ -175,7 +199,7 @@
   ==
 +$  pith-3                                              ::
   $:  rem=(map desk per-desk)                           ::
-      syn=(map kiln-sync let=@ud)                       ::
+      syn=(map sync-record let=@ud)                       ::
       ark=(map desk arak-3)                             ::
       commit-timer=[way=wire nex=@da tim=@dr mon=term]  ::
       ::  map desk to the currently ongoing fuse request
@@ -201,7 +225,7 @@
 ::
 +$  pith-2                                              ::
   $:  rem=(map desk per-desk)                           ::
-      syn=(map kiln-sync let=@ud)                       ::
+      syn=(map sync-record let=@ud)                       ::
       ota=(unit [=ship =desk =aeon])                    ::
       commit-timer=[way=wire nex=@da tim=@dr mon=term]  ::
       fus=(map desk per-fuse)
@@ -209,13 +233,13 @@
   ==                                                    ::
 +$  pith-1                                              ::
   $:  rem=(map desk per-desk)                           ::
-      syn=(map kiln-sync let=@ud)                       ::
+      syn=(map sync-record let=@ud)                       ::
       ota=(unit [=ship =desk =aeon])                    ::
       commit-timer=[way=wire nex=@da tim=@dr mon=term]  ::
   ==                                                    ::
 +$  pith-0                                              ::
   $:  rem=(map desk per-desk)                           ::
-      syn=(map kiln-sync let=@ud)                       ::
+      syn=(map sync-record let=@ud)                       ::
       autoload-on=?                                     ::
       cur-hoon=@uvI                                     ::
       cur-arvo=@uvI                                     ::
@@ -245,16 +269,6 @@
       pot=term                                          ::
   ==
 +$  kiln-unmount  $@(term [knot path])                  ::
-+$  kiln-sync                                           ::
-  $:  syd=desk                                          ::  local desk
-      her=ship                                          ::  foreign ship
-      sud=desk                                          ::  foreign desk
-  ==
-+$  kiln-unsync                                         ::
-  $:  syd=desk                                          ::  local desk
-      her=ship                                          ::  foreign ship
-      sud=desk                                          ::  foreign desk
-  ==
 +$  kiln-merge                                          ::
   $@  ~
   $:  syd=desk                                          ::
@@ -285,7 +299,6 @@
 +$  kiln-fuse-list  (unit desk)
 --
 |=  [bowl:gall state]
-?>  =(src our)
 =|  moz=(list card:agent:gall)
 |%
 ++  kiln  .
@@ -440,7 +453,7 @@
   =^  cards-9=(list card:agent:gall)  old
     ?.  ?=(%9 -.old)
       `old
-    =/  syn=(set kiln-sync)
+    =/  syn=(set sync-record)
       %-  ~(gas in ~(key by syn.old))
       %+  murn  ~(tap by ark.old)
       |=  [=desk =arak-9]
@@ -468,8 +481,8 @@
       [%pass /kiln/load-zest %arvo %c %zest desk zest]
     ::
       %+  turn  ~(tap in syn)
-      |=  k=kiln-sync
-      [%pass /kiln/load-sync %agent [our %hood] %poke %kiln-sync !>(k)]
+      |=  r=sync-record
+      [%pass /kiln/load-sync %agent [our %hood] %poke %kiln-sync !>(r)]
     ::
       =/  ks  ~(tap in syn)
       |-  ^-  (list card:agent:gall)
@@ -483,7 +496,17 @@
       $(ks t.ks)
     ==
   ::
-  ?>  ?=(%10 -.old)
+  =?  old  ?=(%10 -.old)
+    %=  old
+      -    %11
+      |4   [hop=~ mer=& |4.old]
+      zyn  %-  ~(run by zyn.old)
+           |=  sync-state-10
+           ^-  sync-state
+           [nun kid let ~ ~ |]
+    ==
+  ::
+  ?>  ?=(%11 -.old)
   =.  state  old
   abet:(emil cards-9)
 ::
@@ -499,18 +522,31 @@
     =/  ver  (mergebase-hashes our %base now (~(got by sources) %base))
     ``noun+!>(?~(ver 0v0 i.ver))
   ::
-      [%x %kiln %syncs ~]  ``noun+!>(zyn)
-      [%x %kiln %sources ~]  ``noun+!>(sources)
+      [%x %kiln %jumps ~]      ``kiln-jump+!>([%all hop])
+      [%x %kiln %syncs ~]      ``noun+!>(zyn)
+      [%x %kiln %sources ~]    ``noun+!>(sources)
+      [%x %kiln %automerge ~]  ``loob+!>(mer)
       [%x %kiln %pikes ~]
     =+  .^(=rock:tire %cx /(scot %p our)//(scot %da now)/tire)
     :^  ~  ~  %kiln-pikes
     !>  ^-  pikes
-    %-  ~(rut by rock)
+    %-  ~(urn by rock)
     |=  [=desk =zest wic=(set weft)]
     ^-  pike
     =+  .^(hash=@uv %cz /(scot %p our)/[desk]/(scot %da now))
     =/  sync  (~(get by sources) desk)
     [sync hash zest wic]
+  ::
+      [%x %kiln %pending ~]
+    :^  ~  ~  %kiln-sync-update
+    !>  ^-  sync-update
+    :-  %pending
+    %-  ~(gas by *(set [sync-record @ud]))
+    ^-  (list [sync-record @ud])
+    %+  murn  ~(tap by zyn)
+    |=  [sync-record sync-state]
+    ?~  hav  ~
+    (some [syd her sud] u.hav)
   ==
 ::
 ::  +get-germ: select merge strategy into local desk
@@ -528,12 +564,15 @@
 ::
 ++  poke
   |=  [=mark =vase]
+  ?>  |(=(src our) =(%kiln-jump-ask mark))
   ?+  mark  ~|([%poke-kiln-bad-mark mark] !!)
+    %kiln-approve-merge      =;(f (f !<(_+<.f vase)) poke-approve-merge)
     %kiln-autocommit         =;(f (f !<(_+<.f vase)) poke-autocommit)
     %kiln-bump               =;(f (f !<(_+<.f vase)) poke-bump)
     %kiln-cancel             =;(f (f !<(_+<.f vase)) poke-cancel)
     %kiln-cancel-autocommit  =;(f (f !<(_+<.f vase)) poke-cancel-autocommit)
     %kiln-commit             =;(f (f !<(_+<.f vase)) poke-commit)
+    %kiln-sync-automerge     =;(f (f !<(_+<.f vase)) poke-sync-automerge)
     %kiln-fuse               =;(f (f !<(_+<.f vase)) poke-fuse)
     %kiln-fuse-list          =;(f (f !<(_+<.f vase)) poke-fuse-list)
     %kiln-gall-sear          =;(f (f !<(_+<.f vase)) poke-gall-sear)
@@ -543,12 +582,16 @@
     %kiln-label              =;(f (f !<(_+<.f vase)) poke-label)
     %kiln-merge              =;(f (f !<(_+<.f vase)) poke-merge)
     %kiln-mount              =;(f (f !<(_+<.f vase)) poke-mount)
+    %kiln-jump-ask           =;(f (f !<(_+<.f vase)) poke-jump-ask)
+    %kiln-jump-opt           =;(f (f !<(_+<.f vase)) poke-jump-opt)
+    %kiln-jump-propose       =;(f (f !<(_+<.f vase)) poke-jump-propose)
     %kiln-nuke               =;(f (f !<(_+<.f vase)) poke-nuke)
     %kiln-pause              =;(f (f !<(_+<.f vase)) poke-pause)
     %kiln-permission         =;(f (f !<(_+<.f vase)) poke-permission)
     %kiln-revive             =;(f (f !<(_+<.f vase)) poke-revive)
     %kiln-rein               =;(f (f !<(_+<.f vase)) poke-rein)
     %kiln-rm                 =;(f (f !<(_+<.f vase)) poke-rm)
+    %kiln-global-automerge   =;(f (f !<(_+<.f vase)) poke-global-automerge)
     %kiln-schedule           =;(f (f !<(_+<.f vase)) poke-schedule)
     %kiln-suspend            =;(f (f !<(_+<.f vase)) poke-suspend)
     %kiln-suspend-many       =;(f (f !<(_+<.f vase)) poke-suspend-many)
@@ -559,6 +602,19 @@
     %kiln-unsync             =;(f (f !<(_+<.f vase)) poke-unsync)
   ==
 ::
+++  poke-approve-merge
+  |=  [sync-record approve=?]
+  ?~  got=(~(get by zyn) syd her sud)
+    =+  msg="kiln: no syncs from {(scow %p her)}/{(trip sud)} to {<syd>}"
+    ((slog leaf+msg ~) abet)
+  ?~  hav.u.got
+    =+  msg="kiln: no updates from {(scow %p her)}/{(trip sud)} for {<syd>}"
+    ((slog leaf+msg ~) abet)
+  =<  abet
+  ?.  approve
+    abet:drop:(sync syd her sud)
+  abet:(merg /main syd):(sync syd her sud)
+::
 ++  poke-autocommit
   |=  [mon=kiln-commit auto=?]
   =<  abet
@@ -679,6 +735,23 @@
   |=  =ship
   abet:(emit %pass /kiln %arvo %g %sear ship)
 ::
+++  poke-global-automerge
+  |=  auto=?
+  =.  mer  auto
+  ?.  mer  abet
+  =/  zyns=(list [sync-record sync-state])  ~(tap by zyn)
+  =<  abet
+  |-
+  ?~  zyns  ..abet
+  ?.  ?&  ?=(^ hav.i.zyns)
+          !?=([~ %.n] nit.i.zyns)
+      ==
+    $(zyns t.zyns)
+  %=  $
+    zyns    t.zyns
+    ..abet  abet:(merg /main syd):(sync -.i.zyns)
+  ==
+::
 ++  poke-info
   |=  [mez=tape tor=(unit toro)]
   ?~  tor
@@ -692,17 +765,20 @@
     ?~  got=(~(get by rock) loc)
       %dead
     zest.u.got
-  =.  zyn
+  =.  ..abet
     ?~  got=(~(get by sources) loc)
-      zyn
-    (~(del by zyn) loc u.got)
+      ..abet
+    ?:  =([her rem] u.got)
+      ..abet
+    =.  ..abet  abet:drop:(sync loc u.got)
+    ..abet(zyn (~(del by zyn) loc u.got))
   =?  ..abet  ?=(%dead zest)
     (emit %pass /kiln/install %arvo %c %zest loc ?:(=(our her) %live %held))
   ?:  (~(has by zyn) loc her rem)
     abet:(spam (render "already syncing" loc her rem ~) ~)
   ?:  =([our loc] [her rem])
     abet
-  =/  sun  (sync loc her rem)
+  =/  sun  okay:(sync loc her rem)
   ~>  %slog.(fmt "beginning install into {here:sun}")
   =<  abet:abet:init
   ?:  =(%base loc)
@@ -710,7 +786,7 @@
   sun
 ::
 ++  poke-kids
-  |=  [hos=kiln-sync nex=(unit desk)]
+  |=  [hos=sync-record nex=(unit desk)]
   abet:abet:(apex:(sync hos) nex)
 ::
 ++  poke-label
@@ -731,6 +807,84 @@
     abet:(spam leaf+- ~)
   abet:(emit %pass /mount %arvo %c [%mont pot u.bem])
 ::
+++  poke-jump-propose
+  |=  [syd=desk her=ship sud=desk]
+  ?:  =([our syd] [her sud])
+    abet
+  =/  let=@ud  ud:.^(cass:clay %cw /(scot %p our)/[syd]/(scot %da now))
+  =/  subs=(set [@p rave:clay])
+    .^((set [@p rave:clay]) %cx /(scot %p our)//(scot %da now)/cult/[syd])
+  =/  ships=(set @p)
+    %+  roll  ~(tap in subs)
+    |=  [[=ship =rave:clay] ships=(set @p)]
+    ?:  =(our ship)                    ships
+    ?.  ?=([%sing %w [%ud @] ~] rave)  ships
+    ?.  =(+(let) p.case.mood.rave)     ships
+    (~(put in ships) ship)
+  =<  abet
+  %-  emil
+  %+  turn  ~(tap in ships)
+  |=  =ship
+  :*  %pass  /kiln/jump-propose  %agent  [ship %hood]
+      %poke  %kiln-jump-ask  !>([[our syd] [her sud]])
+  ==
+::
+++  poke-jump-ask
+  |=  [old=dock new=dock]
+  ?>  |(=(src p.old) =(src our))
+  ?:  =(old new)
+    ?~  had=(~(get by hop) old)
+      abet
+    =.  hop  (~(del by hop) old)
+    abet:(emit %give %fact ~[/jumps] %kiln-jump !>([%nay old u.had]))
+  ?~  (skim ~(tap by sources) |=(sync-record =(old [her sud])))
+    ~>  %slog.(fmt "no syncs from {(scow %p p.old)}/{(trip q.old)}")
+    abet
+  =.  hop  (~(put by hop) old new)
+  abet:(emit %give %fact ~[/jumps] %kiln-jump !>([%add old new]))
+::
+++  poke-jump-opt
+  |=  [old=dock new=dock yea=?]
+  ?~  got=(~(get by hop) old)
+    ~>  %slog.(fmt "no jump request for {(scow %p p.old)}/{(trip q.old)}")
+    abet
+  ?.  =(new u.got)
+    =/  txt-old  "{(scow %p p.old)}/{(trip q.old)}"
+    =/  txt-new  "{(scow %p p.new)}/{(trip q.new)}"
+    ~>  %slog.(fmt "no jump request from {txt-old} to {txt-new}")
+    abet
+  ?.  yea
+    =/  txt-old  "{(scow %p p.old)}/{(trip q.old)}"
+    =/  txt-new  "{(scow %p p.new)}/{(trip q.new)}"
+    ~>  %slog.(fmt "denied jump from {txt-old} to {txt-new}")
+    =.  hop  (~(del by hop) old)
+    abet:(emit %give %fact ~[/jumps] %kiln-jump !>([%nay old new]))
+  =/  old-sources=(list sync-record)
+    (skim ~(tap by sources) |=(sync-record =(old [her sud])))
+  =/  new-sources=(list sync-record)
+    (turn old-sources |=(sync-record [syd new]))
+  =.  ..abet
+    (emit %give %fact ~[/jumps] %kiln-jump !>([%yea old new]))
+  =.  ..abet
+    |-
+    ?~  old-sources
+      ..abet
+    =.  ..abet  abet:drop:(sync i.old-sources)
+    =.  zyn  (~(del by zyn) i.old-sources)
+    $(old-sources t.old-sources, ..abet ..abet)
+  =.  hop  (~(del by hop) old)
+  =<  abet
+  |-  ^+  ..abet
+  ?~  new-sources  ..abet
+  %=  $
+    new-sources  t.new-sources
+    ..abet       =/  sun  (sync i.new-sources)
+                 =<  abet:init
+                 ?:  =(%base syd.i.new-sources)
+                   (apex:sun `%kids)
+                 sun
+  ==
+::
 ++  poke-nuke
   |=  [=term desk=?]
   =<  abet
@@ -795,17 +949,34 @@
   %+  turn
     %+  skim  desks
     |=  dek=desk
-    ?:  (~(has in .^((set desk) %cd /(scot %p our)/base/(scot %da now))) dek)
+    ?:  (~(has in .^((set desk) %cd /(scot %p our)//(scot %da now))) dek)
       &  
     ~>  %slog.(fmt "desk does not yet exist: {<dek>}")  |   
   |=(=desk [%pass /kiln/suspend %arvo %c %zest desk %dead])
 ::
 ++  poke-sync
-  |=  hos=kiln-sync
-  ?:  (~(has by zyn) hos)
-    abet:(spam (render "already syncing" [sud her syd ~]:hos) ~)
-  ~>  %slog.(fmt "beginning sync into {<syd.hos>} from {<her.hos>}/{<sud.hos>}")
-  abet:abet:init:(sync hos)
+  |=  sync-record
+  ?:  (~(has by zyn) sud her syd)
+    abet:(spam (render "already syncing" [sud her syd ~]) ~)
+  =.  ..abet
+    ?~  got=(~(get by sources) syd)
+      ..abet
+    =.  ..abet  abet:drop:(sync syd u.got)
+    ..abet(zyn (~(del by zyn) syd u.got))
+  ~>  %slog.(fmt "beginning sync into {<syd>} from {<her>}/{<sud>}")
+  abet:abet:init:(sync syd her sud)
+::
+++  poke-sync-automerge
+  |=  [sync-record auto=(unit ?)]
+  ?~  got=(~(get by zyn) syd her sud)
+    =+  msg="kiln: no syncs from {(scow %p her)}/{(trip sud)} to {<syd>}"
+    ((slog leaf+msg ~) abet)
+  =.  zyn  (~(put by zyn) [syd her sud] u.got(nit auto))
+  ?~  hav.u.got
+    abet
+  ?.  |(?=([~ %.y] auto) &(mer ?=(~ auto)))
+    abet
+  abet:abet:(merg /main syd):(sync [syd her sud])
 ::
 ++  poke-syncs                                        ::  print sync config
   |=  ~
@@ -813,7 +984,7 @@
   ?:  =(0 ~(wyt by zyn))
     [%leaf "no syncs configured"]~
   %+  turn  ~(tap by zyn)
-  |=  [kiln-sync sync-state]
+  |=  [sync-record sync-state]
   (render "sync configured" sud her syd kid)
 ::
 ++  poke-uninstall
@@ -821,10 +992,9 @@
   =+  .^(=rock:tire %cx /(scot %p our)//(scot %da now)/tire)
   ?~  got=(~(get by rock) loc)
     abet:(spam leaf+"desk does not exist: {<loc>}" ~)
-  ?:  =(+<:got %dead)
-    abet:(spam leaf+"desk not installed: {<loc>}" ~)
   ~>  %slog.(fmt "uninstalling {<loc>}")
-  =.  ..on-init  (emit %pass /kiln/uninstall %arvo %c %zest loc %dead)
+  =?  ..on-init  !=(+<:got %dead)  
+    (emit %pass /kiln/uninstall %arvo %c %zest loc %dead)
   ?~  sync=(~(get by sources) loc)
     abet
   (poke-unsync loc u.sync)
@@ -842,9 +1012,10 @@
 ::  Don't need to cancel anything because new syncs will get a new nonce
 ::
 ++  poke-unsync
-  |=  hus=kiln-unsync
+  |=  hus=sync-record
   ?~  got=(~(get by zyn) hus)
     abet:(spam (render "not syncing" [sud her syd ~]:hus) ~)
+  =.  ..abet  abet:drop:(sync hus)
   =.  zyn  (~(del by zyn) hus)
   abet:(spam (render "cancelling sync" sud.hus her.hus syd.hus kid.u.got) ~)
 ::  +peer: handle %watch
@@ -852,10 +1023,26 @@
 ++  peer
   |=  =path
   ?>  (team:title our src)
-  ?:  =(0 1)  abet  ::  avoid mint-vain
   ?+    path  ~|(kiln-path/path !!)
       [%vats ~]
     (mean leaf+"kiln: old subscription to /kiln/vats failed" ~)
+  ::
+      [%jumps ~]
+    abet:(emit %give %fact ~ %kiln-jump !>([%all hop]))
+  ::
+      [%updates ~]
+    =<  abet
+    %-  emit
+    :^  %give  %fact  ~
+    :-  %kiln-sync-update
+    !>  ^-  sync-update
+    :-  %pending
+    %-  ~(gas by *(set [sync-record @ud]))
+    ^-  (list [sync-record @ud])
+    %+  murn  ~(tap by zyn)
+    |=  [sync-record sync-state]
+    ?~  hav  ~
+    (some [syd her sud] u.hav)
   ==
 ::
 ++  take-agent
@@ -865,6 +1052,8 @@
           ~?  ?=(^ p.sign)  [%kiln-poke-nack u.p.sign]
           abet
         ~|([%kiln-bad-take-agent wire -.sign] !!)
+  ::
+      [%change-publisher ~]  abet
   ::
       [%fancy *]
     ?>  ?=(%poke-ack -.sign)
@@ -1079,15 +1268,30 @@
   abet:abet:(take:(sync syd her sud) t.t.t.wire sign-arvo)
 ::
 ++  sync
-  |=  kiln-sync
+  |=  sync-record
   =/  got  (~(get by zyn) syd her sud)
-  =+  `sync-state`(fall got [(scot %uv nyz) ~ *@ud])
+  =+  `sync-state`(fall got [(scot %uv nyz) ~ *@ud ~ ~ |])
   =?  nyz  ?=(~ got)  +(nyz)
   |%
-  ++  abet  ..sync(zyn (~(put by zyn) [syd her sud] nun kid let))
+  ++  abet  ..sync(zyn (~(put by zyn) [syd her sud] nun kid let nit hav yea))
   ++  apex  |=(nex=(unit desk) ..abet(kid nex))
   ++  emit  |=(card:agent:gall ..abet(kiln (^emit +<)))
   ++  emil  |=((list card:agent:gall) ..abet(kiln (^emil +<)))
+  ++  okay  ..abet(yea &)
+  ++  gain
+    =.  hav  `(dec let)
+    =/  upd=sync-update  [%new [syd her sud] (dec let)]
+    (emit %give %fact ~[/update] %kiln-sync-update !>(upd))
+  ++  drop
+    =?  ..abet  ?=(^ hav)
+      =/  upd=sync-update  [%drop [syd her sud] u.hav]
+      (emit %give %fact ~[/updates] %kiln-sync-update !>(upd))
+    ..abet(hav ~, yea |)
+  ++  tada
+    =?  ..abet  ?=(^ hav)
+      =/  upd=sync-update  [%done [syd her sud] u.hav]
+      (emit %give %fact ~[/updates] %kiln-sync-update !>(upd))
+    ..abet(hav ~, yea |)
   ++  here  "{<syd>} from {<her>}/{<sud>}"
   ++  ware
     |=  =wire
@@ -1102,7 +1306,6 @@
       %merg  desk  her  sud
       ud+(dec let)  (get-germ desk)
     ==
-  ::
   ::  (re)Start a sync from scratch by finding what version the source
   ::  desk is at
   ::
@@ -1128,6 +1331,12 @@
     =/  m  (strand:rand ,vase)
     ;<  =riot:clay  bind:m  (warp:strandio her sud ~ %sing %w ud+let /)
     ?>  ?=(^ riot)
+    ::  The syncs may have changed, so get the latest
+    ::
+    ;<  zyx=(map sync-record sync-state)  bind:m
+      (scry:strandio (map sync-record sync-state) /gx/hood/kiln/syncs/noun)
+    ?.  (~(has by zyx) syd her sud)
+      (pure:m !>(%done))
     ~>  %slog.(fmt "downloading update for {here}")
     ;<  =riot:clay  bind:m  (warp:strandio her sud ~ %sing %v ud+let /)
     ?>  ?=(^ riot)
@@ -1170,6 +1379,7 @@
       ?:  ?=(%| -.p.sign-arvo)
         ::  ~>  %slog.(fmt "download failed into {here}; retrying sync")
         ::  %-  (slog p.p.sign-arvo)
+        =.  ..abet  drop
         init
       ::
       ~>  %slog.(fmt "finished downloading update for {here}")
@@ -1177,7 +1387,7 @@
       ::  If nothing changed, just ensure %kids is up-to-date and advance
       ::
       ?.  (get-remote-diff our syd now [her sud (dec let)])
-        =<  next
+        =<  next:drop
         ?~  kid
           ~>  %slog.(fmt "remote is identical to {here}, skipping")
           ..abet
@@ -1186,15 +1396,22 @@
           ..abet
         ~>  %slog.(fmt "remote is identical to {here}, merging into {<u.kid>}")
         (merg /kids u.kid)
+      ::  wait for approval if can't automerge & signal available update
+      ::
+      ?.  |(=(our her) yea =([~ &] nit) &(=(~ nit) mer))
+        =.  ..abet  gain
+        next
       ::  Else start merging, but also immediately start listening to
       ::  the next revision.  Now, all errors should no-op -- we're
       ::  already waiting for the next revision.
       ::
+      =.  yea  |
       =.  ..abet  (merg /main syd)
       next
     ::
-        %main
+        %main 
       ?>  ?=(%mere +<.sign-arvo)
+      =<  tada
       ?:  ?=(%| -.p.sign-arvo)
         =+  "kiln: merge into {here} failed, waiting for next revision"
         %-  (slog leaf/- p.p.sign-arvo)

pkg/arvo/lib/json/rpc.hoon

@@ -10,8 +10,8 @@
     %-  ~(gas in *math:eyre)
     ~['Content-Type'^['application/json']~]
   %-  some
-  %-  as-octt:mimes:html
-  (en-json:html (request-to-json req))
+  %-  as-octs:mimes:html
+  (en:json:html (request-to-json req))
 ::
 ++  request-to-json
   |=  request
@@ -65,7 +65,7 @@
   |=  body=(unit octs)
   ^-  (unit batch-request)
   ?~  body  ~
-  ?~  jon=(de-json:html q.u.body)  ~
+  ?~  jon=(de:json:html q.u.body)  ~
   =,  dejs-soft:format
   =;  reparser
     ?:  ?=([%a *] u.jon)

pkg/arvo/lib/test/ames-gall.hoon

@@ -186,7 +186,7 @@
     !<  (list @ux)
     =<  q
     %-  need  %-  need
-    (scry:(ames-gate now eny roof) ~ %x beam)
+    (scry:(ames-gate now eny roof) ~ / %x beam)
   ::
   =/  paz=(list have:ames)
     %+  spun  meows
@@ -213,7 +213,7 @@
   =<  q
   %-  need  %-  need
   %-  scry:(ames-gate now eny roof)
-  [~ %x [[our %$ da+now] /peers/(scot %p her)]]
+  [~ / %x [[our %$ da+now] /peers/(scot %p her)]]
 ::
 ++  gall-scry-nonce
   |=  $:  =gall-gate
@@ -227,7 +227,7 @@
   =<  q
   %-  need  %-  need
   %-  scry:(gall-gate now eny roof)
-  [~ %n [[our dude da+now] [%$ (scot %p ship.sub) [term wire]:sub]]]
+  [~ / %n [[our dude da+now] [%$ (scot %p ship.sub) [term wire]:sub]]]
 ::
 ++  load-agent
   |=  [=ship =gall-gate =dude:gall =agent:gall]

pkg/arvo/lib/vere.hoon

@@ -49,8 +49,8 @@
     ::
     ++  czar
       ^-  octs
-      %-  as-octt:mimes:html
-      %-  en-json:html
+      %-  as-octs:mimes:html
+      %-  en:json:html
       :-  %a
       %+  turn  (gulf 0 255)
       |=  gal=@
@@ -63,8 +63,8 @@
     ++  point
       |=  who=ship
       ^-  octs
-      %-  as-octt:mimes:html
-      %-  en-json:html
+      %-  as-octs:mimes:html
+      %-  en:json:html
       %+  request-to-json
         ~.
       :-  'getPoint'
@@ -73,8 +73,8 @@
     ::
     ++  turf
       ^-  octs
-      %-  as-octt:mimes:html
-      %-  en-json:html
+      %-  as-octs:mimes:html
+      %-  en:json:html
       %+  request-to-json
         'turf'
       ['getDns' ~]
@@ -106,7 +106,7 @@
     ++  czar
       |=  rep=octs
       ^-  (unit (map ship [=rift =life =pass]))
-      =/  jon=(unit json)  (de-json:html q.rep)
+      =/  jon=(unit json)  (de:json:html q.rep)
       ?~  jon
         ~&([%czar-take-dawn %invalid-json] ~)
       =/  res=(unit (list [@t @ud @ud @]))
@@ -142,7 +142,7 @@
       |=  [who=ship rep=octs]
       ^-  (unit point:azimuth)
       ~!  *point:azimuth
-      =/  jon=(unit json)  (de-json:html q.rep)
+      =/  jon=(unit json)  (de:json:html q.rep)
       ?~  jon
         ~&([%point-take-dawn %invalid-json] ~)
       =-  ?~  res
@@ -202,7 +202,7 @@
     ++  turf
       |=  rep=octs
       ^-  (unit (list ^turf))
-      =/  jon=(unit json)  (de-json:html q.rep)
+      =/  jon=(unit json)  (de:json:html q.rep)
       ?~  jon
         ~&([%turf-take-dawn %invalid-json] ~)
       =/  res=(unit (list @t))

pkg/arvo/mar/kiln/approve-merge.hoon

@@ -0,0 +1 @@
+../../../base-dev/mar/kiln/approve-merge.hoon

pkg/arvo/mar/kiln/jump-ask.hoon

@@ -0,0 +1 @@
+../../../base-dev/mar/kiln/jump-ask.hoon

pkg/arvo/mar/kiln/jump-opt.hoon

@@ -0,0 +1 @@
+../../../base-dev/mar/kiln/jump-opt.hoon

pkg/arvo/mar/kiln/jump.hoon

@@ -0,0 +1 @@
+../../../base-dev/mar/kiln/jump.hoon

pkg/arvo/mar/kiln/sync-update.hoon

@@ -0,0 +1 @@
+../../../base-dev/mar/kiln/sync-update.hoon

pkg/arvo/mar/pem.hoon

@@ -13,7 +13,6 @@
   =>  v=.
   |%
   ++  mime  =>  v  [/text/plain (as-octs (of-wain pem))]
-  ++  elem  =>  v  ;pre: {(trip (of-wain pem))}
   --
 ++  grad  %mime
 --

pkg/arvo/mar/snip.hoon

@@ -3,42 +3,6 @@
   ::
 /?    310
 =,  html
-|%
-  ++  words  1
-  ++  hedtal
-    =|  met=marl
-    |=  a=marl  ^-  [hed=marl tal=marl]
-    ?~  a  [~ ~]
-    ?.  ?=(%h1 n.g.i.a)
-      ?:  ?=(%meta n.g.i.a)
-        $(a t.a, met [i.a met])
-      =+  had=$(a c.i.a)
-      ?^  -.had  had
-      $(a t.a)
-    [c.i.a (weld (flop met) (limit words t.a))]
-  ::
-  ++  limit
-    |=  [lim=@u mal=marl]
-    =<  res
-    |-  ^-  [rem=@u res=marl]
-    ?~  mal  [lim ~]
-    ?~  lim  [0 ~]
-    =/  [lam=@u hed=manx]
-      ?:  ?=(_;/(**) i.mal)
-        [lim ;/(tay)]:(deword lim v.i.a.g.i.mal)
-      [rem ele(c res)]:[ele=i.mal $(mal c.i.mal)]
-    [rem - res]:[hed $(lim lam, mal t.mal)]
-  ::
-  ++  deword
-    |=  [lim=@u tay=tape]  ^-  [lim=@u tay=tape]
-    ?~  tay  [lim tay]
-    ?~  lim  [0 ~]
-    =+  wer=(dot 1^1 tay)
-    ?~  q.wer
-      [lim - tay]:[i.tay $(tay t.tay)]
-    =+  nex=$(lim (dec lim), tay q.q.u.q.wer)
-    [-.nex [(wonk wer) +.nex]]
---
 ::
 ::
 =,  mimes:html
@@ -50,14 +14,18 @@
   ++  mime
     =<  mime
     |%
-    ++  elem  ;div:(h1:"*{hed}" div:"*{tal}")           ::  convert to %elem
-    ++  hymn  ;html:(head:title:"snip" body:"+{elem}")  ::  convert to %hymn
+    ++  hymn                                            ::  convert to %hymn
+      |^  html
+      ++  div    ;div:(h1:"*{hed}" div:"*{tal}")                                
+      ++  html   ;html:(head:title:"snip" body:"+{div}")
+      --
     ++  html  (crip (en-xml hymn))                      ::  convert to %html
     ++  mime  [/text/html (as-octs html)]               ::  convert to %mime
     --
   ++  noun  [hed tal]
   --
-++  grab  |%                                            ::  convert from
-          ++  noun  ,[marl marl]                        ::  clam from %noun
-          ++  elem  |=(a=manx (hedtal +.a))
---        --
+++  grab                                                ::  convert from
+  |%
+  ++  noun  ,[marl marl]                        ::  clam from %noun
+  --
+--

pkg/arvo/mar/x-htm.hoon

@@ -1,12 +0,0 @@
-|_  a=manx
-++  grad  %noun
-++  grab
-  |%
-  ++  noun  manx
-  --
-++  grow
-  |%
-  ++  htm  a
-  ++  noun  a
-  --
---

pkg/arvo/mar/x-htm/elem.hoon

@@ -1,11 +0,0 @@
-|_  a=manx
-++  grad  %noun
-++  grab
-  |%
-  ++  noun  manx
-  --
-++  grow
-  |%
-  ++  noun  a
-  --
---

pkg/arvo/mar/xhtml.hoon

@@ -0,0 +1 @@
+../../base-dev/mar/xhtml.hoon

pkg/arvo/sys.kelvin

@@ -1 +1 @@
-[%zuse 413]
+[%zuse 411]

pkg/arvo/sys/arvo.hoon

@@ -3,7 +3,7 @@
 |%
 +|  %global
 ::
-++  arvo  %238
+++  arvo  %237
 ::
 ::  $arch: node identity
 ::  $axal: fundamental node, recursive (trie)
@@ -111,6 +111,7 @@
   |$  [a]
   $~  =>(~ |~(* ~))
   $-  $:  lyc=gang                                      ::  leakset
+          pov=path                                      ::  provenance
           omen                                          ::  perspective, path
       ==                                                ::
   %-  unit                                              ::  ~: unknown
@@ -118,7 +119,7 @@
   (cask a)                                              ::
 +$  roon                                                ::  partial namespace
   $~  =>(~ |~(* ~))
-  $-  [lyc=gang car=term bem=beam]
+  $-  [lyc=gang pov=path car=term bem=beam]
   (unit (unit cage))
 +$  root  $-(^ (unit (unit)))
 +$  view  $@(term [way=term car=term])                  ::  perspective
@@ -207,9 +208,9 @@
   ==
 +$  heir
   $%  $:  %grub
-          $%  [?(%240 %239 %238) =grub]
+          $%  [?(%240 %239 %238 %237) =grub]
       ==  ==
-      [?(%240 %239 %238) =debt =soul]
+      [?(%240 %239 %238 %237) =debt =soul]
   ==
 +$  plan  (pair germ (list move))
 +$  soul
@@ -342,16 +343,18 @@
 ::
 ++  look
   ~/  %look
-  |=  [rof=roof lyc=gang]
+  |=  [rof=roof lyc=gang pov=path]
   ^-  root
   ~/  %in
   |=  [ref=* raw=*]
   ?~  pax=((soft path) raw)  ~
   ?~  mon=(de-omen u.pax)  ~
-  ?~  dat=(rof lyc u.mon)  ~
+  ?~  dat=(rof lyc pov u.mon)  ~
   ?~  u.dat  [~ ~]
   =*  vax  q.u.u.dat
-  ?.  ?&  ?=(^ ref)
+  ?.  =>  [ref=ref vax=p=p.vax hoon-version=hoon-version wa=wa worm=worm]
+      ~>  %memo./arvo/look                  ::  with memoization
+      ?&  ?=(^ ref)
           =(hoon-version -.ref)
           -:(~(nets wa *worm) +.ref p.vax)
       ==
@@ -1052,7 +1055,7 @@
         ++  smit
           |=  [cap=tape sub=vase pax=path txt=@t]
           ^-  vase
-          ~>  %slog.[0 leaf/"{cap}: {(scow p+(mug txt))}"]
+          ~>  %slog.[0 leaf/"{cap}: {(scow uv+(mug txt))}"]
           ~>  %bout
           %-  road  |.
           ~_  leaf/"{cap}: build failed"
@@ -1101,7 +1104,7 @@
       ++  peek
         ~/  %peek
         ^-  rook
-        |=  [lyc=gang omen]
+        |=  [lyc=gang pov=path omen]
         ^-  (unit (unit (cask meta)))
         ::  namespace reads receive no entropy
         ::
@@ -1113,7 +1116,7 @@
           ~>  %mean.'peek: pull failed'
           (~(slap wa sac) rig [%limb %scry])
         ::
-        =/  mas=[gang view beam]  [lyc vis bem]
+        =/  mas=[gang path view beam]  [lyc pov vis bem]
         ::
         =^  pro  sac
           ~>  %mean.'peek: call failed'
@@ -1293,7 +1296,7 @@
           :^  %pass  [vane.gem vane]
             ?:  ?=(?(%deal %deal-gall) +>-.task)
               :-  :-  +>-.task
-                  ;;([[ship ship] term term] [+>+< +>+>- +>+>+<]:task)
+                  ;;([[ship ship path] term term] [+>+< +>+>- +>+>+<]:task)
               wire
             [(symp +>-.task) wire]
           duct
@@ -1373,7 +1376,7 @@
       |=  [nam=term =vane]
       =;  mas=(list mass)
         nam^|+(welp mas [dot+&+q.vase typ+&+p.vase sac+&+worm ~]:vane)
-      ?~  met=(peek [~ ~] [nam %x] bem)  ~
+      ?~  met=(peek [~ ~] / [nam %x] bem)  ~
       ?~  u.met  ~
       ~|  mass+nam
       ;;((list mass) q.q.u.u.met)
@@ -1381,7 +1384,7 @@
     ::
     ++  peek
       ^-  rook
-      |=  [lyc=gang omen]
+      |=  [lyc=gang pov=path omen]
       ^-  (unit (unit (cask meta)))
       ::  vane and care may be concatenated
       ::
@@ -1392,12 +1395,12 @@
         [(end 3 vis) (rsh 3 vis)]
       ::
       ?:  ?=(%$ way)
-        (peek:pith lyc car bem)
+        (peek:pith lyc pov car bem)
       ::
       =.  way  (grow way)
       ?~  van=(~(get by van.mod) way)
         ~
-      %.  [lyc car bem]
+      %.  [lyc pov car bem]
       peek:spin:(~(plow va [vil u.van]) now peek)
     ::  +call: advance to target
     ::
@@ -1552,11 +1555,11 @@
       ::
       ++  peek
         ^-  roon
-        |=  [lyc=gang car=term bem=beam]
+        |=  [lyc=gang pov=path car=term bem=beam]
         ^-  (unit (unit cage))
-        ?.  ?|  =(our p.bem)
+        ?.  ?&  =(our p.bem)
                 ?=(%$ q.bem)
-                =([%da now] p.r.bem)
+                =([%da now] r.bem)
             ==
           ~
         ?+  s.bem  ~
@@ -1741,6 +1744,7 @@
     %i  %iris
     %j  %jael
     %k  %khan
+    %l  %lick
   ==
 --  =>
 ::
@@ -1764,7 +1768,7 @@
   ::
   =.  sol
     ?-  -.hir
-      ?(%240 %239 %238)  soul.hir
+      ?(%240 %239 %238 %237)  soul.hir
     ==
   ::  clear compiler caches
   ::
@@ -1805,7 +1809,7 @@
     ==
   ::
   ?~  hap  ~
-  =/  pro  (~(peek le:part [pit vil] sol) lyc [vis bem]:u.hap)
+  =/  pro  (~(peek le:part [pit vil] sol) lyc / [vis bem]:u.hap)
   ?:  |(?=(~ pro) ?=(~ u.pro))  ~
   =/  dat=(cask)  [p q.q]:u.u.pro
   ?.  pat.u.hap  `dat
@@ -1879,7 +1883,7 @@
           ++  smit
             |=  [cap=tape sub=(trap vase) pax=path txt=@t]
             ^-  (trap vase)
-            ~>  %slog.[0 leaf/"{cap}: {(scow p+(mug txt))}"]
+            ~>  %slog.[0 leaf/"{cap}: {(scow uv+(mug txt))}"]
             %-  road  |.
             ~_  leaf/"{cap}: build failed"
             (swat sub (rain pax txt))

pkg/arvo/sys/hoon.hoon

@@ -2,11 +2,11 @@
 ::::    /sys/hoon                                       ::
   ::                                                    ::
 =<  ride
-=>  %139  =>
+=>  %138  =>
 ::                                                      ::
 ::::    0: version stub                                 ::
   ::                                                    ::
-~%  %k.139  ~  ~                                        ::
+~%  %k.138  ~  ~                                        ::
 |%
 ++  hoon-version  +
 --  =>
@@ -217,6 +217,7 @@
   ::  computes the axis of {b} within axis {a}.
   |=  [a=@ b=@]
   ?<  =(0 a)
+  ?<  =(0 b)
   ::  a composed axis
   ^-  @
   ?-  b
@@ -1394,23 +1395,19 @@
   ::
   ++  bif                                               ::  splits a by b
     ~/  %bif
-    |*  [b=* c=*]
-    ^+  [l=a r=a]
-    =<  +
-    |-  ^+  a
+    |*  b=*
+    |-  ^+  [l=a r=a]
     ?~  a
-      [[b c] ~ ~]
+      [~ ~]
     ?:  =(b p.n.a)
-      ?:  =(c q.n.a)
-        a
-      a(n [b c])
+      +.a
     ?:  (gor b p.n.a)
       =+  d=$(a l.a)
       ?>  ?=(^ d)
-      d(r a(l r.d))
+      [l.d a(l r.d)]
     =+  d=$(a r.a)
     ?>  ?=(^ d)
-    d(l a(r l.d))
+    [a(r l.d) r.d]
   ::
   ++  del                                               ::  delete at key b
     ~/  %del
@@ -1435,7 +1432,7 @@
     |-  ^+  a
     ?~  b
       a
-    =+  c=(bif p.n.b q.n.b)
+    =+  c=(bif p.n.b)
     ?>  ?=(^ c)
     =+  d=$(a l.c, b l.b)
     =+  e=$(a r.c, b r.b)
@@ -1592,12 +1589,6 @@
     ?~  a  a
     [n=[p=p.n.a q=(b q.n.a)] l=$(a l.a) r=$(a r.a)]
   ::
-  ++  rut                                               ::  apply gate to nodes
-    |*  b=gate
-    |-
-    ?~  a  a
-    [n=[p=p.n.a q=(b p.n.a q.n.a)] l=$(a l.a) r=$(a r.a)]
-  ::
   ++  tap                                               ::  listify pairs
     =<  $
     ~/  %tap
@@ -1687,6 +1678,19 @@
     |*  [b=* c=*]
     =+  d=(get b)
     (~(put by a) b [c d])
+  ::
+  ++  zip                                               ::  listify jar
+    =<  $
+    ~/  %zip
+    =+  b=`(list _?>(?=([[* ^] *] a) [p=p q=i.q]:n.a))`~
+    |.  ^+  b
+    ?~  a   b
+    %=  $
+      a  r.a
+      b  |-  ^+  b
+         ?~  q.n.a  ^$(a l.a)
+         [[p i.q]:n.a $(q.n.a t.q.n.a)]
+    ==
   --
 ++  ju                                                  ::  jug engine
   =|  a=(tree (pair * (tree)))  ::  (jug)
@@ -1877,17 +1881,17 @@
 ++  corl                                                ::  compose backwards
   |*  [a=$-(* *) b=$-(* *)]
   =<  +:|.((a (b)))      ::  type check
-  |*  c=_+<.b
+  |*  c=_,.+<.b
   (a (b c))
 ::
 ++  cury                                                ::  curry left
   |*  [a=$-(^ *) b=*]
-  |*  c=_+<+.a
+  |*  c=_,.+<+.a
   (a b c)
 ::
 ++  curr                                                ::  curry right
   |*  [a=$-(^ *) c=*]
-  |*  b=_+<+.a
+  |*  b=_,.+<-.a
   (a b c)
 ::
 ++  fore  |*(a=$-(* *) |*(b=$-(* *) (pair a b)))        ::  pair before
@@ -3252,7 +3256,8 @@
 ++  shas                                                ::  salted hash
   ~/  %shas
   |=  [sal=@ ruz=@]
-  (shax (mix sal (shax ruz)))
+  =/  len  (max 32 (met 3 sal))
+  (shay len (mix sal (shax ruz)))
 ::
 ++  shax                                                ::  sha-256
   ~/  %shax
@@ -4239,12 +4244,11 @@
   ?&  ?|  =(1 tef)
           =+  i=1
           |-  ^-  ?
-          ?|
-              =(i tef)
+          ?|  =(i tef)
               ?&  (gte (cut 3 [(add i inx) 1] b) 128)
                   $(i +(i))
       ==  ==  ==
-      $(inx +(inx))
+      $(inx (add inx tef))
   ==
 ::
 ++  ruth                                                ::  biblical sanity
@@ -7145,7 +7149,10 @@
 ::    5a: compiler utilities
 +|  %compiler-utilities
 ::
-++  bool  `type`(fork [%atom %f `0] [%atom %f `1] ~)    ::  make loobean
+++  bool                                                ::  make loobean
+  ^-  type
+  (fork [%atom %f `%.y] [%atom %f `%.n] ~)
+::
 ++  cell                                                ::  make %cell type
   ~/  %cell
   |=  [hed=type tal=type]
@@ -8303,9 +8310,6 @@
     ::
         [%limb @]
       `p.gen
-    ::
-      ::  [%rock *]
-      ::  [%spec %leaf q.gen q.gen]
     ::
         [%note [%help *] *]
       (bind $(gen q.gen) |=(=skin [%help p.p.gen skin]))
@@ -8780,7 +8784,7 @@
     ++  fish
       |=  =axis
       ^-  nock
-      ?@  skin  [%1 &]
+      ?@  skin  $(skin spec+[[%like [skin]~ ~] [%base %noun]])
       ?-    -.skin
       ::
           %base
@@ -8810,8 +8814,8 @@
             [%1 &]
           [%3 %0 axis]
         %+  flan
-          $(ref (peek(sut ref) %free 2), skin skin.skin)
-        $(ref (peek(sut ref) %free 3), skin ^skin.skin)
+          $(ref (peek(sut ref) %free 2), axis (peg axis 2), skin skin.skin)
+        $(ref (peek(sut ref) %free 3), axis (peg axis 3), skin ^skin.skin)
       ::
           %leaf
         ?:  (~(nest ut [%atom %$ `atom.skin]) | ref)
@@ -8821,16 +8825,21 @@
           %dbug  $(skin skin.skin)
           %help  $(skin skin.skin)
           %name  $(skin skin.skin)
-          %over  $(skin skin.skin)
-          %spec  $(skin skin.skin)
-          %wash  [%1 1]
+          %over  ::NOTE  might need to guard with +feel, crashing is too strict
+                 =+  ~|  %oops-guess-you-needed-feel-after-all
+                     fid=(fend %read wing.skin)
+                 $(sut p.fid, axis (peg axis q.fid), skin skin.skin)
+          %spec  =/  hit  (~(play ut sut) ~(example ax spec.skin))
+                 ?>  (~(nest ut hit) & ref)
+                 $(skin skin.skin)
+          %wash  [%1 &]
       ==
     ::
     ::  +gain: make a $type by restricting .ref to .skin
     ::
     ++  gain
       |-  ^-  type
-      ?@  skin  [%face skin ref]
+      ?@  skin  $(skin spec+[[%like [skin]~ ~] [%base %noun]])
       ?-    -.skin
       ::
           %base
@@ -8853,7 +8862,7 @@
                        q.ref
             [%cell *]  %void
             [%core *]  %void
-            [%face *]  (face p.ref $(ref q.ref))
+            [%face *]  $(ref q.ref)
             [%fork *]  (fork (turn ~(tap in p.ref) |=(=type ^$(ref type))))
             [%hint *]  (hint p.ref $(ref q.ref))
             [%hold *]  ?:  (~(has in gil) ref)  %void
@@ -8866,7 +8875,9 @@
         |-  ^-  type
         ?-    ref
             %void      %void
-            %noun      [%cell %noun %noun]
+            %noun      =+  ^$(skin skin.skin)
+                       ?:  =(%void -)  %void
+                       (cell - ^$(skin ^skin.skin))
             [%atom *]  %void
             [%cell *]  =+  ^$(skin skin.skin, ref p.ref)
                        ?:  =(%void -)  %void
@@ -8876,7 +8887,7 @@
                        ?.  =(%noun ^skin.skin)
                          (cell - ^$(skin ^skin.skin, ref %noun))
                        [%core - q.ref]
-            [%face *]  (face p.ref $(ref q.ref))
+            [%face *]  $(ref q.ref)
             [%fork *]  (fork (turn ~(tap in p.ref) |=(=type ^$(ref type))))
             [%hint *]  (hint p.ref $(ref q.ref))
             [%hold *]  ?:  (~(has in gil) ref)  %void
@@ -8898,7 +8909,7 @@
                      `atom.skin
           [%cell *]  %void
           [%core *]  %void
-          [%face *]  (face p.ref $(ref q.ref))
+          [%face *]  $(ref q.ref)
           [%fork *]  (fork (turn ~(tap in p.ref) |=(=type ^$(ref type))))
           [%hint *]  (hint p.ref $(ref q.ref))
           [%hold *]  ?:  (~(has in gil) ref)  %void
@@ -8909,10 +8920,9 @@
           %help  (hint [sut %help help.skin] $(skin skin.skin))
           %name  (face term.skin $(skin skin.skin))
           %over  $(skin skin.skin, sut (~(play ut sut) %wing wing.skin))
-          %spec  =/  yon  $(skin skin.skin)
-                 =/  hit  (~(play ut sut) ~(example ax spec.skin))
-                 ?>  (~(nest ut hit) & yon)
-                 hit
+          %spec  =/  hit  (~(play ut sut) ~(example ax spec.skin))
+                 ?>  (~(nest ut hit) & $(skin skin.skin))
+                 (~(fuse ut ref) hit)
           %wash  =-  $(ref (~(play ut ref) -))
                  :-  %wing
                  |-  ^-  wing
@@ -8924,13 +8934,13 @@
     ::
     ++  lose
       |-  ^-  type
-      ?@  skin  [%face skin ref]
+      ?@  skin  $(skin spec+[[%like [skin]~ ~] [%base %noun]])
       ?-    -.skin
       ::
           %base
         ?-    base.skin
             %cell      $(skin [%cell [%base %noun] [%base %noun]])
-            %flag      $(skin [%base %atom %f])
+            %flag      $(ref $(skin [%leaf %f &]), skin [%leaf %f |])
             %null      $(skin [%leaf %n ~])
             %void      ref
             %noun      %void
@@ -8956,17 +8966,19 @@
         |-  ^-  type
         ?-    ref
             %void      %void
-            %noun      [%atom %$ ~]
+            %noun      ?.  =([%cell [%base %noun] [%base %noun]] skin)
+                         ref
+                       [%atom %$ ~]
             [%atom *]  ref
-            [%cell *]  =+  ^$(skin skin.skin, ref p.ref)
-                       ?:  =(%void -)  %void
-                       (cell - ^$(skin ^skin.skin, ref q.ref))
+            [%cell *]  =/  lef  ^$(skin skin.skin, ref p.ref)
+                       =/  rig  ^$(skin ^skin.skin, ref q.ref)
+                       (fork (cell lef rig) (cell lef q.ref) (cell p.ref rig) ~)
             [%core *]  =+  ^$(skin skin.skin, ref p.ref)
                        ?:  =(%void -)  %void
                        ?.  =(%noun ^skin.skin)
                          (cell - ^$(skin ^skin.skin, ref %noun))
                        [%core - q.ref]
-            [%face *]  (face p.ref $(ref q.ref))
+            [%face *]  $(ref q.ref)
             [%fork *]  (fork (turn ~(tap in p.ref) |=(=type ^$(ref type))))
             [%hint *]  (hint p.ref $(ref q.ref))
             [%hold *]  ?:  (~(has in gil) ref)  %void
@@ -8994,8 +9006,11 @@
           %dbug  $(skin skin.skin)
           %help  $(skin skin.skin)
           %name  $(skin skin.skin)
-          %over  $(skin skin.skin)
-          %spec  $(skin skin.skin)
+          %over  ::TODO  if we guard in +fish (+feel), we have to guard again here
+                 $(skin skin.skin, sut (~(play ut sut) %wing wing.skin))
+          %spec  =/  hit  (~(play ut sut) ~(example ax spec.skin))
+                 ?>  (~(nest ut hit) & $(skin skin.skin))
+                 (~(crop ut ref) hit)
           %wash  ref
       ==
     --
@@ -9239,21 +9254,21 @@
     ::
     ++  mint
       |=  gol=type
+      =-  ?>(?|(!vet (nest(sut gol) & p.-)) -)
       ^-  (pair type nock)
       =+  lug=(find %read hyp)
       ?:  ?=(%| -.lug)  ~>(%mean.'hoon' ?>(?=(~ rig) p.lug))
-      =-  ?>(?|(!vet (nest(sut gol) & p.-)) -)
       (ergo p.lug rig)
     ::
     ++  mull
       |=  [gol=type dox=type]
-      ^-  [type type]
+      =-  ?>(?|(!vet (nest(sut gol) & p.-)) -)
+      ^-  (pair type type)
       =+  lug=[p=(find %read hyp) q=(find(sut dox) %read hyp)]
       ?:  ?=(%| -.p.lug)
         ?>   &(?=(%| -.q.lug) ?=(~ rig))
         [p.p.p.lug p.p.q.lug]
       ?>  ?=(%& -.q.lug)
-      =-  ?>(?|(!vet (nest(sut gol) & p.-)) -)
       (endo [p.p.lug p.q.lug] dox rig)
     --
   ::
@@ -9473,6 +9488,14 @@
         ==    ==
     (fond way hyp)
   ::
+  ++  fend
+    |=  [way=vial hyp=wing]
+    ^-  (pair type axis)
+    =+  fid=(find way hyp)
+    ~>  %mean.'fend-fragment'
+    ?>  &(?=(%& -.fid) ?=(%& -.q.p.fid))
+    [p.q.p.fid (tend p.p.fid)]
+  ::
   ++  fund
     ~/  %fund
     |=  [way=vial gen=hoon]
@@ -9691,14 +9714,13 @@
     ?:  ?=([%wtts *] gen)
       (cool how q.gen (play ~(example ax p.gen)))
     ?:  ?=([%wthx *] gen)
-      =+  (play %wing q.gen)
-      ~>  %slog.[0 [%leaf "chipping"]]
-      ?:  how
-        =-  ~>  %slog.[0 (dunk(sut +<) 'chip: gain: ref')]
-            ~>  %slog.[0 (dunk(sut -) 'chip: gain: gain')]
-            -
-        ~(gain ar - p.gen)
-      ~(lose ar - p.gen)
+      =+  fid=(find %both q.gen)
+      ?-  -.fid
+        %|  sut
+        %&  =<  q
+            %+  take  p.p.fid
+            |=(a=type ?:(how ~(gain ar a p.gen) ~(lose ar a p.gen)))
+      ==
     ?:  ?&(how ?=([%wtpm *] gen))
       |-(?~(p.gen sut $(p.gen t.p.gen, sut ^$(gen i.p.gen))))
     ?:  ?&(!how ?=([%wtbr *] gen))
@@ -9984,10 +10006,8 @@
     ::
         [%wthx *]
       :-  (nice bool)
-      =+  fid=(find %read [[%& 1] q.gen])
-      ~>  %mean.'mint-fragment'
-      ?>  &(?=(%& -.fid) ?=(%& -.q.p.fid))
-      (~(fish ar `type`p.q.p.fid `skin`p.gen) (tend p.p.fid))
+      =+  fid=(fend %read [[%& 1] q.gen])
+      (~(fish ar `type`p.fid `skin`p.gen) q.fid)
     ::
         [%fits *]
       :-  (nice bool)
@@ -10174,12 +10194,8 @@
     ::
         [%wthx *]
       ~>  %mean.'mull-bonk-x'
-      =+  :-  =+  (find %read [[%& 1] q.gen])
-              ?>  &(?=(%& -.-) ?=(%& -.q.p.-))
-              new=[type=p.q.p.- axis=(tend p.p.-)]
-          =+  (find(sut dox) %read [%& 1] q.gen)
-          ?>  &(?=(%& -.-) ?=(%& -.q.p.-))
-          old=[type=p.q.p.- axis=(tend p.p.-)]
+      =+  :-  new=[type=p axis=q]:(fend %read [[%& 1] q.gen])
+          old=[type=p axis=q]:(fend(sut dox) %read [[%& 1] q.gen])
       ?>  =(axis.old axis.new)
       ?>  (nest(sut type.old) & type.new)
       (beth bool)
@@ -13108,6 +13124,12 @@
                   |=  [%cnhp a=hoon b=spec]
                   [%make a b ~]
                 (rune hep %cnhp exqd)
+            ::
+                :-  '.'
+                %+  cook
+                  |=  [%cndt a=spec b=hoon]
+                  [%make b a ~]
+                (rune dot %cndt exqc)
             ::
                 :-  ':'
                 %+  cook

pkg/arvo/sys/lull.hoon

@@ -4,7 +4,7 @@
 =>  ..part
 ~%  %lull  ..part  ~
 |%
-++  lull  %324
+++  lull  %323
 ::                                                      ::  ::
 ::::                                                    ::  ::  (1) models
   ::                                                    ::  ::
@@ -462,7 +462,8 @@
 +$  rift  @ud                                           ::  ship continuity
 +$  mime  (pair mite octs)                              ::  mimetyped data
 +$  octs  (pair @ud @)                                  ::  octet-stream
-+$  sock  (pair ship ship)                              ::  outgoing [our his]
++$  sock  (pair ship ship)                              ::  outgoing [src dest]
++$  sack  (trel ship ship path)                         ::  $sock /w provenance
 +$  stub  (list (pair stye (list @c)))                  ::  styled unicode
 +$  stye  (pair (set deco) (pair tint tint))            ::  decos/bg/fg
 +$  styl  %+  pair  (unit deco)                         ::  cascading style
@@ -584,6 +585,7 @@
         %'GET'
         %'HEAD'
         %'OPTIONS'
+        %'PATCH'
         %'POST'
         %'PUT'
         %'TRACE'
@@ -762,11 +764,14 @@
   ::    Messaging Tasks
   ::
   ::    %hear: packet from unix
+  ::    %dear: lane from unix
   ::    %heed: track peer's responsiveness; gives %clog if slow
   ::    %jilt: stop tracking peer's responsiveness
   ::    %cork: request to delete message flow
-  ::    %kroc: request to delete stale message flows
+  ::    %tame: request to delete route for ship
+  ::    %kroc: request to delete specific message flows, from their bones
   ::    %plea: request to send message
+  ::    %deep: deferred calls to %ames, from itself
   ::
   ::    Remote Scry Tasks
   ::
@@ -783,17 +788,21 @@
   ::    %snub: set packet blocklist to .ships
   ::    %spew: set verbosity toggles
   ::    %cong: adjust congestion control parameters
-  ::    %stir: recover from timer desync
+  ::    %stir: recover from timer desync and assorted debug commands
   ::    %trim: release memory
   ::    %vega: kernel reload notification
   ::
   +$  task
+    $+  ames-task
     $%  [%hear =lane =blob]
+        [%dear =ship =lane]
         [%heed =ship]
         [%jilt =ship]
         [%cork =ship]
-        [%kroc dry=?]
+        [%tame =ship]
+        [%kroc bones=(list [ship bone])]
         $>(%plea vane-task)
+        [%deep =deep]
     ::
         [%keen spar]
         [%yawn spar]
@@ -819,6 +828,7 @@
   ::    %done: notify vane that peer (n)acked our message
   ::    %lost: notify vane that we crashed on %boon
   ::    %send: packet to unix
+  ::    %nail: lanes to unix
   ::
   ::    Remote Scry Gifts
   ::
@@ -834,6 +844,7 @@
         [%done error=(unit error)]
         [%lost ~]
         [%send =lane =blob]
+        [%nail =ship lanes=(list lane)]
     ::
         [%tune spar roar=(unit roar)]
     ::
@@ -895,13 +906,27 @@
   ::    payload: semantic message contents
   ::
   +$  plea  [vane=@tas =path payload=*]
+  ::
+  +$  message
+    $%  [%plea plea]
+        [%boon payload=*]
+        [%naxplanation =message-num =error]
+    ==
   ::  $spar:  pair of $ship and $path
   ::
   ::    Instead of fully qualifying a scry path, ames infers rift and
   ::    life based on the ship.
   ::
   +$  spar  [=ship =path]
+  ::  $deep: deferred %ames call, from self, to keep +abet cores pure
   ::
+  +$  deep
+    $%  [%nack =ship =nack=bone =message]
+        [%sink =ship =target=bone naxplanation=[=message-num =error]]
+        [%drop =ship =nack=bone =message-num]
+        [%cork =ship =bone]
+        [%kill =ship =bone]
+    ==
   :: +|  %atomics
   ::
   +$  bone           @udbone
@@ -960,6 +985,7 @@
   ::    %known: we know their life and public keys, so we have a channel
   ::
   +$  ship-state
+    $+  ship-state
     $%  [%alien alien-agenda]
         [%known peer-state]
     ==
@@ -970,6 +996,7 @@
   ::    heeds: local tracking requests; passed through into $peer-state
   ::
   +$  alien-agenda
+    $+  alien-agenda
     $:  messages=(list [=duct =plea])
         packets=(set =blob)
         heeds=(set duct)
@@ -997,6 +1024,7 @@
   ::    corked:  bones closed on both sender and receiver
   ::
   +$  peer-state
+    $+  peer-state
     $:  $:  =symmetric-key
             =life
             =rift
@@ -1015,6 +1043,7 @@
         keens=(map path keen-state)
     ==
   +$  keen-state
+    $+  keen-state
     $:  wan=((mop @ud want) lte)  ::  request packets, sent
         nex=(list want)           ::  request packets, unsent
         hav=(list have)           ::  response packets, backward
@@ -1133,9 +1162,10 @@
   ::    packet-pump-state: state of corresponding |packet-pump
   ::
   +$  message-pump-state
+    $+  message-pump-state
     $:  current=_`message-num`1
         next=_`message-num`1
-        unsent-messages=(qeu message-blob)
+        unsent-messages=(qeu message)
         unsent-fragments=(list static-fragment)
         queued-message-acks=(map message-num ack)
         =packet-pump-state
@@ -1153,6 +1183,7 @@
   ::    metrics: congestion control information
   ::
   +$  packet-pump-state
+    $+  packet-pump-state
     $:  next-wake=(unit @da)
         live=((mop live-packet-key live-packet-val) lte-packets)
         metrics=pump-metrics
@@ -1190,7 +1221,6 @@
   ::    rto: retransmission timeout
   ::    rtt: roundtrip time estimate, low-passed using EWMA
   ::    rttvar: mean deviation of .rtt, also low-passed with EWMA
-  ::    num-live: how many packets sent, awaiting ack
   ::    ssthresh: slow-start threshold
   ::    cwnd: congestion window; max unacked packets
   ::
@@ -1200,7 +1230,6 @@
         rttvar=_~s1
         ssthresh=_10.000
         cwnd=_1
-        num-live=@ud
         counter=@ud
     ==
   +$  live-packet
@@ -1229,6 +1258,7 @@
   ::    live-messages: partially received messages
   ::
   +$  message-sink-state
+    $+  message-sink-state
     $:  last-acked=message-num
         last-heard=message-num
         pending-vane-ack=(qeu [=message-num message=*])
@@ -1365,7 +1395,9 @@
     =+  len=(cut 3 [4 2] hoot)
     =+  pat=(cut 3 [6 len] hoot)
     ~|  pat=pat
-    [(add 6 len) [(stab pat) num]]
+    :-  (add 6 len)
+    :_  num
+    (rash pat ;~(pfix fas (most fas (cook crip (star ;~(less fas prn))))))
   ::
   ++  sift-meow
     |=  =yowl
@@ -1518,7 +1550,10 @@
         file-path=term                                  ::
     ==                                                  ::
   +$  care                                              ::  clay submode
-    ?(%a %b %c %d %e %f %p %r %s %t %u %v %w %x %y %z)  ::
+    $?  %a  %b  %c  %d  %e  %f                          ::
+        %p  %q  %r  %s  %t  %u                          ::
+        %v  %w  %x  %y  %z                              ::
+    ==                                                  ::
   +$  cash                                              ::  case or tako
     $%  [%tako p=tako]                                  ::
         case                                            ::
@@ -2060,7 +2095,10 @@
     $%  [%payload =simple-payload:http]
     ==  ==
   +$  gift
-    $%  ::  set-config: configures the external http server
+    $%  ::  ames responses
+        ::
+        $>(?(%boon %done) gift:ames)
+        ::  set-config: configures the external http server
         ::
         ::    TODO: We need to actually return a (map (unit @t) http-config)
         ::    so we can apply configurations on a per-site basis
@@ -2091,6 +2129,9 @@
         ::  new unix process
         ::
         $>(%born vane-task)
+        ::  network request
+        ::
+        $>(%plea vane-task)
         ::  trim state (in response to memory pressure)
         ::
         $>(%trim vane-task)
@@ -2103,6 +2144,11 @@
         ::  update http configuration
         ::
         [%rule =http-rule]
+        ::  set a base url for eauth, like `'https://sampel.com'
+        ::
+        ::    eyre will append /~/eauth to it internally to redirect into eauth
+        ::
+        [%eauth-host host=(unit @t)]
         ::  starts handling an inbound http request
         ::
         [%request secure=? =address =request:http]
@@ -2163,6 +2209,14 @@
         ::  inbound-request: the original request which caused this connection
         ::
         =inbound-request
+        ::  session-id: the session associated with this connection
+        ::  identity:   the identity associated with this connection
+        ::
+        ::NOTE  technically the identity is associated with the session (id),
+        ::      but we may still need to know the identity that was used
+        ::      after the session proper expires.
+        ::
+        [session-id=@uv =identity]
         ::  response-header: set when we get our first %start
         ::
         response-header=(unit response-header:http)
@@ -2176,11 +2230,26 @@
     $:  ::  sessions: a mapping of session cookies to session information
         ::
         sessions=(map @uv session)
+        ::  visitors: in-progress incoming eauth flows
+        ::
+        visitors=(map @uv visitor)
+        ::  visiting: outgoing eauth state per ship
+        ::
+        visiting=(map ship logbook)
+        ::  endpoint: hardcoded local eauth endpoint for %syn and %ack
+        ::
+        ::    user-configured or auth-o-detected, with last-updated timestamp.
+        ::    both shaped like 'prot://host'
+        ::
+        endpoint=[user=(unit @t) auth=(unit @t) =time]
     ==
   ::  +session: server side data about a session
   ::
   +$  session
-    $:  ::  expiry-time: when this session expires
+    $:  ::  identity: authentication level & id of this session
+        ::
+        =identity
+        ::  expiry-time: when this session expires
         ::
         ::    We check this server side, too, so we aren't relying on the browser
         ::    to properly handle cookie expiration as a security mechanism.
@@ -2194,6 +2263,73 @@
         ::  mint some sort of long lived cookie for mobile apps which only has
         ::  access to a single application path.
     ==
+  ::  +visitor: completed or in-progress incoming eauth flow
+  ::
+  ::    duct: boon duct
+  ::      and
+  ::    sesh: login completed, session exists
+  ::      or
+  ::    pend: awaiting %tune for %keen sent at time, for initial eauth http req
+  ::    ship: the @p attempting to log in
+  ::    base: local protocol+hostname the attempt started on, if any
+  ::    last: the url to redirect to after log-in
+  ::    toke: authentication secret received over ames or offered by visitor
+  ::
+  +$  visitor
+    $:  duct=(unit duct)
+    $@  sesh=@uv
+    $:  pend=(unit [http=duct keen=time])
+        ship=ship
+        base=(unit @t)
+        last=@t
+        toke=(unit @uv)
+    ==  ==
+  ::  +logbook: record of outgoing eauth comms & state
+  ::
+  ::    qeu: a queue of nonces for to-be-n/acked pleas
+  ::    map: per nonce, completed or pending eauth session
+  ::
+  +$  logbook  [=(qeu @uv) =(map @uv portkey)]
+  ::  +portkey: completed or in-progress outgoing eauth flow
+  ::
+  ::    made: live since
+  ::      or
+  ::    duct: confirm request awaiting redirect
+  ::    toke: secret to include in redirect, unless aborting
+  ::
+  +$  portkey
+    $@  made=@da          ::  live since
+    $:  pend=(unit duct)  ::  or await redir
+        toke=(unit @uv)   ::  with secret
+    ==
+  ::  +eauth-plea: client talking to host
+  ::
+  +$  eauth-plea
+    $:  %0
+    $%  ::  %open: client decided on an attempt, wants to return to url
+        ::  %shut: client wants the attempt or session closed
+        ::
+        [%open nonce=@uv token=(unit @uv)]
+        [%shut nonce=@uv]
+    ==  ==
+  ::  +eauth-boon: host responding to client
+  ::
+  +$  eauth-boon
+    $:  %0
+    $%  ::  %okay: attempt heard, client to finish auth through url
+        ::  %shut: host has expired the session
+        ::
+        [%okay nonce=@uv url=@t]
+        [%shut nonce=@uv]
+    ==  ==
+  ::  $identity: authentication method & @p
+  ::
+  +$  identity
+    $~  [%ours ~]
+    $%  [%ours ~]                                       ::  local, root
+        [%fake who=@p]                                  ::  guest id
+        [%real who=@p]                                  ::  authed cross-ship
+    ==
   ::  channel-state: state used in the channel system
   ::
   +$  channel-state
@@ -2237,6 +2373,7 @@
   ::
   +$  channel
     $:  mode=?(%json %jam)
+        =identity
         ::  channel-state: expiration time or the duct currently listening
         ::
         ::    For each channel, there is at most one open EventSource
@@ -2309,6 +2446,9 @@
         ::  internal authentication page
         ::
         [%authentication ~]
+        ::  cross-ship authentication handling
+        ::
+        [%eauth ~]
         ::  internal logout page
         ::
         [%logout ~]
@@ -2321,6 +2461,9 @@
         ::  respond with the @p the requester is authenticated as
         ::
         [%name ~]
+        ::  respond with the @p of the ship serving the response
+        ::
+        [%host ~]
         ::  respond with the default file not found page
         ::
         [%four-oh-four ~]
@@ -2569,11 +2712,12 @@
   +$  gift                                              ::  outgoing result
     $%  [%boon payload=*]                               ::  ames response
         [%done error=(unit error:ames)]                 ::  ames message (n)ack
+        [%flub ~]                                       ::  not ready to handle plea
         [%unto p=unto]                                  ::
     ==                                                  ::
   +$  task                                              ::  incoming request
     $~  [%vega ~]                                       ::
-    $%  [%deal p=sock q=term r=deal]                    ::  full transmission
+    $%  [%deal p=sack q=term r=deal]                    ::  full transmission
         [%sear =ship]                                   ::  clear pending queues
         [%jolt =desk =dude]                             ::  (re)start agent
         [%idle =dude]                                   ::  suspend agent
@@ -2591,10 +2735,39 @@
   +$  bitt  (map duct (pair ship path))                 ::  incoming subs
   +$  boat  (map [=wire =ship =term] [acked=? =path])   ::  outgoing subs
   +$  boar  (map [=wire =ship =term] nonce=@)           ::  and their nonces
+  ::
+  +$  path-state
+    $:  bob=(unit @ud)
+        fan=((mop @ud (pair @da (each page @uvI))) lte)
+    ==
+  +$  stats                                             ::  statistics
+    $:  change=@ud                                      ::  processed move count
+        eny=@uvJ                                        ::  entropy
+        time=@da                                        ::  current event time
+    ==
+  +$  egg                                               ::  migratory agent state
+    $%  [%nuke sky=(map spur @ud)]                      ::  see /sys/gall $yoke
+        $:  %live
+            control-duct=duct
+            run-nonce=@t
+            sub-nonce=@
+            =stats
+            =bitt
+            =boat
+            =boar
+            code=~
+            old-state=[%| vase]
+            =beak
+            marks=(map duct mark)
+            sky=(map spur path-state)
+            ken=(jug spar:ames wire)
+    ==  ==
+  +$  egg-any  $%([%15 egg])
   +$  bowl                                              ::  standard app state
     $:  $:  our=ship                                    ::  host
             src=ship                                    ::  guest
             dap=term                                    ::  agent
+            sap=path                                    ::  provenance
         ==                                              ::
         $:  wex=boat                                    ::  outgoing subs
             sup=bitt                                    ::  incoming subs
@@ -3070,6 +3243,30 @@
   ::                                                    ::
   +$  shed  _*form:(strand:rand ,vase)                  ::  compute vase
   --  ::khan
+::                                                      ::::
+::::                    ++lick                            ::  (1j) IPC
+  ::                                                    ::::
+++  lick  ^?
+  |%
+  +$  gift                                              ::  out result <-$
+    $%  [%spin =name]                                   ::  open an IPC port
+        [%shut =name]                                   ::  close an IPC port
+        [%spit =name =mark =noun]                       ::  spit a noun to the IPC port
+        [%soak =name =mark =noun]                       ::  soak a noun from the IPC port
+    ==
+  +$  task                                              ::  in request ->$
+    $~  [%vega ~]                                       ::
+    $%  $>(%born vane-task)                             ::  new unix process
+        $>(%trim vane-task)                             ::  trim state
+        $>(%vega vane-task)                             ::  report upgrade
+        [%spin =name]                                   ::  open an IPC port
+        [%shut =name]                                   ::  close an IPC port
+        [%spit =name =mark =noun]                       ::  spit a noun to the IPC port
+        [%soak =name =mark =noun]                       ::  soak a noun from the IPC port
+    ==
+  ::
+  +$  name  path
+  --  ::lick
 ::
 ++  rand                                                ::  computation
   |%
@@ -3272,6 +3469,7 @@
       gift:iris
       gift:jael
       gift:khan
+      gift:lick
   ==
 +$  task-arvo                                           ::  in request ->$
   $%  task:ames
@@ -3283,6 +3481,7 @@
       task:iris
       task:jael
       task:khan
+      task:lick
   ==
 +$  note-arvo                                           ::  out request $->
   $~  [%b %wake ~]
@@ -3295,6 +3494,7 @@
       [%i task:iris]
       [%j task:jael]
       [%k task:khan]
+      [%l task:lick]
       [%$ %whiz ~]
       [@tas %meta vase]
   ==
@@ -3317,6 +3517,7 @@
       [%iris gift:iris]
       [%jael gift:jael]
       [%khan gift:khan]
+      [%lick gift:lick]
   ==
 ::  $unix-task: input from unix
 ::